From 91e6e5d32ad47a13a69aaba0e992467b756c17e7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 15 Jul 2021 14:31:58 -0400 Subject: [PATCH] Migrates from Bootstrap to BootstrapRegistryInitializer --- .../zookeeper/config/ZookeeperBootstrapper.java | 8 ++++---- ...eeperConfigDataCustomizationIntegrationTests.java | 10 +++++----- .../ZookeeperConfigServerBootstrapper.java | 6 +++--- .../src/main/resources/META-INF/spring.factories | 2 +- .../ZookeeperConfigServerBootstrapperTests.java | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperBootstrapper.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperBootstrapper.java index 2dcf19e7..a92211b9 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperBootstrapper.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperBootstrapper.java @@ -25,10 +25,10 @@ import org.apache.curator.framework.CuratorFramework; import org.springframework.boot.BootstrapContext; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.cloud.zookeeper.CuratorFrameworkCustomizer; -public class ZookeeperBootstrapper implements Bootstrapper { +public class ZookeeperBootstrapper implements BootstrapRegistryInitializer { private Function retryPolicy; @@ -38,7 +38,7 @@ public class ZookeeperBootstrapper implements Bootstrapper { private Function curatorFrameworkCustomizer; - static Bootstrapper fromBootstrapContext(Function factory) { + static BootstrapRegistryInitializer fromBootstrapContext(Function factory) { return registry -> registry.register(CuratorFramework.class, factory::apply); } @@ -67,7 +67,7 @@ public class ZookeeperBootstrapper implements Bootstrapper { } @Override - public void intitialize(BootstrapRegistry registry) { + public void initialize(BootstrapRegistry registry) { register(registry, RetryPolicy.class, retryPolicy); register(registry, EnsembleProvider.class, ensembleProvider); register(registry, TracerDriver.class, tracerDriver); diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java index 8495e120..7e916eac 100644 --- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java +++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.boot.BootstrapContext; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -67,8 +67,8 @@ public class ZookeeperConfigDataCustomizationIntegrationTests { this.context = new SpringApplicationBuilder(Config.class) .listeners(new ZookeeperTestingServer()) .web(WebApplicationType.NONE) - .addBootstrapper(bindHandlerBootstrapper) - .addBootstrapper(ZookeeperBootstrapper.fromBootstrapContext(this::curatorFramework)) + .addBootstrapRegistryInitializer(bindHandlerBootstrapper) + .addBootstrapRegistryInitializer(ZookeeperBootstrapper.fromBootstrapContext(this::curatorFramework)) .run("--spring.config.import=zookeeper:", "--spring.application.name=testZkConfigDataIntegration", "--logging.level.org.springframework.cloud.zookeeper=DEBUG", @@ -118,12 +118,12 @@ public class ZookeeperConfigDataCustomizationIntegrationTests { } - static class BindHandlerBootstrapper implements Bootstrapper { + static class BindHandlerBootstrapper implements BootstrapRegistryInitializer { private int onSuccessCount = 0; @Override - public void intitialize(BootstrapRegistry registry) { + public void initialize(BootstrapRegistry registry) { registry.register(BindHandler.class, context -> new BindHandler() { @Override public Object onSuccess(ConfigurationPropertyName name, Bindable target, BindContext context, diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java index 03c261d8..a7079510 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java @@ -23,7 +23,7 @@ import org.apache.curator.x.discovery.details.InstanceSerializer; import org.apache.curator.x.discovery.details.JsonInstanceSerializer; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; @@ -40,11 +40,11 @@ import org.springframework.cloud.zookeeper.support.DefaultServiceDiscoveryCustom import org.springframework.cloud.zookeeper.support.ServiceDiscoveryCustomizer; import org.springframework.util.ClassUtils; -public class ZookeeperConfigServerBootstrapper implements Bootstrapper { +public class ZookeeperConfigServerBootstrapper implements BootstrapRegistryInitializer { @Override @SuppressWarnings("unchecked") - public void intitialize(BootstrapRegistry registry) { + public void initialize(BootstrapRegistry registry) { if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null)) { return; } diff --git a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories index db7b0926..ff913acf 100644 --- a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories @@ -19,5 +19,5 @@ org.springframework.cloud.zookeeper.discovery.dependency.DependencyEnvironmentPo org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.zookeeper.discovery.configclient.ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration -org.springframework.boot.Bootstrapper=\ +org.springframework.boot.BootstrapRegistryInitializer=\ org.springframework.cloud.zookeeper.discovery.configclient.ZookeeperConfigServerBootstrapper \ No newline at end of file diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java index 28b39bc7..d02cc161 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapperTests.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -56,7 +56,7 @@ public class ZookeeperConfigServerBootstrapperTests { ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) .listeners(new ZookeeperTestingServer()) .properties("--server.port=0", "spring.cloud.service-registry.auto-registration.enabled=false") - .addBootstrapper(registry -> registry.addCloseListener(event -> { + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); assertThat(providerFn).as("ConfigServerInstanceProvider.Function was created when it shouldn't") @@ -78,8 +78,8 @@ public class ZookeeperConfigServerBootstrapperTests { .properties("--server.port=0", "spring.cloud.config.discovery.enabled=true", "spring.cloud.zookeeper.discovery.metadata[mymetadataprop]=mymetadataval", "spring.cloud.service-registry.auto-registration.enabled=false") - .addBootstrapper(bindHandlerBootstrapper) - .addBootstrapper(registry -> registry.addCloseListener(event -> { + .addBootstrapRegistryInitializer(bindHandlerBootstrapper) + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); assertThat(providerFn).as("ConfigServerInstanceProvider.Function was not created when it should.") @@ -97,12 +97,12 @@ public class ZookeeperConfigServerBootstrapperTests { static class TestConfig { } - static class BindHandlerBootstrapper implements Bootstrapper { + static class BindHandlerBootstrapper implements BootstrapRegistryInitializer { private int onSuccessCount = 0; @Override - public void intitialize(BootstrapRegistry registry) { + public void initialize(BootstrapRegistry registry) { registry.register(BindHandler.class, context -> new BindHandler() { @Override public Object onSuccess(ConfigurationPropertyName name, Bindable target, BindContext context,