diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarProperties.java index ef2dd6d2e58d..a16c7c5b7945 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarProperties.java @@ -901,7 +901,7 @@ public void setParam(Map param) { public static class Failover { /** - * Cluster Failover Policy. + * Cluster failover policy. */ private FailoverPolicy failoverPolicy = FailoverPolicy.ORDER; @@ -909,7 +909,7 @@ public static class Failover { * Delay before the Pulsar client switches from the primary cluster to the backup * cluster. */ - private Duration failOverDelay; + private Duration failoverDelay; /** * Delay before the Pulsar client switches from the backup cluster to the primary @@ -923,7 +923,7 @@ public static class Failover { private Duration checkInterval; /** - * List of backupClusters The backup cluster is chosen in the sequence of the + * List of backup clusters. The backup cluster is chosen in the sequence of the * given list. If all backup clusters are available, the Pulsar client chooses the * first backup cluster. */ @@ -937,12 +937,12 @@ public void setFailoverPolicy(FailoverPolicy failoverPolicy) { this.failoverPolicy = failoverPolicy; } - public Duration getFailOverDelay() { - return this.failOverDelay; + public Duration getFailoverDelay() { + return this.failoverDelay; } - public void setFailOverDelay(Duration failOverDelay) { - this.failOverDelay = failOverDelay; + public void setFailoverDelay(Duration failoverDelay) { + this.failoverDelay = failoverDelay; } public Duration getSwitchBackDelay() { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java index eb744fb93e30..2eb977371b52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java @@ -83,7 +83,7 @@ private void customizeServiceUrlProviderBuilder(Consumer serviceUrlConsu map.from(connectionDetails::getBrokerUrl).to(autoClusterFailoverBuilder::primary); map.from(secondaryAuths::keySet).as(ArrayList::new).to(autoClusterFailoverBuilder::secondary); map.from(failoverProperties::getFailoverPolicy).to(autoClusterFailoverBuilder::failoverPolicy); - map.from(failoverProperties::getFailOverDelay).to(timeoutProperty(autoClusterFailoverBuilder::failoverDelay)); + map.from(failoverProperties::getFailoverDelay).to(timeoutProperty(autoClusterFailoverBuilder::failoverDelay)); map.from(failoverProperties::getSwitchBackDelay) .to(timeoutProperty(autoClusterFailoverBuilder::switchBackDelay)); map.from(failoverProperties::getCheckInterval).to(timeoutProperty(autoClusterFailoverBuilder::checkInterval)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index d2e8c582597b..2ee0a2444a5d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2060,6 +2060,10 @@ "name": "spring.neo4j.uri", "defaultValue": "bolt://localhost:7687" }, + { + "name": "spring.pulsar.client.failover.failover-policy", + "defaultValue": "order" + }, { "name": "spring.pulsar.function.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java index 7d604e7a820b..d4bfdeb0310e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java @@ -144,7 +144,7 @@ void whenHasUserDefinedFailoverPropertiesAddsToClient() { customizeAction.accept(pulsarClientBuilderCustomizer, target); InOrder ordered = inOrder(target); ordered.verify(target).serviceUrlProvider(Mockito.any(AutoClusterFailover.class)); - assertThat(pulsarProperties.getClient().getFailover().getFailOverDelay()) + assertThat(pulsarProperties.getClient().getFailover().getFailoverDelay()) .isEqualTo(Duration.ofSeconds(15)); assertThat(pulsarProperties.getClient().getFailover().getSwitchBackDelay()) .isEqualTo(Duration.ofSeconds(30)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java index 2739529790f6..ac097fd40b6d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java @@ -112,7 +112,7 @@ void customizeClientBuilderWhenHasFailover() { properties.getClient().setServiceUrl("https://used.example.com"); properties.getClient().getFailover().setFailoverPolicy(FailoverPolicy.ORDER); properties.getClient().getFailover().setCheckInterval(Duration.ofSeconds(5)); - properties.getClient().getFailover().setFailOverDelay(Duration.ofSeconds(30)); + properties.getClient().getFailover().setFailoverDelay(Duration.ofSeconds(30)); properties.getClient().getFailover().setSwitchBackDelay(Duration.ofSeconds(30)); properties.getClient().getFailover().setBackupClusters(List.of(backupCluster1, backupCluster2)); PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesTests.java index bcf91314f465..895afcf4bcff 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesTests.java @@ -105,7 +105,7 @@ void bindFailover() { Failover failoverProperties = properties.getFailover(); List backupClusters = properties.getFailover().getBackupClusters(); assertThat(properties.getServiceUrl()).isEqualTo("my-service-url"); - assertThat(failoverProperties.getFailOverDelay()).isEqualTo(Duration.ofMillis(30000)); + assertThat(failoverProperties.getFailoverDelay()).isEqualTo(Duration.ofMillis(30000)); assertThat(failoverProperties.getSwitchBackDelay()).isEqualTo(Duration.ofMillis(15000)); assertThat(failoverProperties.getCheckInterval()).isEqualTo(Duration.ofMillis(1000)); assertThat(backupClusters.get(0).getServiceUrl()).isEqualTo("backup-service-url-1");