children = null;
- try {
- children = this.getSource().getChildren().forPath(path);
- }
- catch (KeeperException e) {
- if (e.code() != KeeperException.Code.NONODE) { // not found
- throw e;
- }
- }
- return children;
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
deleted file mode 100644
index 8c184acd8..000000000
--- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import jakarta.annotation.PreDestroy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-
-import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
-import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.PropertySource;
-import org.springframework.util.Assert;
-
-/**
- * Zookeeper provides a hierarchical
- * namespace that allows clients to store arbitrary data, such as configuration data.
- * Spring Cloud Zookeeper Config is an alternative to the
- * Config Server and
- * Client. Configuration is loaded into the Spring Environment during the special
- * "bootstrap" phase. Configuration is stored in the {@code /config} namespace by default.
- * Multiple {@code PropertySource} instances are created based on the application's name
- * and the active profiles that mimicks the Spring Cloud Config order of resolving
- * properties. For example, an application with the name "testApp" and with the "dev"
- * profile will have the following property sources created:
- *
- * {@code
- * config/testApp,dev
- * config/testApp
- * config/application,dev
- * config/application
- * }
- *
- * The most specific property source is at the top, with the least specific at the bottom.
- * Properties is the {@code config/application} namespace are applicable to all
- * applications using zookeeper for configuration. Properties in the
- * {@code config/testApp} namespace are only available to the instances of the service
- * named "testApp".
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperPropertySourceLocator implements PropertySourceLocator {
-
- private ZookeeperConfigProperties properties;
-
- private CuratorFramework curator;
-
- private List contexts;
-
- private static final Log log = LogFactory
- .getLog(ZookeeperPropertySourceLocator.class);
-
- public ZookeeperPropertySourceLocator(CuratorFramework curator,
- ZookeeperConfigProperties properties) {
- this.curator = curator;
- Assert.hasText(properties.getName(), ZookeeperConfigProperties.PREFIX + ".name must not be empty");
- this.properties = properties;
- }
-
- public List getContexts() {
- return this.contexts;
- }
-
- @Override
- public PropertySource locate(Environment environment) {
- if (environment instanceof ConfigurableEnvironment) {
- ConfigurableEnvironment env = (ConfigurableEnvironment) environment;
-
- List profiles = Arrays.asList(env.getActiveProfiles());
-
- ZookeeperPropertySources sources = new ZookeeperPropertySources(properties, log);
- this.contexts = sources.getAutomaticContexts(profiles);
-
- CompositePropertySource composite = new CompositePropertySource("zookeeper");
-
- for (String propertySourceContext : this.contexts) {
- PropertySource propertySource = sources.createPropertySource(propertySourceContext, true, this.curator);
- composite.addPropertySource(propertySource);
- }
-
- return composite;
- }
- return null;
- }
-
- @PreDestroy
- public void destroy() {
- }
-
- private PropertySource create(String context) {
- return new ZookeeperPropertySource(context, this.curator);
- }
-
- private void addProfiles(List contexts, String baseContext,
- List profiles) {
- for (String profile : profiles) {
- contexts.add(baseContext + this.properties.getProfileSeparator() + profile);
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySources.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySources.java
deleted file mode 100644
index 0730ff1b5..000000000
--- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySources.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.logging.Log;
-import org.apache.curator.framework.CuratorFramework;
-
-import org.springframework.core.style.ToStringCreator;
-
-public class ZookeeperPropertySources {
- private final ZookeeperConfigProperties properties;
- private final Log log;
-
- public ZookeeperPropertySources(ZookeeperConfigProperties properties, Log log) {
- this.properties = properties;
- this.log = log;
- }
-
- public List getAutomaticContexts(List profiles) {
- return getAutomaticContexts(profiles, true);
- }
-
- public List getAutomaticContexts(List profiles, boolean reverse) {
- return generateAutomaticContexts(profiles, reverse).stream().map(Context::getPath).collect(Collectors.toList());
- }
-
- public List generateAutomaticContexts(List profiles, boolean reverse) {
- List contexts = new ArrayList<>();
- String root = properties.getRoot();
-
- String defaultContext = root + "/" + properties.getDefaultContext();
- contexts.add(new Context(defaultContext));
- addProfiles(contexts, defaultContext, profiles);
-
- StringBuilder baseContext = new StringBuilder(root);
- if (!properties.getName().startsWith("/")) {
- baseContext.append("/");
- }
- // getName() defaults to ${spring.application.name} or application
- baseContext.append(properties.getName());
- contexts.add(new Context(baseContext.toString()));
- addProfiles(contexts, baseContext.toString(), profiles);
-
- if (reverse) {
- Collections.reverse(contexts);
- }
- return contexts;
- }
-
- private void addProfiles(List contexts, String baseContext, List profiles) {
- for (String profile : profiles) {
- String path = baseContext + properties.getProfileSeparator() + profile;
- contexts.add(new Context(path, profile));
- }
- }
-
- public ZookeeperPropertySource createPropertySource(String context, boolean optional, CuratorFramework curator) {
- try {
- return new ZookeeperPropertySource(context, curator);
- // TODO: howto call close when /refresh
- }
- catch (Exception e) {
- if (this.properties.isFailFast() || !optional) {
- throw new ZookeeperPropertySourceNotFoundException(e);
- }
- else {
- log.warn("Unable to load zookeeper config from " + context, e);
- }
- }
- return null;
- }
- public static class Context {
-
- private final String path;
-
- private final String profile;
-
- public Context(String path) {
- this.path = path;
- this.profile = null;
- }
-
- public Context(String path, String profile) {
- this.path = path;
- this.profile = profile;
- }
-
- public String getPath() {
- return this.path;
- }
-
- public String getProfile() {
- return this.profile;
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("path", path).append("profile", profile).toString();
-
- }
-
- }
-
-
- static class ZookeeperPropertySourceNotFoundException extends RuntimeException {
-
- ZookeeperPropertySourceNotFoundException(Exception source) {
- super(source);
- }
- }
-}
diff --git a/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring.factories b/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 9d939ce80..000000000
--- a/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,18 +0,0 @@
-# Bootstrap Configuration
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.zookeeper.config.ZookeeperConfigBootstrapConfiguration
-
-# Environment PostProcessor
-org.springframework.boot.env.EnvironmentPostProcessor=\
-org.springframework.cloud.zookeeper.config.ZookeeperConfigDataMissingEnvironmentPostProcessor
-
-org.springframework.boot.diagnostics.FailureAnalyzer=\
-org.springframework.cloud.zookeeper.config.ZookeeperConfigDataMissingEnvironmentPostProcessor.ImportExceptionFailureAnalyzer
-
-# ConfigData Location Resolvers
-org.springframework.boot.context.config.ConfigDataLocationResolver=\
-org.springframework.cloud.zookeeper.config.ZookeeperConfigDataLocationResolver
-
-# ConfigData Loaders
-org.springframework.boot.context.config.ConfigDataLoader=\
-org.springframework.cloud.zookeeper.config.ZookeeperConfigDataLoader
diff --git a/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index b7fc39f7c..000000000
--- a/spring-cloud-zookeeper-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.cloud.zookeeper.config.ZookeeperConfigAutoConfiguration
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java
deleted file mode 100644
index 15733a8ad..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigAutoConfigurationTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.apache.zookeeper.KeeperException;
-import org.hamcrest.Matchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * @author Cesar Aguilera
- */
-public class ZookeeperConfigAutoConfigurationTests {
-
- @Rule
- public ExpectedException expectedException;
-
- @Before
- public void setUp() throws Exception {
- expectedException = ExpectedException.none();
- // makes Curator fail faster, otherwise it takes 15 seconds to trigger a retry
- System.setProperty("curator-default-connection-timeout", "0");
- }
-
- @After
- public void tearDown() throws Exception {
- System.clearProperty("curator-default-connection-timeout");
- }
-
- @Test(expected = NoSuchBeanDefinitionException.class)
- public void testConfigEnabledFalseDoesNotLoadZookeeperConfigAutoConfiguration() {
- ConfigurableApplicationContext context = new SpringApplicationBuilder()
- .listeners(new ZookeeperTestingServer())
- .sources(Config.class).web(WebApplicationType.NONE)
- .run("--spring.application.name=testZookeeperConfigEnabledSetToFalse",
- "--spring.config.use-legacy-processing=true",
- "--spring.jmx.default-domain=testZookeeperConfigEnabledSetToFalse",
- "--spring.cloud.zookeeper.config.connectString=localhost:2188",
- "--spring.cloud.zookeeper.baseSleepTimeMs=0",
- "--spring.cloud.zookeeper.maxRetries=0",
- "--spring.cloud.zookeeper.maxSleepMs=0",
- "--spring.cloud.zookeeper.blockUntilConnectedWait=0",
- "--spring.cloud.zookeeper.config.failFast=false",
- "--spring.cloud.zookeeper.config.enabled=false");
-
- context.getBean(ZookeeperConfigAutoConfiguration.class);
- }
-
- @Test
- public void testConfigEnabledTrueLoadsZookeeperConfigAutoConfiguration()
- throws Exception {
- expectedException.expectCause(Matchers.isA(KeeperException.class));
-
- new SpringApplicationBuilder().sources(Config.class).web(WebApplicationType.NONE)
- .listeners(new ZookeeperTestingServer())
- .run("--spring.application.name=testZookeeperConfigEnabledSetToTrue",
- "--spring.config.use-legacy-processing=true",
- "--spring.jmx.default-domain=testZookeeperConfigEnabledSetToTrue",
- "--spring.cloud.zookeeper.config.connectString=localhost:2188",
- "--spring.cloud.zookeeper.baseSleepTimeMs=0",
- "--spring.cloud.zookeeper.maxRetries=0",
- "--spring.cloud.zookeeper.maxSleepMs=0",
- "--spring.cloud.zookeeper.blockUntilConnectedWait=0",
- "--spring.cloud.zookeeper.config.failFast=false",
- "--spring.cloud.zookeeper.config.enabled=true");
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- static class Config {
-
- }
-
-}
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
deleted file mode 100644
index 7e916eac8..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.UUID;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.framework.imps.CuratorFrameworkImpl;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.BootstrapRegistry;
-import org.springframework.boot.BootstrapRegistryInitializer;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.properties.bind.BindContext;
-import org.springframework.boot.context.properties.bind.BindHandler;
-import org.springframework.boot.context.properties.bind.Bindable;
-import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
-import org.springframework.cloud.zookeeper.CuratorFactory;
-import org.springframework.cloud.zookeeper.ZookeeperProperties;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.ReflectionUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperConfigDataCustomizationIntegrationTests {
-
- private static final Log log = LogFactory
- .getLog(ZookeeperConfigDataCustomizationIntegrationTests.class);
-
- public static final String PREFIX = "test__configdata__";
-
- public static final String ROOT = "/" + PREFIX + UUID.randomUUID();
-
- private ConfigurableApplicationContext context;
- private BindHandlerBootstrapper bindHandlerBootstrapper;
-
- @Before
- public void setup() {
- bindHandlerBootstrapper = new BindHandlerBootstrapper();
- this.context = new SpringApplicationBuilder(Config.class)
- .listeners(new ZookeeperTestingServer())
- .web(WebApplicationType.NONE)
- .addBootstrapRegistryInitializer(bindHandlerBootstrapper)
- .addBootstrapRegistryInitializer(ZookeeperBootstrapper.fromBootstrapContext(this::curatorFramework))
- .run("--spring.config.import=zookeeper:",
- "--spring.application.name=testZkConfigDataIntegration",
- "--logging.level.org.springframework.cloud.zookeeper=DEBUG",
- "--spring.cloud.zookeeper.config.root=" + ROOT);
- }
-
- @After
- public void after() {
- if (context != null) {
- this.context.close();
- }
- }
-
- CuratorFramework curatorFramework(BootstrapContext context) {
- ZookeeperProperties properties = context.get(ZookeeperProperties.class);
- CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
- .retryPolicy(CuratorFactory.retryPolicy(properties))
- .connectString(properties.getConnectString());
- TestCuratorFramework curator = new TestCuratorFramework(builder);
- curator.start();
- try {
- curator.blockUntilConnected(properties.getBlockUntilConnectedWait(),
- properties.getBlockUntilConnectedUnit());
- }
- catch (InterruptedException e) {
- ReflectionUtils.rethrowRuntimeException(e);
- }
- return curator;
- }
-
- @Test
- public void curatorFrameworkIsCustom() {
- CuratorFramework curator = context.getBean(CuratorFramework.class);
- assertThat(curator).isNotNull().isInstanceOf(TestCuratorFramework.class);
- assertThat(bindHandlerBootstrapper.onSuccessCount).isGreaterThan(0);
- }
-
- static class TestCuratorFramework extends CuratorFrameworkImpl {
- TestCuratorFramework(CuratorFrameworkFactory.Builder builder) {
- super(builder);
- }
- }
-
- @Configuration
- @EnableAutoConfiguration
- static class Config {
-
- }
-
- static class BindHandlerBootstrapper implements BootstrapRegistryInitializer {
-
- private int onSuccessCount = 0;
-
- @Override
- public void initialize(BootstrapRegistry registry) {
- registry.register(BindHandler.class, context -> new BindHandler() {
- @Override
- public Object onSuccess(ConfigurationPropertyName name, Bindable target, BindContext context,
- Object result) {
- onSuccessCount++;
- return result;
- }
- });
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataIntegrationTests.java
deleted file mode 100644
index c6d3d9a2a..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataIntegrationTests.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.retry.RetryOneTime;
-import org.apache.zookeeper.KeeperException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.cloud.context.refresh.ConfigDataContextRefresher;
-import org.springframework.cloud.context.refresh.ContextRefresher;
-import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperConfigDataIntegrationTests {
-
- private static final Log log = LogFactory
- .getLog(ZookeeperConfigDataIntegrationTests.class);
-
- public static final String APPLICATION_NAME = "testZkConfigDataIntegration";
-
- public static final String PREFIX = "test__configdata__";
-
- public static final String ROOT = "/" + PREFIX + UUID.randomUUID();
-
- public static final String CONTEXT = ROOT + "/application/";
-
- public static final String KEY_BASIC = "testProp";
-
- public static final String KEY_BASIC_PATH = CONTEXT + KEY_BASIC;
-
- public static final String KEY_APP_PATH = ROOT + "/" + APPLICATION_NAME + "/" + KEY_BASIC;
-
- public static final String VAL_BASIC_DEFAULT = "testPropValDefault";
-
- public static final String VAL_BASIC = "testPropVal";
-
- public static final String KEY_WITH_DOT = "testProp.dot";
-
- public static final String KEY_WITH_DOT_PATH = CONTEXT + KEY_WITH_DOT;
-
- public static final String VAL_WITH_DOT = "withDotVal";
-
- public static final String KEY_NESTED = "testProp.nested";
-
- public static final String KEY_NESTED_PATH = CONTEXT + KEY_NESTED.replace('.', '/');
-
- public static final String VAL_NESTED = "nestedVal";
-
- public static final String KEY_WITHOUT_VALUE = "testProp.novalue";
-
- public static final String KEY_WITHOUT_VALUE_PATH = CONTEXT + KEY_WITHOUT_VALUE;
-
- private ConfigurableEnvironment environment;
-
- private ConfigurableApplicationContext context;
-
- private CuratorFramework curator;
- private ZookeeperTestingServer testingServer;
-
- @Before
- public void setup() throws Exception {
- testingServer = new ZookeeperTestingServer();
- testingServer.start();
- String connectString = "localhost:" + testingServer.getPort();
- this.curator = CuratorFrameworkFactory.builder()
- .retryPolicy(new RetryOneTime(500)).connectString(connectString).build();
- this.curator.start();
-
- List children = this.curator.getChildren().forPath("/");
- for (String child : children) {
- if (child.startsWith(PREFIX) && child.length() > PREFIX.length()) {
- delete("/" + child);
- }
- }
-
- StringBuilder create = new StringBuilder(1024);
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_BASIC_PATH, VAL_BASIC_DEFAULT.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_APP_PATH, VAL_BASIC.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_WITH_DOT_PATH, VAL_WITH_DOT.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_NESTED_PATH, VAL_NESTED.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_WITHOUT_VALUE_PATH, null)).append('\n');
- this.curator.close();
- System.out.println(create);
-
- this.context = new SpringApplicationBuilder(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.config.import=zookeeper:" + connectString,
- "--spring.application.name=" + APPLICATION_NAME,
- "--logging.level.org.springframework.cloud.zookeeper=DEBUG",
- "--spring.cloud.zookeeper.config.root=" + ROOT);
-
- this.curator = this.context.getBean(CuratorFramework.class);
- this.environment = this.context.getEnvironment();
- }
-
- public void delete(String path) throws Exception {
- try {
- this.curator.delete().deletingChildrenIfNeeded().forPath(path);
- }
- catch (KeeperException e) {
- if (e.code() != KeeperException.Code.NONODE) {
- throw e;
- }
- }
- }
-
- @After
- public void after() throws Exception {
- try {
- delete(ROOT);
- }
- finally {
- this.context.close();
- this.testingServer.close();
- }
- }
-
- @Test
- public void checkKeyValues() {
- String propValue = this.environment.getProperty(KEY_BASIC);
- assertThat(propValue).as(KEY_BASIC + " was wrong").isEqualTo(VAL_BASIC);
-
- propValue = this.environment.getProperty(KEY_NESTED);
- assertThat(propValue).as(VAL_NESTED + " was wrong").isEqualTo(VAL_NESTED);
-
- propValue = this.environment.getProperty(KEY_WITH_DOT);
- assertThat(propValue).as(VAL_WITH_DOT + " was wrong").isEqualTo(VAL_WITH_DOT);
-
- propValue = this.environment.getProperty(KEY_WITHOUT_VALUE);
- assertThat(propValue).as(KEY_WITHOUT_VALUE + " was wrong").isEmpty();
- }
-
- @Test
- public void propertyLoadedAndUpdated() throws Exception {
- String testProp = this.environment.getProperty(KEY_BASIC);
- assertThat(testProp).as("testProp was wrong").isEqualTo(VAL_BASIC);
-
- this.curator.setData().forPath(KEY_APP_PATH, "testPropValUpdate".getBytes());
-
- CountDownLatch latch = this.context.getBean(CountDownLatch.class);
- boolean receivedEvent = latch.await(15, TimeUnit.SECONDS);
- assertThat(receivedEvent).as("listener didn't receive event").isTrue();
-
- testProp = this.environment.getProperty(KEY_BASIC);
- assertThat(testProp).as("testProp was wrong after update")
- .isEqualTo("testPropValUpdate");
- }
-
- @Configuration
- @EnableAutoConfiguration
- static class Config implements ApplicationListener {
-
- @Bean
- public CountDownLatch countDownLatch() {
- return new CountDownLatch(1);
- }
-
- @Bean
- public ContextRefresher contextRefresher(ConfigurableApplicationContext context,
- RefreshScope scope) {
- return new ConfigDataContextRefresher(context, scope);
- }
-
- @Override
- public void onApplicationEvent(EnvironmentChangeEvent event) {
- log.debug("Event keys: " + event.getKeys());
- if (event.getKeys().contains(KEY_BASIC)) {
- countDownLatch().countDown();
- }
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolverTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolverTests.java
deleted file mode 100644
index 17eb05143..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolverTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.ConfigurableBootstrapContext;
-import org.springframework.boot.context.config.ConfigDataLocation;
-import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
-import org.springframework.boot.context.config.Profiles;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.mock.env.MockEnvironment;
-import org.springframework.web.util.UriComponents;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class ZookeeperConfigDataLocationResolverTests {
-
- @Test
- public void testParseLocation() {
- ZookeeperConfigDataLocationResolver resolver = new ZookeeperConfigDataLocationResolver(destination -> LogFactory.getLog(ZookeeperConfigDataLocationResolver.class));
- UriComponents uriComponents = resolver.parseLocation(
- ConfigDataLocation.of("zookeeper:myhost:2182/mypath1;/mypath2;/mypath3"));
- assertThat(uriComponents.toUri()).hasScheme("zookeeper").hasHost("myhost")
- .hasPort(2182).hasPath("/mypath1;/mypath2;/mypath3");
-
- uriComponents = resolver.parseLocation(ConfigDataLocation.of("zookeeper:myhost:2182"));
- assertThat(uriComponents.toUri()).hasScheme("zookeeper").hasHost("myhost")
- .hasPort(2182).hasPath("");
- }
-
- @Test
- public void testResolveProfileSpecificWithCustomPaths() {
- String location = "zookeeper:myhost:2182/mypath1;/mypath2;/mypath3";
- List locations = testResolveProfileSpecific(location);
- assertThat(locations).hasSize(3);
- assertThat(toContexts(locations)).containsExactly("/mypath1", "/mypath2",
- "/mypath3");
- }
-
- @Test
- public void testResolveProfileSpecificWithAutomaticPaths() {
- String location = "zookeeper:myhost:1234";
- List locations = testResolveProfileSpecific(location);
- assertThat(locations).hasSize(4);
- assertThat(toContexts(locations)).containsExactly("config/application",
- "config/application,dev", "config/testapp", "config/testapp,dev");
- }
-
- private List toContexts(List locations) {
- return locations.stream().map(ZookeeperConfigDataResource::getContext)
- .collect(Collectors.toList());
- }
-
- private List testResolveProfileSpecific(String location) {
- ZookeeperConfigDataLocationResolver resolver = createResolver();
-
- MockEnvironment env = new MockEnvironment();
- env.setProperty("spring.application.name", "testapp");
-
- ConfigurableBootstrapContext bootstrapContext = mock(ConfigurableBootstrapContext.class);
-
- ConfigDataLocationResolverContext context = mock(
- ConfigDataLocationResolverContext.class);
-
- when(context.getBootstrapContext()).thenReturn(bootstrapContext);
- when(context.getBinder()).thenReturn(Binder.get(env));
-
- Profiles profiles = mock(Profiles.class);
- when(profiles.getAccepted()).thenReturn(Collections.singletonList("dev"));
-
- return resolver.resolveProfileSpecific(context, ConfigDataLocation.of(location), profiles);
- }
-
- private ZookeeperConfigDataLocationResolver createResolver() {
- return new ZookeeperConfigDataLocationResolver(destination -> LogFactory.getLog(ZookeeperConfigDataLocationResolver.class));
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataMissingEnvironmentPostProcessorTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataMissingEnvironmentPostProcessorTests.java
deleted file mode 100644
index 148528748..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataMissingEnvironmentPostProcessorTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.mock.env.MockEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Ryan Baxter
- */
-class ZookeeperConfigDataMissingEnvironmentPostProcessorTests {
-
- @Test
- void noSpringConfigImport() {
- MockEnvironment environment = new MockEnvironment();
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatThrownBy(() -> processor.postProcessEnvironment(environment, app))
- .isInstanceOf(ZookeeperConfigDataMissingEnvironmentPostProcessor.ImportException.class);
- }
-
- @Test
- void boostrap() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.cloud.bootstrap.enabled", "true");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void legacy() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.config.use-legacy-processing", "true");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void configNotEnabled() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.cloud.zookeeper.enabled", "false");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void importCheckNotEnabled() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.cloud.zookeeper.config.import-check.enabled", "false");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void importSinglePropertySource() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.config.import", "zookeeper:http://localhost:8888");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void importMultiplePropertySource() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.config.import", "zookeeper:http://localhost:8888,file:./app.properties");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
- @Test
- void importMultiplePropertySourceAsList() {
- MockEnvironment environment = new MockEnvironment();
- environment.setProperty("spring.config.import[0]", "zookeeper:http://localhost:8888");
- environment.setProperty("spring.config.import[1]", "file:./app.properties");
- SpringApplication app = mock(SpringApplication.class);
- ZookeeperConfigDataMissingEnvironmentPostProcessor processor = new ZookeeperConfigDataMissingEnvironmentPostProcessor();
- assertThatCode(() -> processor.postProcessEnvironment(environment, app)).doesNotThrowAnyException();
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNoImportIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNoImportIntegrationTests.java
deleted file mode 100644
index 85a65e13f..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNoImportIntegrationTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.system.CapturedOutput;
-import org.springframework.boot.test.system.OutputCaptureExtension;
-import org.springframework.cloud.commons.ConfigDataMissingEnvironmentPostProcessor;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.cloud.zookeeper.config.ZookeeperConfigDataLocationResolver.PREFIX;
-
-/**
- * @author Spencer Gibb
- */
-@ExtendWith(OutputCaptureExtension.class)
-public class ZookeeperConfigDataNoImportIntegrationTests {
-
- private static final String APP_NAME = "testZookeeperConfigDataNoImport";
-
- @Test
- public void exceptionThrownIfNoImport(CapturedOutput output) {
- Assertions.assertThatThrownBy(() -> new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE)
- .run("--spring.application.name=" + APP_NAME)).isInstanceOf(ConfigDataMissingEnvironmentPostProcessor.ImportException.class);
-
- assertThat(output).contains("No spring.config.import property has been defined")
- .contains("Add a spring.config.import=zookeeper: property to your configuration");
- }
-
- @Test
- public void exceptionThrownIfImportMissingZookeeper(CapturedOutput output) {
- Assertions.assertThatThrownBy(() -> new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE).run(
- "--spring.config.import=optional:file:somefile.properties", "--spring.application.name=" + APP_NAME))
- .isInstanceOf(ConfigDataMissingEnvironmentPostProcessor.ImportException.class);
-
- assertThat(output).contains("spring.config.import property is missing a " + PREFIX)
- .contains("Add a spring.config.import=zookeeper: property to your configuration");
- }
-
- @Test
- public void noExceptionThrownIfZookeeperDisabled() {
- try (ConfigurableApplicationContext context = new SpringApplicationBuilder(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.cloud.zookeeper.enabled=false", "--spring.application.name=" + APP_NAME)) {
- // nothing to do
- }
- }
-
- @Test
- public void noExceptionThrownIfZookeeperConfigDisabled() {
- try (ConfigurableApplicationContext context = new SpringApplicationBuilder(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.cloud.zookeeper.config.enabled=false", "--spring.application.name=" + APP_NAME)) {
- // nothing to do
- }
- }
-
- @Test
- public void noExceptionThrownIfImportCheckDisabled() {
- try (ConfigurableApplicationContext context = new SpringApplicationBuilder(Config.class)
- .web(WebApplicationType.NONE).run("--spring.cloud.zookeeper.config.import-check.enabled=false",
- "--spring.application.name=" + APP_NAME)) {
- // nothing to do
- }
- }
-
- @Configuration
- @EnableAutoConfiguration
- static class Config {
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNotOptionalIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNotOptionalIntegrationTests.java
deleted file mode 100644
index 6b2ebaf22..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataNotOptionalIntegrationTests.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
-import org.springframework.cloud.context.refresh.ConfigDataContextRefresher;
-import org.springframework.cloud.context.refresh.ContextRefresher;
-import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperConfigDataNotOptionalIntegrationTests {
-
- @Test
- public void configDataNotFoundThrowsException() {
- Assertions.assertThatThrownBy(() -> {
- ConfigurableApplicationContext context = null;
- try {
- context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE).run(
- "--spring.cloud.zookeeper.connect-string=notexistantdomain:5000", "--debug=true",
- "--spring.cloud.zookeeper.max-retries=0",
- "--spring.cloud.zookeeper.blockUntilConnectedWait=1",
- "--spring.cloud.zookeeper.blockUntilConnectedUnit=MILLISECONDS",
- "--spring.cloud.zookeeper.connection-timeout=1ms",
- "--spring.config.import=zookeeper:",
- "--spring.application.name=testZkConfigDataNotOptionalIntegration",
- "--logging.level.org.springframework.cloud.zookeeper=DEBUG",
- "--spring.cloud.zookeeper.config.root=/shouldfail");
-
- }
- finally {
- if (context != null) {
- context.close();
- }
- }
- }).isInstanceOf(ConfigDataResourceNotFoundException.class);
- }
-
- @Configuration
- @EnableAutoConfiguration
- static class Config {
-
- @Bean
- public ContextRefresher contextRefresher(ConfigurableApplicationContext context, RefreshScope scope) {
- return new ConfigDataContextRefresher(context, scope);
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java
deleted file mode 100644
index f7fa13f6b..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorFailFastTests.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * @author Enrique Recarte Llorens
- * @author Olga Maciaszek-Sharma
- */
-public class ZookeeperPropertySourceLocatorFailFastTests {
-
- @Before
- public void setUp() {
- // This system property makes Curator fail faster, otherwise it takes 15 seconds
- // to trigger a retry
- System.setProperty("curator-default-connection-timeout", "0");
- }
-
- @After
- public void tearDown() {
- System.clearProperty("curator-default-connection-timeout");
- }
-
- @Test
- public void testFailFastFalseLoadsTheApplicationContext() {
- assertThatCode(() -> {
- new SpringApplicationBuilder().sources(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.application.name=testZookeeperPropertySourceLocatorFailFast",
- "--spring.config.use-legacy-processing=true",
- "--spring.cloud.zookeeper.config.connectString=localhost:2188",
- "--spring.cloud.zookeeper.baseSleepTimeMs=0",
- "--spring.cloud.zookeeper.maxRetries=0",
- "--spring.cloud.zookeeper.maxSleepMs=0",
- "--spring.cloud.zookeeper.blockUntilConnectedWait=0",
- "--spring.cloud.zookeeper.config.failFast=false");
- }).doesNotThrowAnyException();
- }
-
- @Test
- public void testFailFastTrueDoesNotLoadTheApplicationContext() {
- assertThatThrownBy(() -> {
- new SpringApplicationBuilder().sources(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.application.name=testZookeeperPropertySourceLocatorFailFast",
- "--spring.config.use-legacy-processing=true",
- "--spring.cloud.zookeeper.config.connectString=localhost:2188",
- "--spring.cloud.zookeeper.baseSleepTimeMs=0",
- "--spring.cloud.zookeeper.maxRetries=0",
- "--spring.cloud.zookeeper.maxSleepMs=0",
- "--spring.cloud.zookeeper.blockUntilConnectedWait=0",
- "--spring.cloud.zookeeper.config.failFast=true");
- })
- .isNotNull();
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- static class Config {
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorNoApplicationNameTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorNoApplicationNameTests.java
deleted file mode 100644
index 2e3bb1086..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorNoApplicationNameTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.api.GetChildrenBuilder;
-import org.junit.Test;
-
-import org.springframework.mock.env.MockEnvironment;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperPropertySourceLocatorNoApplicationNameTests {
-
- @Test
- public void defaultSpringApplicationNameWorks() {
- CuratorFramework curator = mock(CuratorFramework.class);
- when(curator.getChildren()).thenReturn(mock(GetChildrenBuilder.class));
- ZookeeperConfigProperties properties = new ZookeeperConfigProperties();
- properties.setName("notempty");
- ZookeeperPropertySourceLocator locator = new ZookeeperPropertySourceLocator(
- curator, properties);
- locator.locate(new MockEnvironment());
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java
deleted file mode 100644
index a4f06258e..000000000
--- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySourceLocatorTests.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.framework.api.GetChildrenBuilder;
-import org.apache.curator.retry.RetryOneTime;
-import org.apache.zookeeper.KeeperException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.cloud.context.refresh.ContextRefresher;
-import org.springframework.cloud.context.refresh.LegacyContextRefresher;
-import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.PropertySource;
-import org.springframework.mock.env.MockEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperPropertySourceLocatorTests {
-
- private static final Log log = LogFactory
- .getLog(ZookeeperPropertySourceLocatorTests.class);
-
- public static final String PREFIX = "test__config__";
-
- public static final String ROOT = "/" + PREFIX + UUID.randomUUID();
-
- public static final String CONTEXT = ROOT + "/application/";
-
- public static final String KEY_BASIC = "testProp";
-
- public static final String KEY_BASIC_PATH = CONTEXT + KEY_BASIC;
-
- public static final String VAL_BASIC = "testPropVal";
-
- public static final String KEY_WITH_DOT = "testProp.dot";
-
- public static final String KEY_WITH_DOT_PATH = CONTEXT + KEY_WITH_DOT;
-
- public static final String VAL_WITH_DOT = "withDotVal";
-
- public static final String KEY_NESTED = "testProp.nested";
-
- public static final String KEY_NESTED_PATH = CONTEXT + KEY_NESTED.replace('.', '/');
-
- public static final String VAL_NESTED = "nestedVal";
-
- public static final String KEY_WITHOUT_VALUE = "testProp.novalue";
-
- public static final String KEY_WITHOUT_VALUE_PATH = CONTEXT + KEY_WITHOUT_VALUE;
-
- private ConfigurableEnvironment environment;
-
- private ConfigurableApplicationContext context;
-
- private ZookeeperTestingServer testingServer;
-
- private CuratorFramework curator;
-
- private ZookeeperConfigProperties properties;
-
- @Before
- public void setup() throws Exception {
- this.testingServer = new ZookeeperTestingServer();
- testingServer.start();
- String connectString = "localhost:" + testingServer.getPort();
- this.curator = CuratorFrameworkFactory.builder()
- .retryPolicy(new RetryOneTime(500)).connectString(connectString).build();
- this.curator.start();
-
- List children = this.curator.getChildren().forPath("/");
- for (String child : children) {
- if (child.startsWith(PREFIX) && child.length() > PREFIX.length()) {
- delete("/" + child);
- }
- }
-
- StringBuilder create = new StringBuilder(1024);
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_BASIC_PATH, VAL_BASIC.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_WITH_DOT_PATH, VAL_WITH_DOT.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_NESTED_PATH, VAL_NESTED.getBytes())).append('\n');
- create.append(this.curator.create().creatingParentsIfNeeded()
- .forPath(KEY_WITHOUT_VALUE_PATH, null)).append('\n');
- this.curator.close();
- System.out.println(create);
-
- this.context = new SpringApplicationBuilder(Config.class)
- .web(WebApplicationType.NONE)
- .run("--spring.cloud.zookeeper.connectString=" + connectString,
- "--spring.config.use-legacy-processing=true",
- "--spring.application.name=testZkPropertySource",
- "--logging.level.org.springframework.cloud.zookeeper=DEBUG",
- "--spring.cloud.zookeeper.config.root=" + ROOT);
-
- this.curator = this.context.getBean(CuratorFramework.class);
- this.properties = this.context.getBean(ZookeeperConfigProperties.class);
- this.environment = this.context.getEnvironment();
- }
-
- public void delete(String path) throws Exception {
- try {
- this.curator.delete().deletingChildrenIfNeeded().forPath(path);
- }
- catch (KeeperException e) {
- if (e.code() != KeeperException.Code.NONODE) {
- throw e;
- }
- }
- }
-
- @After
- public void after() throws Exception {
- try {
- delete(this.properties.getRoot());
- }
- finally {
- this.context.close();
- this.testingServer.close();
- }
- }
-
- @Test
- public void checkKeyValues() throws Exception {
- String propValue = this.environment.getProperty(KEY_BASIC);
- assertThat(propValue).as(KEY_BASIC + " was wrong").isEqualTo(VAL_BASIC);
-
- propValue = this.environment.getProperty(KEY_NESTED);
- assertThat(propValue).as(VAL_NESTED + " was wrong").isEqualTo(VAL_NESTED);
-
- propValue = this.environment.getProperty(KEY_WITH_DOT);
- assertThat(propValue).as(VAL_WITH_DOT + " was wrong").isEqualTo(VAL_WITH_DOT);
-
- propValue = this.environment.getProperty(KEY_WITHOUT_VALUE);
- assertThat(propValue).as(KEY_WITHOUT_VALUE + " was wrong").isEmpty();
- }
-
- @Test
- public void propertyLoadedAndUpdated() throws Exception {
- String testProp = this.environment.getProperty(KEY_BASIC);
- assertThat(testProp).as("testProp was wrong").isEqualTo(VAL_BASIC);
-
- this.curator.setData().forPath(KEY_BASIC_PATH, "testPropValUpdate".getBytes());
-
- CountDownLatch latch = this.context.getBean(CountDownLatch.class);
- boolean receivedEvent = latch.await(15, TimeUnit.SECONDS);
- assertThat(receivedEvent).as("listener didn't receive event").isTrue();
-
- testProp = this.environment.getProperty(KEY_BASIC);
- assertThat(testProp).as("testProp was wrong after update")
- .isEqualTo("testPropValUpdate");
- }
-
- @Test
- public void compositePropertySourceHoldsPropertySourcesInCorrectOrder() {
-
- // given
- final String defaultContext = "someDefaultContext";
- final String someName = "someName";
- final String someProfile = "someProfile";
-
- final CuratorFramework curator = mock(CuratorFramework.class);
- when(curator.getChildren()).thenReturn(mock(GetChildrenBuilder.class));
-
- final MockEnvironment mockEnvironment = new MockEnvironment();
- mockEnvironment.setActiveProfiles(someProfile);
-
- final ZookeeperConfigProperties properties = new ZookeeperConfigProperties();
- properties.setName(someName);
- properties.setDefaultContext(defaultContext);
-
- final ZookeeperPropertySourceLocator locator = new ZookeeperPropertySourceLocator(
- curator, properties);
-
- // when
- final PropertySource propertySource = locator.locate(mockEnvironment);
-
- // then
- assertThat(propertySource).isInstanceOf(CompositePropertySource.class);
-
- // and
- final ArrayList> propertySources = new ArrayList<>(
- ((CompositePropertySource) propertySource).getPropertySources());
-
- assertThat(propertySources.get(0).getName())
- .endsWith(someName + properties.getProfileSeparator() + someProfile);
- assertThat(propertySources.get(1).getName()).endsWith(someName);
- assertThat(propertySources.get(2).getName()).endsWith(
- defaultContext + properties.getProfileSeparator() + someProfile);
- assertThat(propertySources.get(3).getName()).endsWith(defaultContext);
- }
-
- @Configuration
- @EnableAutoConfiguration
- static class Config implements ApplicationListener {
-
- @Bean
- public CountDownLatch countDownLatch() {
- return new CountDownLatch(1);
- }
-
- @Bean
- public ContextRefresher contextRefresher(ConfigurableApplicationContext context,
- RefreshScope scope) {
- return new LegacyContextRefresher(context, scope);
- }
-
- @Override
- public void onApplicationEvent(EnvironmentChangeEvent event) {
- log.debug("Event keys: " + event.getKeys());
- if (event.getKeys().contains(KEY_BASIC)) {
- countDownLatch().countDown();
- }
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-config/src/test/resources/application.yml b/spring-cloud-zookeeper-config/src/test/resources/application.yml
deleted file mode 100644
index 7a74dfbd3..000000000
--- a/spring-cloud-zookeeper-config/src/test/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-logging:
- level:
- org.apache.zookeeper.ClientCnxn: ERROR
\ No newline at end of file
diff --git a/spring-cloud-zookeeper-core/.flattened-pom.xml b/spring-cloud-zookeeper-core/.flattened-pom.xml
new file mode 100644
index 000000000..14ddbff02
--- /dev/null
+++ b/spring-cloud-zookeeper-core/.flattened-pom.xml
@@ -0,0 +1,170 @@
+
+
+ 4.0.0
+
+ org.springframework.cloud
+ spring-cloud-zookeeper
+ 4.1.0-SNAPSHOT
+ ..
+
+ org.springframework.cloud
+ spring-cloud-zookeeper-core
+ 4.1.0-SNAPSHOT
+ Spring Cloud Zookeeper Core
+ Spring Cloud Zookeeper Core
+ https://spring.io/spring-cloud/spring-cloud-zookeeper/spring-cloud-zookeeper-core
+
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+
+
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0
+ Copyright 2014-2021 the original author or authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+
+ dsyer
+ Dave Syer
+ dsyer at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ sgibb
+ Spencer Gibb
+ sgibb at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ mgrzejszczak
+ Marcin Grzejszczak
+ mgrzejszczak at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ rbaxter
+ Ryan Baxter
+ rbaxter at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ omaciaszeksharma
+ Olga Maciaszek-Sharma
+ omaciaszeksharma at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+
+ scm:git:git://github.com/spring-cloud/spring-cloud-zookeeper.git/spring-cloud-zookeeper-core
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-zookeeper.git/spring-cloud-zookeeper-core
+ https://github.com/spring-cloud/spring-cloud-zookeeper/spring-cloud-zookeeper-core
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-commons
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.apache.curator
+ curator-x-discovery
+ 5.1.0
+ compile
+
+
+ log4j
+ log4j
+
+
+ io.netty
+ netty
+
+
+ true
+
+
+ org.apache.curator
+ curator-framework
+ 5.1.0
+ compile
+
+
+ log4j
+ log4j
+
+
+ io.netty
+ netty
+
+
+ true
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+
diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml
deleted file mode 100644
index 67631b390..000000000
--- a/spring-cloud-zookeeper-core/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
- 4.0.0
-
- spring-cloud-zookeeper-core
- jar
- Spring Cloud Zookeeper Core
- Spring Cloud Zookeeper Core
-
-
- org.springframework.cloud
- spring-cloud-zookeeper
- 4.1.0-SNAPSHOT
- ..
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.2.0
-
-
-
- test-jar
-
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
- org.springframework.boot
- spring-boot-starter-web
- true
-
-
- org.springframework.boot
- spring-boot-starter-actuator
- true
-
-
- org.springframework.cloud
- spring-cloud-commons
- true
-
-
- org.apache.curator
- curator-x-discovery
- true
-
-
- org.apache.curator
- curator-framework
- true
-
-
- org.springframework.boot
- spring-boot-autoconfigure-processor
- true
-
-
- org.apache.curator
- curator-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- test
-
-
-
-
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ConditionalOnZookeeperEnabled.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ConditionalOnZookeeperEnabled.java
deleted file mode 100644
index 4bf73c44e..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ConditionalOnZookeeperEnabled.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
-/**
- * Wrapper annotation to enable Zookeeper.
- *
- * @author Marcin Grzejszczak
- * @since 1.1.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@ConditionalOnProperty(value = "spring.cloud.zookeeper.enabled", matchIfMissing = true)
-public @interface ConditionalOnZookeeperEnabled {
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java
deleted file mode 100644
index 41b190643..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.drivers.TracerDriver;
-import org.apache.curator.ensemble.EnsembleProvider;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.retry.ExponentialBackoffRetry;
-
-import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.BootstrapRegistry;
-import org.springframework.boot.context.config.ConfigDataException;
-import org.springframework.boot.context.properties.bind.Bindable;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.util.StringUtils;
-import org.springframework.web.util.UriComponents;
-
-public abstract class CuratorFactory {
-
- private static final Log log = LogFactory.getLog(ZookeeperAutoConfiguration.class);
-
- public static CuratorFramework curatorFramework(ZookeeperProperties properties, RetryPolicy retryPolicy,
- Supplier> optionalCuratorFrameworkCustomizerProvider,
- Supplier optionalEnsembleProvider, Supplier optionalTracerDriverProvider)
- throws Exception {
- CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder();
-
- EnsembleProvider ensembleProvider = optionalEnsembleProvider.get();
- if (ensembleProvider != null) {
- builder.ensembleProvider(ensembleProvider);
- }
- else {
- builder.connectString(properties.getConnectString());
- }
- builder.sessionTimeoutMs((int) properties.getSessionTimeout().toMillis())
- .connectionTimeoutMs((int) properties.getConnectionTimeout().toMillis()).retryPolicy(retryPolicy);
-
- Stream customizers = optionalCuratorFrameworkCustomizerProvider.get();
- if (customizers != null) {
- customizers.forEach(curatorFrameworkCustomizer -> curatorFrameworkCustomizer.customize(builder));
- }
-
- CuratorFramework curator = builder.build();
- TracerDriver tracerDriver = optionalTracerDriverProvider.get();
- if (tracerDriver != null && curator.getZookeeperClient() != null) {
- curator.getZookeeperClient().setTracerDriver(tracerDriver);
- }
-
- curator.start();
- if (log.isTraceEnabled()) {
- log.trace("blocking until connected to zookeeper for " + properties.getBlockUntilConnectedWait()
- + properties.getBlockUntilConnectedUnit());
- }
- curator.blockUntilConnected(properties.getBlockUntilConnectedWait(), properties.getBlockUntilConnectedUnit());
- if (log.isTraceEnabled()) {
- log.trace("connected to zookeeper");
- }
- return curator;
- }
-
- public static RetryPolicy retryPolicy(ZookeeperProperties properties) {
- return new ExponentialBackoffRetry(properties.getBaseSleepTimeMs(), properties.getMaxRetries(),
- properties.getMaxSleepMs());
- }
-
- public static void registerCurator(BootstrapRegistry registery, UriComponents location, boolean optional) {
- registerCurator(registery, location, optional, bootstrapContext -> true);
- }
-
- public static void registerCurator(BootstrapRegistry registery, UriComponents location, boolean optional,
- Predicate predicate) {
- registery.registerIfAbsent(ZookeeperProperties.class, context -> {
- if (!predicate.test(context)) {
- return null;
- }
- return loadProperties(context.get(Binder.class), location);
- });
-
- registery.registerIfAbsent(RetryPolicy.class, context -> {
- if (!predicate.test(context)) {
- return null;
- }
- return retryPolicy(context.get(ZookeeperProperties.class));
- });
-
- registery.registerIfAbsent(CuratorFramework.class, context -> {
- if (!predicate.test(context)) {
- return null;
- }
- return curatorFramework(context, context.get(ZookeeperProperties.class), optional);
- });
-
- // promote beans to context
- registery.addCloseListener(event -> {
- BootstrapContext context = event.getBootstrapContext();
- if (predicate.test(context)) {
- CuratorFramework curatorFramework = context.get(CuratorFramework.class);
- if (!event.getApplicationContext().getBeanFactory().containsBean("configDataCuratorFramework")) {
- event.getApplicationContext().getBeanFactory().registerSingleton("configDataCuratorFramework",
- curatorFramework);
- }
- }
- });
-
- }
-
- static ZookeeperProperties loadProperties(Binder binder, UriComponents location) {
- ZookeeperProperties properties = binder.bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class))
- .orElse(new ZookeeperProperties());
-
- if (location != null && StringUtils.hasText(location.getHost())) {
- if (location.getPort() < 0) {
- throw new IllegalArgumentException(
- "zookeeper port must be greater than or equal to zero: " + location.getPort());
- }
- properties.setConnectString(location.getHost() + ":" + location.getPort());
- }
-
- return properties;
- }
-
- private static CuratorFramework curatorFramework(BootstrapContext context, ZookeeperProperties properties,
- boolean optional) {
-
- Supplier> customizers;
- // TODO: use new apis after milestone release
- try {
- CuratorFrameworkCustomizer customizer = context.get(CuratorFrameworkCustomizer.class);
- customizers = () -> Stream.of(customizer);
- }
- catch (IllegalStateException e) {
- customizers = () -> null;
- }
- try {
- return CuratorFactory.curatorFramework(properties, context.get(RetryPolicy.class), customizers,
- supplier(context, EnsembleProvider.class), supplier(context, TracerDriver.class));
- }
- catch (Exception e) {
- if (!optional) {
- log.error("Unable to connect to zookeeper", e);
- throw new ZookeeperConnectException("Unable to connect to zookeeper", e);
- }
- if (log.isDebugEnabled()) {
- log.debug("Unable to connect to zookeeper", e);
- }
- }
- return null;
- }
-
- private static Supplier supplier(BootstrapContext context, Class type) {
- try {
- // TODO: use new apis after milestone release
- T instance = context.get(type);
- return () -> instance;
- }
- catch (IllegalStateException e) {
- return () -> null;
- }
- }
-
- private static class ZookeeperConnectException extends ConfigDataException {
-
- /**
- * Create a new {@link ConfigDataException} instance.
- * @param message the exception message
- * @param cause the exception cause
- */
- protected ZookeeperConnectException(String message, Throwable cause) {
- super(message, cause);
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFrameworkCustomizer.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFrameworkCustomizer.java
deleted file mode 100644
index e450a5e54..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFrameworkCustomizer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-
-import org.springframework.beans.factory.ObjectProvider;
-
-/**
- * Beans that implement this interface will be used by the
- * {@link ZookeeperAutoConfiguration#curatorFramework(RetryPolicy, ZookeeperProperties, ObjectProvider, ObjectProvider, ObjectProvider)
- * ZookeeperAutoConfiguration} ZookeeperAutoConfiguration} to further customize the
- * {@link CuratorFramework} that it provides.
- *
- * @author Bernardo Gomez Palacio.
- * @see ZookeeperAutoConfiguration
- */
-@FunctionalInterface
-public interface CuratorFrameworkCustomizer {
-
- /**
- * Customize the {@link CuratorFrameworkFactory.Builder}.
- * @param builder instance of the builder that you can further customize.
- */
- void customize(CuratorFrameworkFactory.Builder builder);
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java
deleted file mode 100644
index 606cd5121..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.drivers.TracerDriver;
-import org.apache.curator.ensemble.EnsembleProvider;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.UriSpec;
-import org.apache.zookeeper.ClientCnxnSocketNIO;
-
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
- * Auto-configuration} that sets up Zookeeper discovery.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnZookeeperEnabled
-@EnableConfigurationProperties
-public class ZookeeperAutoConfiguration {
-
- private static final Log log = LogFactory.getLog(ZookeeperAutoConfiguration.class);
-
- @Bean
- @ConditionalOnMissingBean
- public ZookeeperProperties zookeeperProperties() {
- return new ZookeeperProperties();
- }
-
- @Bean(destroyMethod = "close")
- @ConditionalOnMissingBean
- public CuratorFramework curatorFramework(ZookeeperProperties properties, RetryPolicy retryPolicy,
- ObjectProvider optionalCuratorFrameworkCustomizerProvider,
- ObjectProvider optionalEnsembleProvider,
- ObjectProvider optionalTracerDriverProvider) throws Exception {
- return CuratorFactory.curatorFramework(properties, retryPolicy,
- optionalCuratorFrameworkCustomizerProvider::orderedStream, optionalEnsembleProvider::getIfAvailable,
- optionalTracerDriverProvider::getIfAvailable);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public RetryPolicy exponentialBackoffRetry(ZookeeperProperties properties) {
- return CuratorFactory.retryPolicy(properties);
- }
-
-}
-
-// TODO: remove after GraalVM metadata PR merged
-class ZookeeperCoreHints implements RuntimeHintsRegistrar {
-
- @Override
- public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
- if (!ClassUtils.isPresent("org.apache.zookeeper.ZooKeeper", classLoader)) {
- return;
- }
- hints.reflection().registerType(TypeReference.of(ClientCnxnSocketNIO.class),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS));
- hints.reflection()
- .registerType(TypeReference.of("org.apache.curator.x.discovery.details.OldServiceInstance"),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_METHODS));
- hints.reflection()
- .registerType(TypeReference.of("org.apache.curator.x.discovery.UriSpec"),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_METHODS));
- hints.reflection().registerType(TypeReference.of(UriSpec.Part.class),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_METHODS));
- hints.reflection()
- .registerType(TypeReference.of("org.apache.curator.x.discovery.ServiceInstance"),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_METHODS));
- }
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java
deleted file mode 100644
index bdc430b54..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfiguration.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.apache.curator.framework.CuratorFramework;
-
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Auto {@link Configuration} for adding a Zookeeper health endpoint to actuator if
- * required.
- *
- * @author Tom Gianos
- * @since 2.0.1
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnZookeeperEnabled
-@ConditionalOnClass(Endpoint.class)
-@AutoConfigureAfter({ ZookeeperAutoConfiguration.class })
-public class ZookeeperHealthAutoConfiguration {
-
- /**
- * If there is an active curator, if the zookeeper health endpoint is enabled and if a
- * health indicator hasn't already been added by a user add one.
- * @param curator The curator connection to zookeeper to use
- * @return An instance of {@link ZookeeperHealthIndicator} to add to actuator health
- * report
- */
- @Bean
- @ConditionalOnMissingBean(ZookeeperHealthIndicator.class)
- @ConditionalOnBean(CuratorFramework.class)
- @ConditionalOnEnabledHealthIndicator("zookeeper")
- public ZookeeperHealthIndicator zookeeperHealthIndicator(CuratorFramework curator) {
- return new ZookeeperHealthIndicator(curator);
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthIndicator.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthIndicator.java
deleted file mode 100644
index ff0aee227..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperHealthIndicator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.imps.CuratorFrameworkState;
-
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-
-/**
- * A {@link org.springframework.boot.actuate.health.HealthIndicator} that checks the
- * status of the Zookeeper connection.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperHealthIndicator extends AbstractHealthIndicator {
-
- private final CuratorFramework curator;
-
- public ZookeeperHealthIndicator(CuratorFramework curator) {
- this.curator = curator;
- }
-
- @Override
- protected void doHealthCheck(Health.Builder builder) throws Exception {
- try {
- CuratorFrameworkState state = this.curator.getState();
- if (state != CuratorFrameworkState.STARTED) {
- builder.down().withDetail("error", "Client not started");
- }
- else if (this.curator.checkExists().forPath("/") == null) {
- builder.down().withDetail("error", "Root for namespace does not exist");
- }
- else {
- builder.up();
- }
- builder.withDetail("connectionString",
- this.curator.getZookeeperClient().getCurrentConnectionString())
- .withDetail("state", state);
- }
- catch (Exception e) {
- builder.down(e);
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperProperties.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperProperties.java
deleted file mode 100644
index 9c13338cb..000000000
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperProperties.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.convert.DurationUnit;
-import org.springframework.util.Assert;
-
-/**
- * Properties related to connecting to Zookeeper.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-@ConfigurationProperties(ZookeeperProperties.PREFIX)
-public class ZookeeperProperties {
-
- /**
- * Configuration prefix.
- */
- public static final String PREFIX = "spring.cloud.zookeeper";
- /**
- * Connection string to the Zookeeper cluster.
- */
- private String connectString = "localhost:2181";
-
- /**
- * Is Zookeeper enabled.
- */
- private boolean enabled = true;
-
- /**
- * Initial amount of time to wait between retries.
- */
- private Integer baseSleepTimeMs = 50;
-
- /**
- * Max number of times to retry.
- */
- private Integer maxRetries = 10;
-
- /**
- * Max time in ms to sleep on each retry.
- */
- private Integer maxSleepMs = 500;
-
- /**
- * Wait time to block on connection to Zookeeper.
- */
- private Integer blockUntilConnectedWait = 10;
-
- /**
- * The unit of time related to blocking on connection to Zookeeper.
- */
- private TimeUnit blockUntilConnectedUnit = TimeUnit.SECONDS;
-
- /**
- * The configured/negotiated session timeout in milliseconds. Please refer to
- * Curator's Tech
- * Note 14 to understand how Curator implements connection sessions.
- *
- * @see Curator's
- * Tech Note 14
- */
- @DurationUnit(ChronoUnit.MILLIS)
- private Duration sessionTimeout = Duration.of(60 * 1000, ChronoUnit.MILLIS);
-
- /**
- * The configured connection timeout in milliseconds.
- */
- @DurationUnit(ChronoUnit.MILLIS)
- private Duration connectionTimeout = Duration.of(15 * 1000, ChronoUnit.MILLIS);
-
- public String getConnectString() {
- return this.connectString;
- }
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public Integer getBaseSleepTimeMs() {
- return this.baseSleepTimeMs;
- }
-
- public Integer getMaxRetries() {
- return this.maxRetries;
- }
-
- public Integer getMaxSleepMs() {
- return this.maxSleepMs;
- }
-
- public Integer getBlockUntilConnectedWait() {
- return this.blockUntilConnectedWait;
- }
-
- public TimeUnit getBlockUntilConnectedUnit() {
- return this.blockUntilConnectedUnit;
- }
-
- public void setConnectString(String connectString) {
- Assert.hasText(connectString, "spring.cloud.zookeeper.connect-string may not be empty");
- this.connectString = connectString;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public void setBaseSleepTimeMs(Integer baseSleepTimeMs) {
- this.baseSleepTimeMs = baseSleepTimeMs;
- }
-
- public void setMaxRetries(Integer maxRetries) {
- this.maxRetries = maxRetries;
- }
-
- public void setMaxSleepMs(Integer maxSleepMs) {
- this.maxSleepMs = maxSleepMs;
- }
-
- public void setBlockUntilConnectedWait(Integer blockUntilConnectedWait) {
- this.blockUntilConnectedWait = blockUntilConnectedWait;
- }
-
- public void setBlockUntilConnectedUnit(TimeUnit blockUntilConnectedUnit) {
- this.blockUntilConnectedUnit = blockUntilConnectedUnit;
- }
-
- public Duration getSessionTimeout() {
- return sessionTimeout;
- }
-
- public void setSessionTimeout(Duration sessionTimeout) {
- this.sessionTimeout = sessionTimeout;
- }
-
- public Duration getConnectionTimeout() {
- return connectionTimeout;
- }
-
- public void setConnectionTimeout(Duration connectionTimeout) {
- this.connectionTimeout = connectionTimeout;
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-zookeeper-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 02211578e..000000000
--- a/spring-cloud-zookeeper-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"properties": [
- {
- "name": "management.health.zookeeper.enabled",
- "type": "java.lang.Boolean",
- "description": "Enable the health endpoint for zookeeper.",
- "defaultValue": true
- },
- {
- "name": "endpoints.zookeeper.enabled",
- "type": "java.lang.Boolean",
- "description": "Enable the /zookeeper endpoint to inspect the state of zookeeper.",
- "defaultValue": true
- }
-]}
-
diff --git a/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/aot.factories b/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index c2fe4ff25..000000000
--- a/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.cloud.zookeeper.ZookeeperCoreHints
\ No newline at end of file
diff --git a/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 925e9e0c9..000000000
--- a/spring-cloud-zookeeper-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.cloud.zookeeper.ZookeeperAutoConfiguration
-org.springframework.cloud.zookeeper.ZookeeperHealthAutoConfiguration
diff --git a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/CuratorFactoryTests.java b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/CuratorFactoryTests.java
deleted file mode 100644
index e73059e36..000000000
--- a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/CuratorFactoryTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.mock.env.MockEnvironment;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class CuratorFactoryTests {
-
- @Test
- public void testLoadProperties() {
- ZookeeperProperties properties = CuratorFactory.loadProperties(
- Binder.get(new MockEnvironment()),
- UriComponentsBuilder.fromUriString("zookeeper://myhost:8502").build());
- assertThat(properties.getConnectString()).isEqualTo("myhost:8502");
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTests.java b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTests.java
deleted file mode 100644
index b11de7e07..000000000
--- a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfigurationTests.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.curator.drivers.TracerDriver;
-import org.apache.curator.ensemble.EnsembleProvider;
-import org.apache.curator.ensemble.fixed.FixedEnsembleProvider;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.test.TestingServer;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.annotation.Order;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Marcin Grzejszczak
- */
-
-@RunWith(Enclosed.class)
-public class ZookeeperAutoConfigurationTests {
-
- @RunWith(SpringRunner.class)
- @ContextConfiguration(loader = ZookeeperTestingServer.Loader.class,
- classes = { BaseTestConfig.class, ZookeeperAutoConfiguration.class })
- public static class BaseTests {
-
- @Autowired(required = false)
- CuratorFramework curator;
-
- @Test
- public void should_successfully_inject_Curator_as_a_Spring_bean() {
- assertThat(this.curator).isNotNull();
- }
-
- }
-
- static class BaseTestConfig {
-
- @Bean
- ZookeeperProperties zookeeperProperties(TestingServer testingServer) {
- ZookeeperProperties properties = new ZookeeperProperties();
- properties.setConnectString(testingServer.getConnectString());
- return properties;
- }
-
- @Bean(destroyMethod = "close")
- TestingServer testingServer() throws Exception {
- return new TestingServer();
- }
-
- }
-
- @RunWith(SpringRunner.class)
- @ContextConfiguration(loader = ZookeeperTestingServer.Loader.class,
- classes = { EnsembleTestConfig.class, ZookeeperAutoConfiguration.class })
- public static class EnsembleTests {
-
- @Autowired(required = false)
- CuratorFramework curator;
-
- @Autowired
- TestingServer testingServer;
-
- @Test
- public void should_successfully_inject_Curator_with_ensemble_connection_string() {
- assertThat(curator.getZookeeperClient().getCurrentConnectionString())
- .isEqualTo(testingServer.getConnectString());
- assertThat(curator.getZookeeperClient().getCurrentConnectionString())
- .isNotEqualTo(EnsembleTestConfig.DUMMY_CONNECTION_STRING);
- }
-
- }
-
- static class EnsembleTestConfig {
-
- static final String DUMMY_CONNECTION_STRING = "dummy-connection-string:2111";
-
- @Bean
- EnsembleProvider ensembleProvider(TestingServer testingServer) {
- return new FixedEnsembleProvider(testingServer.getConnectString());
- }
-
- @Bean
- ZookeeperProperties zookeeperProperties() {
- ZookeeperProperties properties = new ZookeeperProperties();
- properties.setConnectString(DUMMY_CONNECTION_STRING);
- return properties;
- }
-
- @Bean(destroyMethod = "close")
- TestingServer testingServer() throws Exception {
- return new TestingServer();
- }
-
- }
-
- @RunWith(SpringRunner.class)
- @ContextConfiguration(loader = ZookeeperTestingServer.Loader.class,
- classes = { BaseTestConfig.class,
- ZookeeperAutoConfiguration.class, CuratorFrameworkCustomizerConfig.class })
- @DirtiesContext
- public static class CuratorFrameworkCustomizerTest {
-
- @Autowired
- @Qualifier("customizerCallOrder")
- List callOrder;
-
- @Test
- public void should_invoke_the_CuratorFrameworkCustomizer_in_order() {
- assertThat(callOrder).containsExactly(1, 2);
- }
-
- }
-
- static class CuratorFrameworkCustomizerConfig {
-
- @Bean("customizerCallOrder")
- public List curatorFrameworkCustomizerCallOrder() {
- return new ArrayList<>(2);
- }
-
- @Bean
- @Order(1)
- public CuratorFrameworkCustomizer customizer1(
- @Qualifier("customizerCallOrder") List callOrder) {
- return (builder) -> callOrder.add(1);
- }
-
- @Bean
- @Order(2)
- public CuratorFrameworkCustomizer customizer2(
- @Qualifier("customizerCallOrder") List callOrder) {
- return (builder) -> callOrder.add(2);
- }
-
- }
-
- @RunWith(SpringRunner.class)
- @ContextConfiguration(loader = ZookeeperTestingServer.Loader.class,
- classes = { BaseTestConfig.class, TracerDriverTestConfig.class,
- ZookeeperAutoConfiguration.class })
- public static class TracerDriverTests {
-
- @Autowired(required = false)
- TracerDriver tracerDriver;
-
- @Autowired(required = false)
- CuratorFramework curator;
-
- @Autowired
- TestingServer testingServer;
-
- @Test
- public void should_successfully_inject_Curators_TracerDriver() {
- assertThat(curator.getZookeeperClient().getTracerDriver())
- .isEqualTo(tracerDriver);
- }
-
- }
-
- static class TracerDriverTestConfig {
-
- @Bean
- TracerDriver mockedTracerDriver() {
- return mock(TracerDriver.class);
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfigurationTests.java b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfigurationTests.java
deleted file mode 100644
index 059c1ffb6..000000000
--- a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/ZookeeperHealthAutoConfigurationTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.annotation.Bean;
-
-/**
- * Tests for {@link ZookeeperHealthAutoConfiguration}.
- *
- * @author Tom Gianos
- * @since 2.0.1
- */
-public class ZookeeperHealthAutoConfigurationTests {
-
- private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
- .withInitializer(new ZookeeperTestingServer.Initializer())
- .withConfiguration(AutoConfigurations.of(ZookeeperAutoConfiguration.class,
- ZookeeperHealthAutoConfiguration.class))
- .withUserConfiguration(ZookeeperAutoConfigurationTests.BaseTestConfig.class);
-
- @Test
- public void testDefaultPropertiesCreateZookeeperHealthIndicator() {
- this.contextRunner.run((context) -> Assertions.assertThat(context)
- .hasSingleBean(ZookeeperHealthIndicator.class));
- }
-
- @Test
- public void testZookeeperHealthIndicatorDisabled() {
- this.contextRunner.withPropertyValues("management.health.zookeeper.enabled=false")
- .run((context) -> Assertions.assertThat(context)
- .doesNotHaveBean(ZookeeperHealthIndicator.class));
- }
-
- @Test
- public void testZookeeperHealthIndicatorAlreadyAdded() {
- this.contextRunner.withUserConfiguration(HealthIndicatorCustomConfig.class)
- .run((context) -> {
- Assertions.assertThat(context)
- .hasSingleBean(ZookeeperHealthIndicator.class);
- Assertions.assertThat(context)
- .doesNotHaveBean("zookeeperHealthIndicator");
- Assertions.assertThat(context)
- .hasBean("customZookeeperHealthIndicator");
- });
- }
-
- static class HealthIndicatorCustomConfig {
-
- @Bean
- ZookeeperHealthIndicator customZookeeperHealthIndicator(
- CuratorFramework curatorFramework) {
- return new ZookeeperHealthIndicator(curatorFramework);
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/test/ZookeeperTestingServer.java b/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/test/ZookeeperTestingServer.java
deleted file mode 100644
index 7fea6f610..000000000
--- a/spring-cloud-zookeeper-core/src/test/java/org/springframework/cloud/zookeeper/test/ZookeeperTestingServer.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.test;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.test.TestingServer;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.boot.context.event.ApplicationPreparedEvent;
-import org.springframework.boot.test.context.SpringBootContextLoader;
-import org.springframework.cloud.zookeeper.ZookeeperProperties;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.context.event.SmartApplicationListener;
-import org.springframework.core.Ordered;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-public class ZookeeperTestingServer implements SmartApplicationListener, Ordered {
-
- private final Log log = LogFactory.getLog(getClass());
-
- private AtomicBoolean started = new AtomicBoolean();
-
- private TestingServer testingServer;
-
- @Override
- public int getOrder() {
- return Ordered.HIGHEST_PRECEDENCE;
- }
-
- public int getPort() {
- Assert.notNull(testingServer, "testingServer not started");
- return testingServer.getPort();
- }
-
- @Override
- public boolean supportsEventType(Class eventType) {
- return ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType)
- || ApplicationPreparedEvent.class.isAssignableFrom(eventType);
- }
-
- @Override
- public void onApplicationEvent(ApplicationEvent event) {
- if (event instanceof ApplicationEnvironmentPreparedEvent) {
- envPrepared(((ApplicationEnvironmentPreparedEvent) event).getEnvironment());
- }
- else if (event instanceof ApplicationPreparedEvent) {
- appPrepared(((ApplicationPreparedEvent) event).getApplicationContext());
- }
- }
-
- public void envPrepared(ConfigurableEnvironment environment) {
- MutablePropertySources sources = environment.getPropertySources();
-
- start();
-
- if (!sources.contains("zookeeperTestingServer")) {
- HashMap map = new HashMap<>();
- map.put(ZookeeperProperties.PREFIX + ".connect-string", "localhost:" + testingServer.getPort());
-
- sources.addFirst(new MapPropertySource("zookeeperTestingServer", map));
- }
-
- }
-
- public void start() {
- if (started.compareAndSet(false, true)) {
- try {
- testingServer = new TestingServer();
- }
- catch (Exception e) {
- ReflectionUtils.rethrowRuntimeException(e);
- }
- log.debug("Starting TestingServer on port " + testingServer.getPort());
- }
- }
-
- public void appPrepared(ConfigurableApplicationContext context) {
- context.addApplicationListener(new CloseListener(this));
- }
-
- public void close() {
- try {
- if (started.compareAndSet(true, false)) {
- log.debug("Closing TestingServer on port " + testingServer.getPort());
- testingServer.close();
- }
- }
- catch (IOException ex) {
- ReflectionUtils.rethrowRuntimeException(ex);
- }
- }
-
- static class CloseListener implements ApplicationListener, Ordered {
-
- private final ZookeeperTestingServer testingServer;
-
- CloseListener(ZookeeperTestingServer testingServer) {
- this.testingServer = testingServer;
- }
-
- @Override
- public void onApplicationEvent(ContextClosedEvent event) {
- testingServer.close();
- }
-
- @Override
- public int getOrder() {
- return Ordered.LOWEST_PRECEDENCE;
- }
- }
-
- public static class Loader extends SpringBootContextLoader {
-
- @Override
- protected SpringApplication getSpringApplication() {
- SpringApplication application = super.getSpringApplication();
- ZookeeperTestingServer testingServer = new ZookeeperTestingServer();
- application.addListeners(testingServer);
- application.addListeners(new CloseListener(testingServer));
- return application;
- }
-
- }
-
- public static class Initializer implements ApplicationContextInitializer {
-
- @Override
- public void initialize(ConfigurableApplicationContext context) {
- ZookeeperTestingServer testingServer = new ZookeeperTestingServer();
- testingServer.envPrepared(context.getEnvironment());
- testingServer.appPrepared(context);
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml
deleted file mode 100644
index 6548de780..000000000
--- a/spring-cloud-zookeeper-dependencies/pom.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
- 4.0.0
-
- spring-cloud-dependencies-parent
- org.springframework.cloud
- 4.1.0-SNAPSHOT
-
-
- spring-cloud-zookeeper-dependencies
- 4.1.0-SNAPSHOT
- pom
- spring-cloud-zookeeper-dependencies
- Spring Cloud Zookeeper Dependencies
-
- 5.1.0
- true
- true
- true
-
-
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-core
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-config
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-discovery
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-zookeeper
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-zookeeper-all
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-zookeeper-config
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-zookeeper-discovery
- ${project.version}
-
-
- org.apache.curator
- curator-framework
- ${curator.version}
-
-
- log4j
- log4j
-
-
- io.netty
- netty
-
-
-
-
- org.apache.curator
- curator-recipes
- ${curator.version}
-
-
- log4j
- log4j
-
-
- io.netty
- netty
-
-
-
-
- org.apache.curator
- curator-x-discovery
- ${curator.version}
-
-
- log4j
- log4j
-
-
- io.netty
- netty
-
-
-
-
- org.apache.curator
- curator-test
- ${curator.version}
- test
-
-
- log4j
- log4j
-
-
- io.netty
- netty
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
-
- io.spring.javaformat
- spring-javaformat-maven-plugin
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
-
-
-
-
- spring
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
- false
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
- spring-releases
- Spring Releases
- https://repo.spring.io/release
-
- false
-
-
-
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
- false
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
-
-
-
diff --git a/spring-cloud-zookeeper-discovery/.flattened-pom.xml b/spring-cloud-zookeeper-discovery/.flattened-pom.xml
new file mode 100644
index 000000000..5ebc4be68
--- /dev/null
+++ b/spring-cloud-zookeeper-discovery/.flattened-pom.xml
@@ -0,0 +1,208 @@
+
+
+ 4.0.0
+
+ org.springframework.cloud
+ spring-cloud-zookeeper
+ 4.1.0-SNAPSHOT
+ ..
+
+ org.springframework.cloud
+ spring-cloud-zookeeper-discovery
+ 4.1.0-SNAPSHOT
+ Spring Cloud Zookeeper Discovery
+ Spring Cloud Zookeeper Discovery
+ https://spring.io/spring-cloud/spring-cloud-zookeeper/spring-cloud-zookeeper-discovery
+
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+
+
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0
+ Copyright 2014-2021 the original author or authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+
+ dsyer
+ Dave Syer
+ dsyer at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ sgibb
+ Spencer Gibb
+ sgibb at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ mgrzejszczak
+ Marcin Grzejszczak
+ mgrzejszczak at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ rbaxter
+ Ryan Baxter
+ rbaxter at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ omaciaszeksharma
+ Olga Maciaszek-Sharma
+ omaciaszeksharma at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+
+ scm:git:git://github.com/spring-cloud/spring-cloud-zookeeper.git/spring-cloud-zookeeper-discovery
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-zookeeper.git/spring-cloud-zookeeper-discovery
+ https://github.com/spring-cloud/spring-cloud-zookeeper/spring-cloud-zookeeper-discovery
+
+
+
+ org.springframework.cloud
+ spring-cloud-zookeeper-core
+ 4.1.0-SNAPSHOT
+ compile
+
+
+ org.springframework.cloud
+ spring-cloud-commons
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-starter-loadbalancer
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework
+ spring-web
+ 6.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-webflux
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.apache.curator
+ curator-x-discovery
+ 5.1.0
+ compile
+
+
+ log4j
+ log4j
+
+
+ io.netty
+ netty
+
+
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ io.github.openfeign
+ feign-core
+ 12.4
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-config-client
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-config-server
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+
diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml
deleted file mode 100644
index f2c01a53b..000000000
--- a/spring-cloud-zookeeper-discovery/pom.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
- 4.0.0
-
- spring-cloud-zookeeper-discovery
- jar
- Spring Cloud Zookeeper Discovery
- Spring Cloud Zookeeper Discovery
-
-
- org.springframework.cloud
- spring-cloud-zookeeper
- 4.1.0-SNAPSHOT
- ..
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- maven-surefire-plugin
-
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-core
-
-
- org.springframework.cloud
- spring-cloud-commons
- true
-
-
- org.springframework.cloud
- spring-cloud-starter-loadbalancer
- true
-
-
- org.springframework.boot
- spring-boot-starter
- true
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
- org.springframework
- spring-web
- true
-
-
- org.springframework.boot
- spring-boot-starter-actuator
- true
-
-
- org.springframework.boot
- spring-boot-starter-webflux
- true
-
-
- org.apache.curator
- curator-x-discovery
- true
-
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
- true
-
-
- io.github.openfeign
- feign-core
- true
-
-
- org.springframework.boot
- spring-boot-autoconfigure-processor
- true
-
-
- org.springframework.cloud
- spring-cloud-config-client
- true
-
-
- org.springframework.cloud
- spring-cloud-config-server
- true
-
-
- org.springframework.boot
- spring-boot-starter-web
- test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
- test
-
-
- org.springframework.cloud
- spring-cloud-test-support
- test
-
-
- org.springframework.cloud
- spring-cloud-zookeeper-core
- ${project.version}
- test-jar
- test
-
-
- org.apache.curator
- curator-test
- test
-
-
- com.github.tomakehurst
- wiremock
- test
- 2.27.1
-
-
- org.assertj
- assertj-core
- test
-
-
- com.jayway.awaitility
- awaitility
- test
-
-
- com.toomuchcoding.jsonassert
- jsonassert
- test
-
-
- io.projectreactor
- reactor-test
- test
-
-
- org.testcontainers
- testcontainers
- test
-
-
- org.testcontainers
- junit-jupiter
- test
-
-
- org.testcontainers
- mockserver
- test
-
-
- org.mock-server
- mockserver-client-java
- test
-
-
-
-
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnLoadBalancerForZookeeperEnabled.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnLoadBalancerForZookeeperEnabled.java
deleted file mode 100644
index c9a65ad76..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnLoadBalancerForZookeeperEnabled.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
-/**
- * Wrapper annotation to enable Spring Cloud LoadBalancer for Zookeeper.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.0.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@ConditionalOnProperty(value = "spring.cloud.zookeeper.loadbalancer.enabled", matchIfMissing = true)
-public @interface ConditionalOnLoadBalancerForZookeeperEnabled {
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java
deleted file mode 100644
index 0466c678f..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnZookeeperDiscoveryEnabled.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-
-/**
- * Wrapper annotation to enable Zookeeper Discovery.
- *
- * @author Marcin Grzejszczak
- * @since 1.1.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@ConditionalOnZookeeperEnabled
-@ConditionalOnProperty(value = ConditionalOnZookeeperDiscoveryEnabled.PROPERTY, matchIfMissing = true)
-public @interface ConditionalOnZookeeperDiscoveryEnabled {
- /**
- * Property name.
- */
- String PROPERTY = "spring.cloud.zookeeper.discovery.enabled";
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/DependencyPathUtils.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/DependencyPathUtils.java
deleted file mode 100644
index 2d2e74df6..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/DependencyPathUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-/**
- * Utils for correct dependency path format.
- *
- * @author Denis Stepanov
- * @since 1.0.4
- */
-public final class DependencyPathUtils {
-
- private DependencyPathUtils() {
- }
-
- /**
- * Sanitizes path by ensuring that path starts with a slash and doesn't have one at
- * the end.
- * @param path file path to sanitize.
- * @return sanitized path.
- */
- public static String sanitize(String path) {
- return withLeadingSlash(withoutSlashAtEnd(path));
- }
-
- private static String withLeadingSlash(String value) {
- return value.startsWith("/") ? value : "/" + value;
- }
-
- private static String withoutSlashAtEnd(String value) {
- return value.endsWith("/") ? value.substring(0, value.length() - 1) : value;
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/LoadBalancerZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/LoadBalancerZookeeperAutoConfiguration.java
deleted file mode 100644
index db066349e..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/LoadBalancerZookeeperAutoConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependenciesAutoConfiguration;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
- * Auto-configuration} that sets up Spring Cloud LoadBalancer for Zookeeper.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnZookeeperEnabled
-@ConditionalOnBean(ReactiveLoadBalancer.Factory.class)
-@ConditionalOnLoadBalancerForZookeeperEnabled
-@AutoConfigureAfter({LoadBalancerAutoConfiguration.class, ZookeeperDependenciesAutoConfiguration.class})
-@LoadBalancerClients(defaultConfiguration = ZookeeperLoadBalancerConfiguration.class)
-public class LoadBalancerZookeeperAutoConfiguration {
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java
deleted file mode 100644
index f59eb5f3a..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoConfiguration.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.CommonsClientAutoConfiguration;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.ClassUtils;
-
-/**
- * @author Spencer Gibb
- * @author Tim Ysewyn
- * @since 1.1.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnZookeeperDiscoveryEnabled
-@AutoConfigureBefore({CommonsClientAutoConfiguration.class})
-public class ZookeeperDiscoveryAutoConfiguration {
-
- @Autowired
- private CuratorFramework curator;
-
- @Bean
- @ConditionalOnMissingBean
- public ZookeeperDiscoveryProperties zookeeperDiscoveryProperties(
- InetUtils inetUtils) {
- return new ZookeeperDiscoveryProperties(inetUtils);
- }
-
- @Bean
- public ZookeeperServiceWatch zookeeperServiceWatch(
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- return new ZookeeperServiceWatch(curator, zookeeperDiscoveryProperties);
- }
-
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnClass({ Endpoint.class, HealthIndicator.class })
- protected static class ZookeeperDiscoveryHealthConfig {
-
- @Autowired(required = false)
- private ZookeeperDependencies zookeeperDependencies;
-
- @Bean
- @ConditionalOnMissingBean
- @ConditionalOnEnabledHealthIndicator("zookeeper")
- public ZookeeperDiscoveryHealthIndicator zookeeperDiscoveryHealthIndicator(
- CuratorFramework curatorFramework,
- ServiceDiscovery serviceDiscovery,
- ZookeeperDiscoveryProperties properties) {
- return new ZookeeperDiscoveryHealthIndicator(curatorFramework,
- serviceDiscovery, zookeeperDependencies, properties);
- }
-
- }
-
-}
-
-class ZookeeperDiscoveryHints implements RuntimeHintsRegistrar {
-
- @Override
- public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
- if (!ClassUtils.isPresent("org.apache.zookeeper.ZooKeeper", classLoader)) {
- return;
- }
- hints.reflection()
- .registerType(TypeReference.of(ZookeeperInstance.class),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_METHODS));
- hints.reflection().registerType(TypeReference.of(ZookeeperServiceInstance.class),
- hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS,
- MemberCategory.INVOKE_DECLARED_CONSTRUCTORS));
- }
-}
-
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
deleted file mode 100644
index 9779d26fe..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.zookeeper.KeeperException;
-
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-
-import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
-
-/**
- * Zookeeper version of {@link DiscoveryClient}. Capable of resolving aliases from
- * {@link ZookeeperDependencies} to service names in Zookeeper.
- *
- * @author Spencer Gibb
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-public class ZookeeperDiscoveryClient implements DiscoveryClient {
-
- private static final Log log = LogFactory.getLog(ZookeeperDiscoveryClient.class);
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- private final ServiceDiscovery serviceDiscovery;
-
- private final ZookeeperDiscoveryProperties zookeeperDiscoveryProperties;
-
- public ZookeeperDiscoveryClient(ServiceDiscovery serviceDiscovery,
- ZookeeperDependencies zookeeperDependencies,
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- this.serviceDiscovery = serviceDiscovery;
- this.zookeeperDependencies = zookeeperDependencies;
- this.zookeeperDiscoveryProperties = zookeeperDiscoveryProperties;
- }
-
- @Override
- public String description() {
- return "Spring Cloud Zookeeper Discovery Client";
- }
-
- private static org.springframework.cloud.client.ServiceInstance createServiceInstance(
- String serviceId, ServiceInstance serviceInstance) {
- return new ZookeeperServiceInstance(serviceId, serviceInstance);
- }
-
- @Override
- public List getInstances(
- final String serviceId) {
- try {
- if (getServiceDiscovery() == null) {
- return Collections.EMPTY_LIST;
- }
- String serviceIdToQuery = getServiceIdToQuery(serviceId);
- Collection> zkInstances = getServiceDiscovery()
- .queryForInstances(serviceIdToQuery);
- List instances = new ArrayList<>();
- for (ServiceInstance instance : zkInstances) {
- instances.add(createServiceInstance(serviceIdToQuery, instance));
- }
- return instances;
- }
- catch (KeeperException.NoNodeException e) {
- if (log.isDebugEnabled()) {
- log.debug(
- "Error getting instances from zookeeper. Possibly, no service has registered.",
- e);
- }
- // this means that nothing has registered as a service yes
- return Collections.emptyList();
- }
- catch (Exception exception) {
- rethrowRuntimeException(exception);
- }
- return new ArrayList<>();
- }
-
- private ServiceDiscovery getServiceDiscovery() {
- return this.serviceDiscovery;
- }
-
- private String getServiceIdToQuery(String serviceId) {
- if (this.zookeeperDependencies != null
- && this.zookeeperDependencies.hasDependencies()) {
- String pathForAlias = this.zookeeperDependencies.getPathForAlias(serviceId);
- return pathForAlias.isEmpty() ? serviceId : pathForAlias;
- }
- return serviceId;
- }
-
- @Override
- public List getServices() {
- List services = null;
- if (getServiceDiscovery() == null) {
- log.warn(
- "Service Discovery is not yet ready - returning empty list of services");
- return Collections.emptyList();
- }
- try {
- Collection names = getServiceDiscovery().queryForNames();
- if (names == null) {
- return Collections.emptyList();
- }
- services = new ArrayList<>(names);
- }
- catch (KeeperException.NoNodeException e) {
- if (log.isDebugEnabled()) {
- log.debug(
- "Error getting services from zookeeper. Possibly, no service has registered.",
- e);
- }
- // this means that nothing has registered as a service yes
- return Collections.emptyList();
- }
- catch (Exception e) {
- rethrowRuntimeException(e);
- }
- return services;
- }
-
- @Override
- public int getOrder() {
- return this.zookeeperDiscoveryProperties.getOrder();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java
deleted file mode 100644
index d9b4bf285..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * {@link org.springframework.cloud.client.discovery.DiscoveryClient} configuration for
- * Zookeeper.
- *
- * @author Spencer Gibb
- * @author Tim Ysewyn
- * @since 1.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnBlockingDiscoveryEnabled
-@ConditionalOnZookeeperDiscoveryEnabled
-@AutoConfigureBefore({ ZookeeperDiscoveryAutoConfiguration.class })
-public class ZookeeperDiscoveryClientConfiguration {
-
- @Autowired(required = false)
- private ZookeeperDependencies zookeeperDependencies;
-
- @Bean
- @ConditionalOnMissingBean
- // currently means auto-registration is false. That will change when
- // ZookeeperServiceDiscovery is gone
- public ZookeeperDiscoveryClient zookeeperDiscoveryClient(
- ServiceDiscovery serviceDiscovery,
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- return new ZookeeperDiscoveryClient(serviceDiscovery, zookeeperDependencies,
- zookeeperDiscoveryProperties);
- }
-
- @Bean
- public Marker zookeeperDiscoveryClientMarker() {
- return new Marker();
- }
-
- class Marker {
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java
deleted file mode 100644
index 19a74038a..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.cloud.client.discovery.health.DiscoveryHealthIndicator;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-
-/**
- * {@link org.springframework.boot.actuate.health.HealthIndicator} that presents the
- * status of all instances registered in Zookeeper.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperDiscoveryHealthIndicator implements DiscoveryHealthIndicator {
-
- private static final Log log = LogFactory
- .getLog(ZookeeperDiscoveryHealthIndicator.class);
-
- private CuratorFramework curatorFramework;
-
- private ServiceDiscovery serviceDiscovery;
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- private final ZookeeperDiscoveryProperties zookeeperDiscoveryProperties;
-
- public ZookeeperDiscoveryHealthIndicator(CuratorFramework curatorFramework,
- ServiceDiscovery serviceDiscovery,
- ZookeeperDependencies zookeeperDependencies,
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- this.curatorFramework = curatorFramework;
- this.serviceDiscovery = serviceDiscovery;
- this.zookeeperDependencies = zookeeperDependencies;
- this.zookeeperDiscoveryProperties = zookeeperDiscoveryProperties;
- }
-
- @Override
- public String getName() {
- return "zookeeper";
- }
-
- @Override
- public Health health() {
- Health.Builder builder = Health.unknown();
- try {
- Iterable> allInstances = new ZookeeperServiceInstances(
- this.curatorFramework, this.serviceDiscovery,
- this.zookeeperDependencies, this.zookeeperDiscoveryProperties);
- builder.up().withDetail("services", allInstances);
- }
- catch (Exception e) {
- log.error("Error", e);
- builder.down(e);
- }
-
- return builder.build();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java
deleted file mode 100644
index 22cbf614b..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.zookeeper.support.StatusConstants;
-import org.springframework.util.StringUtils;
-
-/**
- * Properties related to Zookeeper's Service Discovery.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-@ConfigurationProperties(ZookeeperDiscoveryProperties.PREFIX)
-public class ZookeeperDiscoveryProperties {
-
- /**
- * Zookeeper Discovery Properties prefix.
- */
- public static final String PREFIX = "spring.cloud.zookeeper.discovery";
-
- /**
- * Default URI spec.
- */
- public static final String DEFAULT_URI_SPEC = "{scheme}://{address}:{port}";
-
- private InetUtils.HostInfo hostInfo;
-
- private boolean enabled = true;
-
- /**
- * Root Zookeeper folder in which all instances are registered.
- */
- private String root = "/services";
-
- /**
- * The URI specification to resolve during service registration in Zookeeper.
- */
- private String uriSpec = DEFAULT_URI_SPEC;
-
- /** Id used to register with zookeeper. Defaults to a random UUID. */
- private String instanceId;
-
- /**
- * Predefined host with which a service can register itself in Zookeeper. Corresponds
- * to the {code address} from the URI spec.
- */
- private String instanceHost;
-
- /**
- * IP address to use when accessing service (must also set preferIpAddress to use).
- */
- private String instanceIpAddress;
-
- /**
- * Use ip address rather than hostname during registration.
- */
- private boolean preferIpAddress = false;
-
- /** Port to register the service under (defaults to listening port). */
- private Integer instancePort;
-
- /** Ssl port of the registered service. */
- private Integer instanceSslPort;
-
- /**
- * Register as a service in zookeeper.
- */
- private boolean register = true;
-
- /**
- * Gets the metadata name/value pairs associated with this instance. This information
- * is sent to zookeeper and can be used by other instances.
- */
- private Map metadata = new HashMap<>();
-
- /**
- * The initial status of this instance (defaults to
- * {@link StatusConstants#STATUS_UP}).
- */
- private String initialStatus = StatusConstants.STATUS_UP;
-
- /**
- * Order of the discovery client used by `CompositeDiscoveryClient` for sorting
- * available clients.
- */
- private int order = 0;
-
- // Visible for Testing
- protected ZookeeperDiscoveryProperties() {
- }
-
- public ZookeeperDiscoveryProperties(InetUtils inetUtils) {
- this.hostInfo = inetUtils.findFirstNonLoopbackHostInfo();
- this.instanceHost = this.hostInfo.getHostname();
- this.instanceIpAddress = this.hostInfo.getIpAddress();
- }
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public String getRoot() {
- return this.root;
- }
-
- public String getUriSpec() {
- return this.uriSpec;
- }
-
- public String getInstanceHost() {
- if (this.preferIpAddress && StringUtils.hasText(this.instanceIpAddress)) {
- return this.instanceIpAddress;
- }
- return this.instanceHost;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public void setRoot(String root) {
- this.root = DependencyPathUtils.sanitize(root);
- }
-
- public void setUriSpec(String uriSpec) {
- this.uriSpec = uriSpec;
- }
-
- public String getInstanceId() {
- return this.instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- public void setInstanceHost(String instanceHost) {
- this.instanceHost = instanceHost;
- this.hostInfo.override = true;
- }
-
- public void setInstanceIpAddress(String instanceIpAddress) {
- this.instanceIpAddress = instanceIpAddress;
- this.hostInfo.override = true;
- }
-
- public void setPreferIpAddress(boolean preferIpAddress) {
- this.preferIpAddress = preferIpAddress;
- }
-
- public Map getMetadata() {
- return this.metadata;
- }
-
- public void setMetadata(Map metadata) {
- this.metadata = metadata;
- }
-
- public boolean isRegister() {
- return this.register;
- }
-
- public void setRegister(boolean register) {
- this.register = register;
- }
-
- public Integer getInstancePort() {
- return this.instancePort;
- }
-
- public void setInstancePort(Integer instancePort) {
- this.instancePort = instancePort;
- }
-
- public Integer getInstanceSslPort() {
- return this.instanceSslPort;
- }
-
- public void setInstanceSslPort(Integer instanceSslPort) {
- this.instanceSslPort = instanceSslPort;
- }
-
- public String getInitialStatus() {
- return this.initialStatus;
- }
-
- public void setInitialStatus(String initialStatus) {
- this.initialStatus = initialStatus;
- }
-
- public int getOrder() {
- return this.order;
- }
-
- public void setOrder(int order) {
- this.order = order;
- }
-
- @Override
- public String toString() {
- return "ZookeeperDiscoveryProperties{" + "enabled=" + this.enabled + ", root='"
- + this.root + '\'' + ", uriSpec='" + this.uriSpec + '\''
- + ", instanceId='" + this.instanceId + '\'' + ", instanceHost='"
- + this.instanceHost + '\'' + ", instancePort='" + this.instancePort + '\''
- + ", instanceSslPort='" + this.instanceSslPort + '\'' + ", metadata="
- + this.metadata + ", register=" + this.register + ", initialStatus="
- + this.initialStatus + ", order=" + this.order + '}';
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java
deleted file mode 100644
index 383db8ab2..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents the default payload of a registered service in Zookeeper.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperInstance {
-
- private String id;
-
- private String name;
-
- private Map metadata = new HashMap<>();
-
- @SuppressWarnings("unused")
- private ZookeeperInstance() {
- }
-
- public ZookeeperInstance(String id, String name, Map metadata) {
- this.id = id;
- this.name = name;
- this.metadata = metadata;
- }
-
- public String getId() {
- return this.id;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Map getMetadata() {
- return this.metadata;
- }
-
- public void setMetadata(Map metadata) {
- this.metadata = metadata;
- }
-
- @Override
- public String toString() {
- return "ZookeeperInstance{" + "id='" + this.id + '\'' + ", name='" + this.name
- + '\'' + ", metadata=" + this.metadata + '}';
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLoadBalancerConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLoadBalancerConfiguration.java
deleted file mode 100644
index 51b0404d9..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLoadBalancerConfiguration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.loadbalancer.cache.LoadBalancerCacheManager;
-import org.springframework.cloud.loadbalancer.core.CachingServiceInstanceListSupplier;
-import org.springframework.cloud.loadbalancer.core.DiscoveryClientServiceInstanceListSupplier;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-
-/**
- * Zookeeper-specific {@link ServiceInstanceListSupplier} that provides a delegate that
- * filters available instances based on status retrieved from Zookeeper.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.0.0
- */
-@Configuration(proxyBeanMethods = false)
-public class ZookeeperLoadBalancerConfiguration {
-
- @Bean
- @ConditionalOnBean(DiscoveryClient.class)
- @ConditionalOnMissingBean
- public ServiceInstanceListSupplier zookeeperDiscoveryClientServiceInstanceListSupplier(
- DiscoveryClient discoveryClient, Environment env,
- ApplicationContext context,
- ZookeeperDependencies zookeeperDependencies) {
- DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier(
- discoveryClient, env);
- ZookeeperServiceInstanceListSupplier secondDelegate = new ZookeeperServiceInstanceListSupplier(firstDelegate,
- zookeeperDependencies);
- ObjectProvider cacheManagerProvider = context
- .getBeanProvider(LoadBalancerCacheManager.class);
- if (cacheManagerProvider.getIfAvailable() != null) {
- return new CachingServiceInstanceListSupplier(secondDelegate,
- cacheManagerProvider.getIfAvailable());
- }
- return secondDelegate;
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java
deleted file mode 100644
index cdcd3170a..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstance.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.cloud.client.ServiceInstance;
-
-/**
- * A specific {@link ServiceInstance} describing a zookeeper service instance.
- *
- * @author Reda Housni-Alaoui
- * @author Tim Ysewyn
- * @since 1.1.0
- */
-public class ZookeeperServiceInstance implements ServiceInstance {
-
- private final String serviceId;
-
- private final String host;
-
- private final int port;
-
- private final boolean secure;
-
- private final URI uri;
-
- private final Map metadata;
-
- private final org.apache.curator.x.discovery.ServiceInstance serviceInstance;
-
- /**
- * @param serviceId The service id to be used
- * @param serviceInstance The zookeeper service instance described by this service
- * instance
- */
- public ZookeeperServiceInstance(String serviceId,
- org.apache.curator.x.discovery.ServiceInstance serviceInstance) {
- this.serviceId = serviceId;
- this.serviceInstance = serviceInstance;
- this.host = this.serviceInstance.getAddress();
- this.secure = serviceInstance.getSslPort() != null;
- Integer port = serviceInstance.getPort();
- if (this.secure) {
- port = serviceInstance.getSslPort();
- }
- this.port = port;
- this.uri = URI.create(serviceInstance.buildUriSpec());
- if (serviceInstance.getPayload() != null) {
- this.metadata = serviceInstance.getPayload().getMetadata();
- }
- else {
- this.metadata = new HashMap<>();
- }
- }
-
- @Override
- public String getInstanceId() {
- return this.serviceInstance.getId();
- }
-
- @Override
- public String getServiceId() {
- return this.serviceId;
- }
-
- @Override
- public String getHost() {
- return this.host;
- }
-
- @Override
- public int getPort() {
- return this.port;
- }
-
- @Override
- public boolean isSecure() {
- return this.secure;
- }
-
- @Override
- public URI getUri() {
- return this.uri;
- }
-
- @Override
- public Map getMetadata() {
- return this.metadata;
- }
-
- public org.apache.curator.x.discovery.ServiceInstance getServiceInstance() {
- return this.serviceInstance;
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstanceListSupplier.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstanceListSupplier.java
deleted file mode 100644
index 42c830dc7..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstanceListSupplier.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import reactor.core.publisher.Flux;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.util.StringUtils;
-
-import static org.springframework.cloud.zookeeper.support.StatusConstants.INSTANCE_STATUS_KEY;
-import static org.springframework.cloud.zookeeper.support.StatusConstants.STATUS_UP;
-
-/**
- * A {@link ServiceInstanceListSupplier} implementation that filters available instances based on status retrieved from Zookeeper.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.0.0
- */
-public class ZookeeperServiceInstanceListSupplier implements ServiceInstanceListSupplier {
-
- private final ServiceInstanceListSupplier delegate;
- private final String serviceId;
-
- public ZookeeperServiceInstanceListSupplier(ServiceInstanceListSupplier delegate,
- ZookeeperDependencies zookeeperDependencies) {
- this.delegate = delegate;
- this.serviceId = getServiceIdFromDepsOrClientName(delegate
- .getServiceId(), zookeeperDependencies);
- }
-
- private String getServiceIdFromDepsOrClientName(String delegateServiceId,
- ZookeeperDependencies zookeeperDependencies) {
- String serviceIdFromDeps = zookeeperDependencies
- .getPathForAlias(delegateServiceId);
- return StringUtils.hasText(serviceIdFromDeps) ? serviceIdFromDeps
- : delegateServiceId;
- }
-
- @Override
- public String getServiceId() {
- return serviceId;
- }
-
- @Override
- public Flux> get() {
- return delegate.get().map(this::filteredByZookeeperStatusUp);
- }
-
- private List filteredByZookeeperStatusUp(List serviceInstances) {
- ArrayList filteredInstances = new ArrayList<>();
- for (ServiceInstance serviceInstance : serviceInstances) {
- if (serviceInstance instanceof ZookeeperServiceInstance) {
- org.apache.curator.x.discovery.ServiceInstance zookeeperServiceInstance = ((ZookeeperServiceInstance) serviceInstance)
- .getServiceInstance();
- String instanceStatus = null;
- if (zookeeperServiceInstance.getPayload() != null
- && zookeeperServiceInstance.getPayload().getMetadata() != null) {
- instanceStatus = zookeeperServiceInstance.getPayload().getMetadata()
- .get(INSTANCE_STATUS_KEY);
- }
- if (!StringUtils.hasText(instanceStatus) // backwards compatibility
- || instanceStatus.equalsIgnoreCase(STATUS_UP)) {
- filteredInstances.add(serviceInstance);
- }
- }
- }
- return filteredInstances;
- }
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java
deleted file mode 100644
index d0c93be8d..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-
-import static org.springframework.cloud.zookeeper.discovery.DependencyPathUtils.sanitize;
-
-/**
- * An {@link Iterable} representing registered Zookeeper instances. If using
- * {@link ZookeeperDependencies} it will return a list of registered Zookeeper instances
- * corresponding to the ones defined in the dependencies.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public class ZookeeperServiceInstances
- implements Iterable> {
-
- private static final Log log = LogFactory.getLog(ZookeeperServiceInstances.class);
-
- private ServiceDiscovery serviceDiscovery;
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- private final ZookeeperDiscoveryProperties zookeeperDiscoveryProperties;
-
- private final List> allInstances;
-
- private final CuratorFramework curator;
-
- public ZookeeperServiceInstances(CuratorFramework curator,
- ServiceDiscovery serviceDiscovery,
- ZookeeperDependencies zookeeperDependencies,
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- this.curator = curator;
- this.serviceDiscovery = serviceDiscovery;
- this.zookeeperDependencies = zookeeperDependencies;
- this.zookeeperDiscoveryProperties = zookeeperDiscoveryProperties;
- this.allInstances = getZookeeperInstances();
- }
-
- private List> getZookeeperInstances() {
- ArrayList> allInstances = new ArrayList<>();
- try {
- Collection namesToQuery = getNamesToQuery();
- if (log.isDebugEnabled()) {
- log.debug("Querying the following names [" + namesToQuery + "]");
- }
- for (String name : namesToQuery) {
- allInstances.addAll(nestedInstances(allInstances, name));
- }
- return allInstances;
- }
- catch (Exception e) {
- log.debug("Exception occurred while trying to build the list of instances",
- e);
- return allInstances;
- }
- }
-
- private List> nestedInstances(
- List> accumulator, String name)
- throws Exception {
- String parentPath = prepareQueryName(name);
- Collection> childrenInstances = tryToGetInstances(
- parentPath);
- if (childrenInstances != null) {
- return convertCollectionToList(childrenInstances);
- }
- try {
- List children = this.curator.getChildren().forPath(parentPath);
- return iterateOverChildren(accumulator, parentPath, children);
- }
- catch (Exception e) {
- if (log.isTraceEnabled()) {
- log.trace("Exception occurred while trying to retrieve children of ["
- + parentPath + "]", e);
- }
- return injectZookeeperServiceInstances(accumulator, parentPath);
- }
- }
-
- private String prepareQueryName(String name) {
- String root = this.zookeeperDiscoveryProperties.getRoot();
- return name.startsWith(root) ? name : root + name;
- }
-
- private Collection> tryToGetInstances(
- String path) {
- try {
- return getServiceDiscovery().queryForInstances(getPathWithoutRoot(path));
- }
- catch (Exception e) {
- log.trace("Exception occurred while trying to retrieve instances of [" + path
- + "]", e);
- return null;
- }
- }
-
- private ServiceDiscovery getServiceDiscovery() {
- return this.serviceDiscovery;
- }
-
- private String getPathWithoutRoot(String path) {
- return path.substring(this.zookeeperDiscoveryProperties.getRoot().length());
- }
-
- private List> injectZookeeperServiceInstances(
- List> accumulator, String name)
- throws Exception {
- Collection> instances = getServiceDiscovery()
- .queryForInstances(name);
- accumulator.addAll(convertCollectionToList(instances));
- return accumulator;
- }
-
- private List> convertCollectionToList(
- Collection> instances) {
- List> serviceInstances = new ArrayList<>();
- for (ServiceInstance instance : instances) {
- serviceInstances.add(instance);
- }
- return serviceInstances;
- }
-
- private List> iterateOverChildren(
- List> accumulator, String parentPath,
- List children) throws Exception {
- List> lists = new ArrayList<>();
- for (String child : children) {
- lists.addAll(nestedInstances(accumulator, parentPath + "/" + child));
- }
- return lists;
- }
-
- private Collection getNamesToQuery() throws Exception {
- if (this.zookeeperDependencies == null) {
- if (log.isDebugEnabled()) {
- log.debug("Using direct name resolution instead of dependency based one");
- }
- List names = new ArrayList<>();
- for (String name : getServiceDiscovery().queryForNames()) {
- names.add(sanitize(name));
- }
- return names;
- }
- if (log.isDebugEnabled()) {
- log.debug("Using dependency based names to query");
- }
- return this.zookeeperDependencies.getDependencyNames();
- }
-
- @Override
- public Iterator> iterator() {
- return this.allInstances.iterator();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java
deleted file mode 100644
index b7cb45ec0..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import jakarta.annotation.PreDestroy;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.recipes.cache.TreeCache;
-import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
-import org.apache.curator.framework.recipes.cache.TreeCacheListener;
-
-import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
-import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.context.ApplicationListener;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * A {@link TreeCacheListener} that sends {@link HeartbeatEvent} when an entry inside
- * Zookeeper has changed.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperServiceWatch
- implements ApplicationListener>, TreeCacheListener,
- ApplicationEventPublisherAware {
-
- private final CuratorFramework curator;
-
- private final ZookeeperDiscoveryProperties properties;
-
- private final AtomicLong cacheChange = new AtomicLong(0);
-
- private ApplicationEventPublisher publisher;
-
- private TreeCache cache;
-
- public ZookeeperServiceWatch(CuratorFramework curator,
- ZookeeperDiscoveryProperties properties) {
- this.curator = curator;
- this.properties = properties;
- }
-
- @Override
- public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
- this.publisher = publisher;
- }
-
- public TreeCache getCache() {
- return this.cache;
- }
-
- @Override
- public void onApplicationEvent(InstanceRegisteredEvent event) {
- this.cache = TreeCache.newBuilder(this.curator, this.properties.getRoot())
- .build();
- this.cache.getListenable().addListener(this);
- try {
- this.cache.start();
- }
- catch (Exception e) {
- ReflectionUtils.rethrowRuntimeException(e);
- }
- }
-
- @PreDestroy
- public void stop() throws Exception {
- if (this.cache != null) {
- this.cache.close();
- }
- }
-
- @Override
- public void childEvent(CuratorFramework client, TreeCacheEvent event)
- throws Exception {
- if (event.getType().equals(TreeCacheEvent.Type.NODE_ADDED)
- || event.getType().equals(TreeCacheEvent.Type.NODE_REMOVED)
- || event.getType().equals(TreeCacheEvent.Type.NODE_UPDATED)) {
- long newCacheChange = this.cacheChange.incrementAndGet();
- this.publisher.publishEvent(new HeartbeatEvent(this, newCacheChange));
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java
deleted file mode 100644
index 73c44a563..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerAutoConfiguration.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.configclient;
-
-import jakarta.annotation.PostConstruct;
-import org.apache.curator.framework.CuratorFramework;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.config.server.config.ConfigServerProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-/**
- * Extra configuration for config server if it happens to be registered with Zookeeper.
- *
- * @author Dave Syer
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass({ ZookeeperDiscoveryProperties.class, CuratorFramework.class,
- ConfigServerProperties.class })
-public class ZookeeperConfigServerAutoConfiguration {
-
- @Autowired(required = false)
- private ZookeeperDiscoveryProperties properties;
-
- @Autowired(required = false)
- private ConfigServerProperties server;
-
- @PostConstruct
- public void init() {
- if (this.properties == null || this.server == null) {
- return;
- }
- String prefix = this.server.getPrefix();
- if (StringUtils.hasText(prefix)) {
- this.properties.getMetadata().put("configPath", prefix);
- }
- }
-
-}
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
deleted file mode 100644
index 5bdd11f4b..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.configclient;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.apache.commons.logging.Log;
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-import org.apache.curator.x.discovery.details.InstanceSerializer;
-import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-
-import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.BootstrapRegistry;
-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;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.cloud.config.client.ConfigClientProperties;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.zookeeper.CuratorFactory;
-import org.springframework.cloud.zookeeper.ZookeeperProperties;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryClient;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.cloud.zookeeper.support.DefaultServiceDiscoveryCustomizer;
-import org.springframework.cloud.zookeeper.support.ServiceDiscoveryCustomizer;
-import org.springframework.util.ClassUtils;
-
-public class ZookeeperConfigServerBootstrapper implements BootstrapRegistryInitializer {
-
- private static boolean isEnabled(Binder binder) {
- return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false) &&
- binder.bind(ConditionalOnZookeeperDiscoveryEnabled.PROPERTY, Boolean.class).orElse(true) &&
- binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void initialize(BootstrapRegistry registry) {
- if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null) ||
- // don't run if bootstrap enabled, how to check the property?
- ClassUtils.isPresent("org.springframework.cloud.bootstrap.marker.Marker", null)) {
- return;
- }
- // create curator
- CuratorFactory.registerCurator(registry, null, true, bootstrapContext -> isEnabled(bootstrapContext.get(Binder.class)));
-
- // create discovery
- registry.registerIfAbsent(ZookeeperDiscoveryProperties.class, context -> {
- Binder binder = context.get(Binder.class);
- if (!isEnabled(binder)) {
- return null;
- }
- return binder.bind(ZookeeperDiscoveryProperties.PREFIX, Bindable
- .of(ZookeeperDiscoveryProperties.class), getBindHandler(context))
- .orElseGet(() -> new ZookeeperDiscoveryProperties(new InetUtils(new InetUtilsProperties())));
- });
- registry.registerIfAbsent(InstanceSerializer.class, context -> {
- if (!isEnabled(context.get(Binder.class))) {
- return null;
- }
- return new JsonInstanceSerializer<>(ZookeeperInstance.class);
- });
- registry.registerIfAbsent(ServiceDiscoveryCustomizer.class, context -> {
- if (!isEnabled(context.get(Binder.class))) {
- return null;
- }
- CuratorFramework curator = context.get(CuratorFramework.class);
- ZookeeperDiscoveryProperties properties = context.get(ZookeeperDiscoveryProperties.class);
- InstanceSerializer serializer = context.get(InstanceSerializer.class);
- return new DefaultServiceDiscoveryCustomizer(curator, properties, serializer);
- });
- registry.registerIfAbsent(ServiceDiscovery.class, context -> {
- if (!isEnabled(context.get(Binder.class))) {
- return null;
- }
- ServiceDiscoveryCustomizer customizer = context.get(ServiceDiscoveryCustomizer.class);
- return customizer.customize(ServiceDiscoveryBuilder.builder(ZookeeperInstance.class));
- });
- registry.registerIfAbsent(ZookeeperDiscoveryClient.class, context -> {
- Binder binder = context.get(Binder.class);
- if (!isEnabled(binder)) {
- return null;
- }
- ServiceDiscovery serviceDiscovery = context.get(ServiceDiscovery.class);
- ZookeeperDependencies dependencies = binder.bind(ZookeeperDependencies.PREFIX, Bindable
- .of(ZookeeperDependencies.class), getBindHandler(context))
- .orElseGet(ZookeeperDependencies::new);
- ZookeeperDiscoveryProperties discoveryProperties = context.get(ZookeeperDiscoveryProperties.class);
-
- return new ZookeeperDiscoveryClient(serviceDiscovery, dependencies, discoveryProperties);
- });
-
- // create instance provider
- // We need to pass the lambda here so we do not create a new instance of ConfigServerInstanceProvider.Function
- // which would result in a ClassNotFoundException when Spring Cloud Config is not on the classpath
- registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, ZookeeperFunction::create);
-
- // promote beans to context
- registry.addCloseListener(event -> {
- ZookeeperDiscoveryClient discoveryClient = event.getBootstrapContext().get(ZookeeperDiscoveryClient.class);
- if (discoveryClient != null) {
- event.getApplicationContext().getBeanFactory().registerSingleton("zookeeperServiceDiscovery",
- discoveryClient);
- }
- });
- }
-
- private BindHandler getBindHandler(org.springframework.boot.BootstrapContext context) {
- return context.getOrElse(BindHandler.class, null);
- }
-
- /*
- * This Function is executed when loading config data. Because of this we cannot rely on the
- * BootstrapContext because Boot has not finished loading all the configuration data so if we
- * ask the BootstrapContext for configuration data it will not have it. The apply method in this function
- * is passed the Binder and BindHandler from the config data context which has the configuration properties that
- * have been loaded so far in the config data process.
- *
- * We will create many of the same beans in this function as we do above in the initializer above. We do both
- * to maintain compatibility since we are promoting those beans to the main application context.
- */
- static final class ZookeeperFunction implements ConfigServerInstanceProvider.Function {
-
- private final BootstrapContext context;
-
- private ZookeeperFunction(BootstrapContext context) {
- this.context = context;
- }
-
- static ZookeeperFunction create(BootstrapContext context) {
- return new ZookeeperFunction(context);
- }
-
- @Override
- public List apply(String serviceId) {
- return apply(serviceId, null, null, null);
- }
-
- @Override
- public List apply(String serviceId, Binder binder, BindHandler bindHandler, Log log) {
- if (binder == null || !isEnabled(binder)) {
- return Collections.emptyList();
- }
-
- ZookeeperProperties properties = binder.bind(ZookeeperProperties.PREFIX, Bindable.of(ZookeeperProperties.class))
- .orElse(new ZookeeperProperties());
- RetryPolicy retryPolicy = new ExponentialBackoffRetry(properties.getBaseSleepTimeMs(), properties.getMaxRetries(),
- properties.getMaxSleepMs());
- try {
- CuratorFramework curatorFramework = CuratorFactory.curatorFramework(properties, retryPolicy, Stream::of,
- () -> null, () -> null);
- InstanceSerializer serializer = new JsonInstanceSerializer<>(ZookeeperInstance.class);
- ZookeeperDiscoveryProperties discoveryProperties = binder.bind(ZookeeperDiscoveryProperties.PREFIX, Bindable
- .of(ZookeeperDiscoveryProperties.class), bindHandler)
- .orElseGet(() -> new ZookeeperDiscoveryProperties(new InetUtils(new InetUtilsProperties())));
- DefaultServiceDiscoveryCustomizer customizer = new DefaultServiceDiscoveryCustomizer(curatorFramework, discoveryProperties, serializer);
- ServiceDiscovery serviceDiscovery = customizer.customize(ServiceDiscoveryBuilder.builder(ZookeeperInstance.class));
- ZookeeperDependencies dependencies = binder.bind(ZookeeperDependencies.PREFIX, Bindable
- .of(ZookeeperDependencies.class), bindHandler)
- .orElseGet(ZookeeperDependencies::new);
- return new ZookeeperDiscoveryClient(serviceDiscovery, dependencies, discoveryProperties).getInstances(serviceId);
- }
- catch (Exception e) {
- log.warn("Error fetching config server instance from Zookeeper", e);
- return Collections.emptyList();
- }
-
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java
deleted file mode 100644
index c0962a07a..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.configclient;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.zookeeper.ZookeeperAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryClientConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.support.CuratorServiceDiscoveryAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.Order;
-
-/**
- * Helper for config client that wants to lookup the config server via discovery.
- *
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
-@Configuration(proxyBeanMethods = false)
-@Import({ ZookeeperAutoConfiguration.class, ZookeeperDiscoveryClientConfiguration.class,
- CuratorServiceDiscoveryAutoConfiguration.class,
- ZookeeperDiscoveryAutoConfiguration.class })
-@EnableConfigurationProperties({DiscoveryClientHealthIndicatorProperties.class})
-@Order(0)
-public class ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration {
-
- @Bean
- public ZookeeperDiscoveryProperties zookeeperDiscoveryProperties(
- InetUtils inetUtils) {
- ZookeeperDiscoveryProperties properties = new ZookeeperDiscoveryProperties(
- inetUtils);
- // for bootstrap, registration is not needed, just discovery client
- properties.setRegister(false);
- return properties;
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java
deleted file mode 100644
index 174d73058..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.context.annotation.Conditional;
-
-/**
- * Annotation to turn off a feature if Zookeeper dependencies have NOT been passed.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Conditional(DependenciesNotPassedCondition.class)
-public @interface ConditionalOnDependenciesNotPassed {
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java
deleted file mode 100644
index a3ce862f7..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.context.annotation.Conditional;
-
-/**
- * Annotation to turn on a feature if Zookeeper dependencies have been passed. Also checks
- * if switch for zookeeper dependencies is turned on.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Conditional(DependenciesPassedCondition.class)
-public @interface ConditionalOnDependenciesPassed {
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java
deleted file mode 100644
index 2bc270cc3..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * Inverse of the {@link ConditionalOnDependenciesPassed} condition.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public class DependenciesNotPassedCondition extends DependenciesPassedCondition {
-
- @Override
- public ConditionOutcome getMatchOutcome(ConditionContext context,
- AnnotatedTypeMetadata metadata) {
- ConditionOutcome propertiesSet = super.getMatchOutcome(context, metadata);
- return ConditionOutcome.inverse(propertiesSet);
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java
deleted file mode 100644
index 271efaeb0..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.boot.context.properties.bind.Bindable;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * Condition that verifies if the Dependencies have been passed in an appropriate place in
- * the application properties.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public class DependenciesPassedCondition extends SpringBootCondition {
-
- private static final Bindable> STRING_STRING_MAP = Bindable
- .mapOf(String.class, String.class);
-
- private static final String ZOOKEEPER_DEPENDENCIES_PROP = "spring.cloud.zookeeper.dependencies";
-
- @Override
- public ConditionOutcome getMatchOutcome(ConditionContext context,
- AnnotatedTypeMetadata metadata) {
- Map subProperties = Binder.get(context.getEnvironment())
- .bind(ZOOKEEPER_DEPENDENCIES_PROP, STRING_STRING_MAP)
- .orElseGet(Collections::emptyMap);
- if (!subProperties.isEmpty()) {
- return ConditionOutcome.match("Dependencies are defined in configuration");
- }
- Boolean dependenciesEnabled = context.getEnvironment().getProperty(
- "spring.cloud.zookeeper.dependency.enabled", Boolean.class, false);
- if (dependenciesEnabled) {
- return ConditionOutcome.match(
- "Dependencies are not defined in configuration, but switch is turned on");
- }
- return ConditionOutcome
- .noMatch("No dependencies have been passed for the service");
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java
deleted file mode 100644
index 92a664ddc..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.util.Collections;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.env.EnvironmentPostProcessor;
-import org.springframework.cloud.bootstrap.BootstrapConfigFileApplicationListener;
-import org.springframework.core.Ordered;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.springframework.util.StringUtils;
-
-/**
- * EnvironmentPostProcessor that sets spring.application.name. Specifically, if
- * spring.application.name doesn't contain a / and spring.cloud.zookeeper.prefix has text,
- * it sets spring.application.name to
- * /${spring.cloud.zookeeper.prefix}/${spring.application.name}
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class DependencyEnvironmentPostProcessor
- implements EnvironmentPostProcessor, Ordered {
-
- // after ConfigFileEnvironmentPostProcessorr
- private int order = BootstrapConfigFileApplicationListener.DEFAULT_ORDER + 1;
-
- @Override
- public int getOrder() {
- return this.order;
- }
-
- @Override
- public void postProcessEnvironment(ConfigurableEnvironment environment,
- SpringApplication application) {
- String appName = environment.getProperty("spring.application.name");
- if (StringUtils.hasText(appName) && !appName.contains("/")) {
- String prefix = environment.getProperty("spring.cloud.zookeeper.prefix");
- if (StringUtils.hasText(prefix)) {
- StringBuilder prefixedName = new StringBuilder();
- if (!prefix.startsWith("/")) {
- prefixedName.append("/");
- }
- prefixedName.append(prefix);
- if (!prefix.endsWith("/")) {
- prefixedName.append("/");
- }
- prefixedName.append(appName);
- MapPropertySource propertySource = new MapPropertySource(
- "zookeeperDependencyEnvironment",
- Collections.singletonMap("spring.application.name",
- (Object) prefixedName.toString()));
- environment.getPropertySources().addFirst(propertySource);
- }
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java
deleted file mode 100644
index d47ffc5a4..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
-import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
-import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
-import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
-import org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-/**
- * Configuration for ensuring that headers are set for a given dependency when Feign is
- * used.
- *
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDependenciesPassed
-@ConditionalOnZookeeperEnabled
-@ConditionalOnProperty(value = "spring.cloud.zookeeper.dependency.headers.enabled", matchIfMissing = true)
-@ConditionalOnClass({Client.class, FeignBlockingLoadBalancerClient.class})
-@ConditionalOnBean(BlockingLoadBalancerClient.class)
-@AutoConfigureAfter({FeignLoadBalancerAutoConfiguration.class, BlockingLoadBalancerClientAutoConfiguration.class})
-public class DependencyFeignClientAutoConfiguration {
-
- private final FeignBlockingLoadBalancerClient feignLoadBalancerClient;
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- private final BlockingLoadBalancerClient loadBalancerClient;
-
- private final LoadBalancerProperties loadBalancerProperties;
-
- private final LoadBalancerClientFactory loadBalancerClientFactory;
-
- public DependencyFeignClientAutoConfiguration(@Autowired(required = false) FeignBlockingLoadBalancerClient feignLoadBalancerClient,
- ZookeeperDependencies zookeeperDependencies, BlockingLoadBalancerClient loadBalancerClient, LoadBalancerProperties loadBalancerProperties, LoadBalancerClientFactory loadBalancerClientFactory) {
- this.feignLoadBalancerClient = feignLoadBalancerClient;
- this.zookeeperDependencies = zookeeperDependencies;
- this.loadBalancerClient = loadBalancerClient;
- this.loadBalancerProperties = loadBalancerProperties;
- this.loadBalancerClientFactory = loadBalancerClientFactory;
- }
-
- @Bean
- @Primary
- Client dependencyBasedFeignClient() {
- return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
- loadBalancerClient, loadBalancerProperties, loadBalancerClientFactory) {
-
- @Override
- public Response execute(Request request, Request.Options options)
- throws IOException {
- URI asUri = URI.create(request.url());
- String clientName = asUri.getHost();
- ZookeeperDependency dependencyForAlias = DependencyFeignClientAutoConfiguration.this.zookeeperDependencies
- .getDependencyForAlias(clientName);
- Map> headers = getUpdatedHeadersIfPossible(
- request, dependencyForAlias);
- if (DependencyFeignClientAutoConfiguration.this.feignLoadBalancerClient != null) {
- return DependencyFeignClientAutoConfiguration.this.feignLoadBalancerClient
- .execute(request(request, headers), options);
- }
- return super.execute(request(request, headers), options);
- }
-
- private Request request(Request request,
- Map> headers) {
- return Request.create(request.httpMethod(), request.url(), headers,
- request.body(), request.charset(), request.requestTemplate());
- }
-
- private Map> getUpdatedHeadersIfPossible(
- Request request, ZookeeperDependency dependencyForAlias) {
- if (dependencyForAlias != null) {
- return Collections.unmodifiableMap(new HashMap<>(
- dependencyForAlias.getUpdatedHeaders(request.headers())));
- }
- return request.headers();
- }
-
- };
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java
deleted file mode 100644
index 6a13ecf87..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jakarta.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnLoadBalancerForZookeeperEnabled;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Customizes RestTemplate to support passing of params from dependency.
- *
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnZookeeperEnabled
-@ConditionalOnLoadBalancerForZookeeperEnabled
-@ConditionalOnDependenciesPassed
-@ConditionalOnProperty(value = "spring.cloud.zookeeper.dependency.resttemplate.enabled", matchIfMissing = true)
-@ConditionalOnBean(RestTemplate.class)
-public class DependencyRestTemplateAutoConfiguration {
-
- @Autowired
- @LoadBalanced
- RestTemplate restTemplate;
-
- @Autowired
- ZookeeperDependencies zookeeperDependencies;
-
- @PostConstruct
- void customizeRestTemplate() {
- this.restTemplate.getInterceptors().add(new ClientHttpRequestInterceptor() {
- @Override
- public ClientHttpResponse intercept(HttpRequest request, byte[] body,
- ClientHttpRequestExecution execution) throws IOException {
- String clientName = request.getURI().getHost();
- ZookeeperDependency dependencyForAlias = DependencyRestTemplateAutoConfiguration.this.zookeeperDependencies
- .getDependencyForAlias(clientName);
- HttpHeaders headers = getUpdatedHeadersIfPossible(request,
- dependencyForAlias);
- request.getHeaders().putAll(headers);
- return execution.execute(request, body);
- }
-
- private HttpHeaders getUpdatedHeadersIfPossible(HttpRequest request,
- ZookeeperDependency dependencyForAlias) {
- HttpHeaders httpHeaders = new HttpHeaders();
- if (dependencyForAlias != null) {
- Map> updatedHeaders = dependencyForAlias
- .getUpdatedHeaders(convertHeadersFromListToCollection(
- request.getHeaders()));
- httpHeaders
- .putAll(convertHeadersFromCollectionToList(updatedHeaders));
- return httpHeaders;
- }
- httpHeaders.putAll(request.getHeaders());
- return httpHeaders;
- }
-
- private Map> convertHeadersFromListToCollection(
- HttpHeaders headers) {
- Map> transformedHeaders = new HashMap<>();
- for (Map.Entry> entry : headers.entrySet()) {
- transformedHeaders.put(entry.getKey(), entry.getValue());
- }
- return transformedHeaders;
- }
-
- private Map> convertHeadersFromCollectionToList(
- Map> headers) {
- Map> transformedHeaders = new HashMap<>();
- for (Map.Entry> entry : headers.entrySet()) {
- transformedHeaders.put(entry.getKey(),
- new ArrayList<>(entry.getValue()));
- }
- return transformedHeaders;
- }
- });
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java
deleted file mode 100644
index 2313f07a4..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-
-import org.springframework.util.StringUtils;
-
-/**
- * Representation of a stubs location.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public class StubsConfiguration {
-
- private static final String DEFAULT_STUBS_CLASSIFIER = "stubs";
-
- private static final String STUB_COLON_DELIMITER = ":";
-
- private static final String PATH_SLASH_DELIMITER = "/";
-
- private final String stubsGroupId;
-
- private final String stubsArtifactId;
-
- private final String stubsClassifier;
-
- public StubsConfiguration(String stubsGroupId, String stubsArtifactId,
- String stubsClassifier) {
- this.stubsGroupId = stubsGroupId;
- this.stubsArtifactId = stubsArtifactId;
- this.stubsClassifier = StringUtils.hasText(stubsClassifier) ? stubsClassifier
- : DEFAULT_STUBS_CLASSIFIER;
- }
-
- public StubsConfiguration(String stubPath) {
- String[] parsedPath = parsedStubPathEmptyByDefault(stubPath,
- STUB_COLON_DELIMITER);
- this.stubsGroupId = parsedPath[0];
- this.stubsArtifactId = parsedPath[1];
- this.stubsClassifier = parsedPath[2];
- }
-
- public StubsConfiguration(DependencyPath path) {
- String[] parsedPath = parsedDependencyPathEmptyByDefault(path.getPath(),
- PATH_SLASH_DELIMITER);
- this.stubsGroupId = parsedPath[0];
- this.stubsArtifactId = parsedPath[1];
- this.stubsClassifier = parsedPath[2];
- }
-
- private String[] parsedStubPathEmptyByDefault(String path, String delimiter) {
- String[] splitPath = path.split(delimiter);
- String stubsGroupId = "";
- String stubsArtifactId = "";
- String stubsClassifier = "";
- if (splitPath.length >= 2) {
- stubsGroupId = splitPath[0];
- stubsArtifactId = splitPath[1];
- stubsClassifier = splitPath.length == 3 ? splitPath[2]
- : DEFAULT_STUBS_CLASSIFIER;
- }
- return new String[] { stubsGroupId, stubsArtifactId, stubsClassifier };
- }
-
- private String[] parsedDependencyPathEmptyByDefault(String path, String delimiter) {
- String trimmedPath = path.startsWith(delimiter) ? path.substring(1) : path;
- String[] splitPath = trimmedPath.split(delimiter);
- String stubsGroupId = "";
- String stubsArtifactId = "";
- String stubsClassifier = "";
- if (splitPath.length >= 2) {
- LinkedList list = new LinkedList<>(Arrays.asList(splitPath));
- String lastElement = list.removeLast();
- stubsGroupId = StringUtils.collectionToDelimitedString(list, ".");
- stubsArtifactId = lastElement;
- stubsClassifier = DEFAULT_STUBS_CLASSIFIER;
- }
- return new String[] { stubsGroupId, stubsArtifactId, stubsClassifier };
- }
-
- private boolean isDefined() {
- return StringUtils.hasText(this.stubsGroupId)
- && StringUtils.hasText(this.stubsArtifactId);
- }
-
- public String toColonSeparatedDependencyNotation() {
- if (!isDefined()) {
- return "";
- }
- return StringUtils.collectionToDelimitedString(Arrays.asList(getStubsGroupId(),
- getStubsArtifactId(), getStubsClassifier()), STUB_COLON_DELIMITER);
- }
-
- public String getStubsGroupId() {
- return this.stubsGroupId;
- }
-
- public String getStubsArtifactId() {
- return this.stubsArtifactId;
- }
-
- public String getStubsClassifier() {
- return this.stubsClassifier;
- }
-
- /**
- * Marker class to discern between the stubs location and dependency registration path.
- */
- public static class DependencyPath {
-
- private final String path;
-
- public DependencyPath(String path) {
- this.path = path;
- }
-
- public String getPath() {
- return this.path;
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java
deleted file mode 100644
index 2b6b4bc24..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import jakarta.annotation.PostConstruct;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.zookeeper.discovery.dependency.StubsConfiguration.DependencyPath;
-import org.springframework.util.StringUtils;
-
-import static org.springframework.cloud.zookeeper.discovery.DependencyPathUtils.sanitize;
-
-/**
- * Representation of this service's dependencies in Zookeeper.
- *
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-@ConfigurationProperties(ZookeeperDependencies.PREFIX)
-public class ZookeeperDependencies {
-
- /**
- * Zookeeper Dependencies prefix.
- */
- public static final String PREFIX = "spring.cloud.zookeeper";
-
- /**
- * Common prefix that will be applied to all Zookeeper dependencies' paths.
- */
- private String prefix = "";
-
- /**
- * Mapping of alias to ZookeeperDependency. From LoadBalancer perspective the alias is
- * actually serviceID since SC LoadBalancer can't accept nested structures in serviceID.
- */
- private Map dependencies = new LinkedHashMap<>();
-
- @PostConstruct
- public void init() {
- if (StringUtils.hasText(this.prefix)) {
- this.prefix = sanitize(this.prefix);
- }
- for (Map.Entry entry : this.dependencies
- .entrySet()) {
- ZookeeperDependency value = entry.getValue();
-
- if (!StringUtils.hasText(value.getPath())) {
- value.setPath(entry.getKey());
- }
-
- value.setPath(sanitize(value.getPath()));
-
- if (StringUtils.hasText(this.prefix)) {
- value.setPath(this.prefix + value.getPath());
- }
-
- setStubDefinition(value);
- }
- }
-
- private void setStubDefinition(ZookeeperDependency value) {
- if (!StringUtils.hasText(value.getStubs())) {
- value.setStubsConfiguration(
- new StubsConfiguration(new DependencyPath(value.getPath())));
- }
- else {
- value.setStubsConfiguration(new StubsConfiguration(value.getStubs()));
- }
- }
-
- public Collection getDependencyConfigurations() {
- return this.dependencies.values();
- }
-
- public boolean hasDependencies() {
- return !this.dependencies.isEmpty();
- }
-
- public ZookeeperDependency getDependencyForPath(final String path) {
- for (Map.Entry zookeeperDependencyEntry : this.dependencies
- .entrySet()) {
- if (zookeeperDependencyEntry.getValue().getPath().equals(path)) {
- return zookeeperDependencyEntry.getValue();
- }
- }
- return null;
- }
-
- public ZookeeperDependency getDependencyForAlias(final String alias) {
- for (Map.Entry zookeeperDependencyEntry : this.dependencies
- .entrySet()) {
- if (zookeeperDependencyEntry.getKey().equals(alias)) {
- return zookeeperDependencyEntry.getValue();
- }
- }
- return null;
- }
-
- public String getPathForAlias(final String alias) {
- ZookeeperDependency dependency = getDependencyForAlias(alias);
- if (dependency != null) {
- return dependency.getPath();
- }
- return "";
- }
-
- public String getAliasForPath(final String path) {
- for (Map.Entry zookeeperDependencyEntry : this.dependencies
- .entrySet()) {
- if (zookeeperDependencyEntry.getValue().getPath().equals(path)) {
- return zookeeperDependencyEntry.getKey();
- }
- }
- return "";
- }
-
- public Collection getDependencyNames() {
- List names = new ArrayList<>();
- for (Map.Entry zookeeperDependencyEntry : this.dependencies
- .entrySet()) {
- names.add(zookeeperDependencyEntry.getValue().getPath());
- }
- return names;
- }
-
- public String getPrefix() {
- return this.prefix;
- }
-
- public Map getDependencies() {
- return this.dependencies;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-
- public void setDependencies(Map dependencies) {
- this.dependencies = dependencies;
- }
-
- @Override
- public String toString() {
- final StringBuffer sb = new StringBuffer("ZookeeperDependencies{");
- sb.append("prefix='").append(this.prefix).append('\'');
- sb.append(", dependencies=").append(this.dependencies);
- sb.append('}');
- return sb.toString();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java
deleted file mode 100644
index 30c3eb57d..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-import org.springframework.cloud.zookeeper.ZookeeperAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Provides AutoConfiguration for Zookeeper dependency set up in properties.
- *
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnZookeeperEnabled
-@AutoConfigureAfter(ZookeeperAutoConfiguration.class)
-public class ZookeeperDependenciesAutoConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public ZookeeperDependencies zookeeperDependencies() {
- return new ZookeeperDependencies();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java
deleted file mode 100644
index d2a06be5a..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.dependency;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.util.StringUtils;
-
-import static java.util.Collections.singletonList;
-
-/**
- * Represents a particular dependency of Zookeeper instance.
- *
- * @author Marcin Grzejszczak
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- * @since 1.0.0
- */
-public class ZookeeperDependency {
-
- private static final String VERSION_PLACEHOLDER_REGEX = "\\$version";
-
- private static final String CONTENT_TYPE_HEADER = "Content-Type";
-
- /**
- * Path under which the dependency is registered in Zookeeper. The common prefix
- * {@link ZookeeperDependencies#prefix} will be applied to this path.
- */
- private String path;
-
- /**
- * Content type template with {@code $version} placeholder which will be filled by the
- * {@link ZookeeperDependency#version} variable.
- *
- * e.g. {@code 'application/vnd.some-service.$version+json'}
- */
- private String contentTypeTemplate = "";
-
- /**
- * Provide the current version number of the dependency. This version will be placed
- * under the {@code $version} placeholder in
- * {@link ZookeeperDependency#contentTypeTemplate}.
- */
- private String version = "";
-
- /**
- * You can provide a map of default headers that should be attached when sending a
- * message to the dependency.
- */
- private Map> headers = new HashMap<>();
-
- /**
- * If set to true - if the dependency is not present on startup then the application
- * will not boot successfully.
- *
- * {@link org.springframework.cloud.zookeeper.discovery.watcher.presence.DependencyPresenceOnStartupVerifier}
- * {@link org.springframework.cloud.zookeeper.discovery.watcher.DefaultDependencyWatcher}
- */
- private boolean required;
-
- /**
- * Colon separated notation of the stubs. E.g.
- * {@code org.springframework:zookeeper-sample:stubs}. If not provided the
- * {@code path} will be parsed to try to split it into groupId and artifactId. If not
- * provided the classifier will by default equal {@code stubs}
- */
- private String stubs;
-
- public ZookeeperDependency() {
- }
-
- public ZookeeperDependency(String path, String contentTypeTemplate, String version,
- Map> headers, boolean required, String stubs) {
- this.path = path;
- this.contentTypeTemplate = contentTypeTemplate;
- this.version = version;
- this.headers = headers;
- this.required = required;
- this.stubs = stubs;
- }
-
- /**
- * Parsed stubs path.
- */
- private StubsConfiguration stubsConfiguration;
-
- public ZookeeperDependency(String path) {
- if (StringUtils.hasText(path)) {
- this.path = path;
- }
- }
-
- /**
- * Function that will replace the placeholder
- * {@link ZookeeperDependency#VERSION_PLACEHOLDER_REGEX} from the
- * {@link ZookeeperDependency#contentTypeTemplate} with value from
- * {@link ZookeeperDependency#version}.
- *
- *
- * e.g. having:
- *
contentTypeTemplate: {@code 'application/vnd.some-service.$version+json'}
- * version: {@code 'v1'}
- *
- *
- * the result of the function will be {@code 'application/vnd.some-service.v1+json'}
- * @return content type template with version
- */
- public String getContentTypeWithVersion() {
- if (!StringUtils.hasText(this.contentTypeTemplate)
- || !StringUtils.hasText(this.version)) {
- return "";
- }
- return this.contentTypeTemplate.replaceAll(VERSION_PLACEHOLDER_REGEX,
- this.version);
- }
-
- public Map> getUpdatedHeaders(
- Map> headers) {
- Map> newHeaders = new HashMap<>(headers);
- if (hasContentTypeTemplate()) {
- setContentTypeFromTemplate(newHeaders);
- }
- if (hasHeadersSet()) {
- addPredefinedHeaders(newHeaders);
- }
- return newHeaders;
- }
-
- private void setContentTypeFromTemplate(Map> headers) {
- Collection contentTypes = headers.get(CONTENT_TYPE_HEADER);
- if (contentTypes == null || contentTypes.isEmpty()) {
- headers.put(CONTENT_TYPE_HEADER, singletonList(getContentTypeWithVersion()));
- }
- else {
- contentTypes.add(getContentTypeWithVersion());
- }
- }
-
- private void addPredefinedHeaders(Map> newHeaders) {
- for (Map.Entry> entry : this.headers.entrySet()) {
- Collection value = newHeaders.get(entry.getKey());
- if (value == null || value.isEmpty()) {
- newHeaders.put(entry.getKey(), entry.getValue());
- }
- else {
- value.addAll(entry.getValue());
- }
- }
- }
-
- private boolean hasContentTypeTemplate() {
- return StringUtils.hasText(this.contentTypeTemplate);
- }
-
- private boolean hasHeadersSet() {
- return !this.headers.isEmpty();
- }
-
- public String getPath() {
- return this.path;
- }
-
- public String getContentTypeTemplate() {
- return this.contentTypeTemplate;
- }
-
- public String getVersion() {
- return this.version;
- }
-
- public Map> getHeaders() {
- return this.headers;
- }
-
- public boolean isRequired() {
- return this.required;
- }
-
- public String getStubs() {
- return this.stubs;
- }
-
- public StubsConfiguration getStubsConfiguration() {
- return this.stubsConfiguration;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public void setContentTypeTemplate(String contentTypeTemplate) {
- this.contentTypeTemplate = contentTypeTemplate;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public void setHeaders(Map> headers) {
- this.headers = headers;
- }
-
- public void setRequired(boolean required) {
- this.required = required;
- }
-
- public void setStubs(String stubs) {
- this.stubs = stubs;
- }
-
- public void setStubsConfiguration(StubsConfiguration stubsConfiguration) {
- this.stubsConfiguration = stubsConfiguration;
- }
-
- @Override
- public String toString() {
- final StringBuffer sb = new StringBuffer("ZookeeperDependency{");
- sb.append("path='").append(this.path).append('\'');
- sb.append(", contentTypeTemplate='").append(this.contentTypeTemplate)
- .append('\'');
- sb.append(", version='").append(this.version).append('\'');
- sb.append(", headers=").append(this.headers);
- sb.append(", required=").append(this.required);
- sb.append(", stubs='").append(this.stubs).append('\'');
- sb.append(", stubsConfiguration=").append(this.stubsConfiguration);
- sb.append('}');
- return sb.toString();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClient.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClient.java
deleted file mode 100644
index 1f7881b83..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClient.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.reactive;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.reactivestreams.Publisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperServiceInstance;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-
-/**
- * Zookeeper version of {@link ReactiveDiscoveryClient}. Capable of resolving aliases from
- * {@link org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies} to service names in Zookeeper.
- *
- * @author Tim Ysewyn
- * @since 2.2.0
- */
-public class ZookeeperReactiveDiscoveryClient implements ReactiveDiscoveryClient {
-
- private static final Logger logger = LoggerFactory.getLogger(ZookeeperReactiveDiscoveryClient.class);
-
- private final ServiceDiscovery serviceDiscovery;
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- private final ZookeeperDiscoveryProperties zookeeperDiscoveryProperties;
-
- public ZookeeperReactiveDiscoveryClient(ServiceDiscovery serviceDiscovery,
- ZookeeperDependencies zookeeperDependencies, ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- this.serviceDiscovery = serviceDiscovery;
- this.zookeeperDependencies = zookeeperDependencies;
- this.zookeeperDiscoveryProperties = zookeeperDiscoveryProperties;
- }
-
- @Override
- public String description() {
- return "Spring Cloud Zookeeper Reactive Discovery Client";
- }
-
- @Override
- public Flux getInstances(String serviceId) {
- String serviceIdToQuery = serviceIdToQuery(serviceId);
- return Mono.justOrEmpty(serviceIdToQuery)
- .flatMapMany(getInstancesFromZookeeper())
- .subscribeOn(Schedulers.boundedElastic())
- .map(zkInstance -> toZookeeperServiceInstance(serviceIdToQuery, zkInstance));
- }
-
- private Function>> getInstancesFromZookeeper() {
- return service -> {
- try {
- return Flux.fromIterable(serviceDiscovery.queryForInstances(service));
- }
- catch (Exception e) {
- logger.error("Error getting instances from zookeeper. Possibly, no service has registered.", e);
- return Flux.empty();
- }
- };
- }
-
- private ZookeeperServiceInstance toZookeeperServiceInstance(String serviceId,
- org.apache.curator.x.discovery.ServiceInstance zkInstanceServiceInstance) {
- return new ZookeeperServiceInstance(serviceId, zkInstanceServiceInstance);
- }
-
- @Override
- public Flux getServices() {
- return Flux.defer(getServicesFromZookeeper())
- .subscribeOn(Schedulers.boundedElastic());
- }
-
- private Supplier> getServicesFromZookeeper() {
- return () -> {
- try {
- return Flux.fromIterable(serviceDiscovery.queryForNames());
- }
- catch (Exception e) {
- logger.error("Error getting services from zookeeper. Possibly, no service has registered.", e);
- return Flux.empty();
- }
- };
- }
-
- private String serviceIdToQuery(String serviceId) {
- if (zookeeperDependencies != null
- && zookeeperDependencies.hasDependencies()) {
- String pathForAlias = zookeeperDependencies.getPathForAlias(serviceId);
- return pathForAlias.isEmpty() ? serviceId : pathForAlias;
- }
- return serviceId;
- }
-
- @Override
- public int getOrder() {
- return zookeeperDiscoveryProperties.getOrder();
- }
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java
deleted file mode 100644
index cf506faf3..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/reactive/ZookeeperReactiveDiscoveryClientConfiguration.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.reactive;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
-import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
-import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
-import org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
-import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
-import org.springframework.cloud.zookeeper.ZookeeperAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * {@link org.springframework.cloud.client.discovery.ReactiveDiscoveryClient} configuration for
- * Zookeeper.
- *
- * @author Tim Ysewyn
- * @since 2.2.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnReactiveDiscoveryEnabled
-@ConditionalOnZookeeperDiscoveryEnabled
-@AutoConfigureAfter({ ReactiveCompositeDiscoveryClientAutoConfiguration.class, ZookeeperAutoConfiguration.class})
-@AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class)
-public class ZookeeperReactiveDiscoveryClientConfiguration {
-
- @Autowired(required = false)
- private ZookeeperDependencies zookeeperDependencies;
-
- @Bean
- @ConditionalOnMissingBean
- public ZookeeperReactiveDiscoveryClient zookeeperReactiveDiscoveryClient(ServiceDiscovery serviceDiscovery,
- ZookeeperDiscoveryProperties zookeeperDiscoveryProperties) {
- return new ZookeeperReactiveDiscoveryClient(serviceDiscovery, zookeeperDependencies, zookeeperDiscoveryProperties);
- }
-
- @Bean
- @ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
- @ConditionalOnDiscoveryHealthIndicatorEnabled
- public ReactiveDiscoveryClientHealthIndicator zookeeperReactiveDiscoveryClientHealthIndicator(
- ZookeeperReactiveDiscoveryClient client,
- DiscoveryClientHealthIndicatorProperties properties) {
- return new ReactiveDiscoveryClientHealthIndicator(client, properties);
- }
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java
deleted file mode 100755
index 597aaab2c..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.curator.x.discovery.ServiceCache;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-
-import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependency;
-import org.springframework.cloud.zookeeper.discovery.watcher.presence.DependencyPresenceOnStartupVerifier;
-import org.springframework.context.ApplicationListener;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * This Dependency Watcher will verify the presence of dependencies upon startup and
- * registers listeners to changing of state of dependencies during the application's
- * lifecycle.
- *
- * @author Marcin Grzejszczak
- * @author Michal Chmielarz, 4financeIT
- * @since 1.0.0
- * @see DependencyPresenceOnStartupVerifier
- * @see DependencyWatcherListener
- */
-public class DefaultDependencyWatcher implements DependencyRegistrationHookProvider,
- ApplicationListener> {
-
- private final Map> dependencyRegistry = new ConcurrentHashMap<>();
-
- private final List listeners;
-
- private ServiceDiscovery serviceDiscovery;
-
- private final DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier;
-
- private final ZookeeperDependencies zookeeperDependencies;
-
- public DefaultDependencyWatcher(ServiceDiscovery serviceDiscovery,
- DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier,
- List dependencyWatcherListeners,
- ZookeeperDependencies zookeeperDependencies) {
- this.serviceDiscovery = serviceDiscovery;
- this.dependencyPresenceOnStartupVerifier = dependencyPresenceOnStartupVerifier;
- this.listeners = dependencyWatcherListeners;
- this.zookeeperDependencies = zookeeperDependencies;
- }
-
- @Override
- public void onApplicationEvent(InstanceRegisteredEvent event) {
- registerDependencyRegistrationHooks();
- }
-
- @Override
- public void registerDependencyRegistrationHooks() {
- for (ZookeeperDependency zookeeperDependency : this.zookeeperDependencies
- .getDependencyConfigurations()) {
- String dependencyPath = zookeeperDependency.getPath();
- ServiceCache serviceCache = getServiceDiscovery().serviceCacheBuilder()
- .name(dependencyPath).build();
- try {
- serviceCache.start();
- }
- catch (Exception e) {
- ReflectionUtils.rethrowRuntimeException(e);
- }
- this.dependencyPresenceOnStartupVerifier.verifyDependencyPresence(
- dependencyPath, serviceCache, zookeeperDependency.isRequired());
- this.dependencyRegistry.put(dependencyPath, serviceCache);
- serviceCache.addListener(new DependencyStateChangeListenerRegistry(
- this.listeners, dependencyPath, serviceCache));
- }
- }
-
- private ServiceDiscovery getServiceDiscovery() {
- return this.serviceDiscovery;
- }
-
- @Override
- public void clearDependencyRegistrationHooks() throws IOException {
- for (ServiceCache cache : this.dependencyRegistry.values()) {
- cache.close();
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java
deleted file mode 100644
index 6280d1423..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-import java.io.IOException;
-
-/**
- * Implementations of this interface are required to register dependency registration
- * hooks on startup and their cleaning upon application context shutdown.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public interface DependencyRegistrationHookProvider {
-
- /**
- * Register hooks upon dependencies registration.
- * @throws Exception if registration fails.
- */
- void registerDependencyRegistrationHooks() throws Exception;
-
- /**
- * Unregister hooks upon dependencies registration.
- * @throws IOException if clearing fails.
- */
- void clearDependencyRegistrationHooks() throws IOException;
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyState.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyState.java
deleted file mode 100755
index 6999025c5..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyState.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-/**
- * Represents a dependency's Zookeeper connection state.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public enum DependencyState {
-
- /**
- * valid states.
- */
- CONNECTED, DISCONNECTED
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java
deleted file mode 100755
index 2e4e498e8..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.state.ConnectionState;
-import org.apache.curator.x.discovery.ServiceCache;
-import org.apache.curator.x.discovery.details.ServiceCacheListener;
-
-/**
- * Informs all the DependencyWatcherListeners that a dependency's state has changed.
- *
- * @author Marcin Grzejszczak
- * @author Tomasz Nurkiewicz, 4financeIT
- * @since 1.0.0
- */
-public class DependencyStateChangeListenerRegistry implements ServiceCacheListener {
-
- private static final Log log = LogFactory
- .getLog(DependencyStateChangeListenerRegistry.class);
-
- private final List listeners;
-
- private final String dependencyName;
-
- private final ServiceCache serviceCache;
-
- public DependencyStateChangeListenerRegistry(
- List listeners, String dependencyName,
- ServiceCache serviceCache) {
- this.listeners = listeners;
- this.dependencyName = dependencyName;
- this.serviceCache = serviceCache;
- }
-
- @Override
- public void cacheChanged() {
- DependencyState state = this.serviceCache.getInstances().isEmpty()
- ? DependencyState.DISCONNECTED : DependencyState.CONNECTED;
- logCurrentState(state);
- informListeners(state);
- }
-
- private void logCurrentState(DependencyState dependencyState) {
- log.info("Service cache state change for '" + this.dependencyName
- + "' instances, current service state: " + dependencyState);
- }
-
- private void informListeners(DependencyState state) {
- for (DependencyWatcherListener listener : this.listeners) {
- listener.stateChanged(this.dependencyName, state);
- }
- }
-
- @Override
- public void stateChanged(CuratorFramework client, ConnectionState newState) {
- // TODO do something or ignore for what is worth
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java
deleted file mode 100644
index e3dbd6614..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.discovery.dependency.ConditionalOnDependenciesPassed;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies;
-import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependenciesAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.watcher.presence.DefaultDependencyPresenceOnStartupVerifier;
-import org.springframework.cloud.zookeeper.discovery.watcher.presence.DependencyPresenceOnStartupVerifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Provides hooks for observing dependency lifecycle in Zookeeper. Needs custom
- * dependencies to be set in order to work.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- * @see ZookeeperDependencies
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnZookeeperEnabled
-@ConditionalOnDependenciesPassed
-@AutoConfigureAfter(ZookeeperDependenciesAutoConfiguration.class)
-public class DependencyWatcherAutoConfiguration {
-
- @Autowired(required = false)
- private List dependencyWatcherListeners = new ArrayList<>();
-
- @Bean
- @ConditionalOnMissingBean
- public DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier() {
- return new DefaultDependencyPresenceOnStartupVerifier();
- }
-
- @Bean(destroyMethod = "clearDependencyRegistrationHooks")
- @ConditionalOnMissingBean
- public DependencyRegistrationHookProvider dependencyWatcher(
- ServiceDiscovery serviceDiscovery,
- DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier,
- ZookeeperDependencies zookeeperDependencies) {
- return new DefaultDependencyWatcher(serviceDiscovery,
- dependencyPresenceOnStartupVerifier, this.dependencyWatcherListeners,
- zookeeperDependencies);
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java
deleted file mode 100755
index 81cc09faf..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher;
-
-/**
- * Performs logic upon change of state of a dependency {@link DependencyState} in the
- * service discovery system.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- * @see org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies
- */
-public interface DependencyWatcherListener {
-
- /**
- * Method executed upon state change of a dependency.
- * @param dependencyName - alias from microservice configuration
- * @param newState - new state of the dependency
- */
- void stateChanged(String dependencyName, DependencyState newState);
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifier.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifier.java
deleted file mode 100644
index 851efeea5..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifier.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-/**
- * By default passes logging dependency checker in order not to shutdown the application
- * if dependency is missing.
- *
- * @author Marcin Grzejszczak
- * @see LogMissingDependencyChecker
- * @version 1.0.0
- */
-public class DefaultDependencyPresenceOnStartupVerifier
- extends DependencyPresenceOnStartupVerifier {
-
- public DefaultDependencyPresenceOnStartupVerifier() {
- super(new LogMissingDependencyChecker());
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java
deleted file mode 100644
index aaa3cc3a2..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-import org.apache.curator.x.discovery.ServiceCache;
-
-/**
- * Verifier that checks for presence of mandatory dependencies and delegates to an
- * optional presence checker verification of presence of optional dependencies.
- *
- * The default implementation of required dependencies will result in shutting down of the
- * application if the dependency is missing.
- *
- * @author Marcin Grzejszczak
- * @author Tomasz Szymanski, 4financeIT
- * @see FailOnMissingDependencyChecker
- * @version 1.0.0
- */
-public abstract class DependencyPresenceOnStartupVerifier {
-
- private static final PresenceChecker MANDATORY_DEPENDENCY_CHECKER = new FailOnMissingDependencyChecker();
-
- private final PresenceChecker optionalDependencyChecker;
-
- public DependencyPresenceOnStartupVerifier(
- PresenceChecker optionalDependencyChecker) {
- this.optionalDependencyChecker = optionalDependencyChecker;
- }
-
- @SuppressWarnings("unchecked")
- public void verifyDependencyPresence(String dependencyName,
- @SuppressWarnings("rawtypes") ServiceCache serviceCache, boolean required) {
- if (required) {
- MANDATORY_DEPENDENCY_CHECKER.checkPresence(dependencyName,
- serviceCache.getInstances());
- }
- else {
- this.optionalDependencyChecker.checkPresence(dependencyName,
- serviceCache.getInstances());
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java
deleted file mode 100755
index 04ee125b1..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-import java.util.List;
-
-import org.apache.curator.x.discovery.ServiceInstance;
-
-/**
- * Will result in throwing an exception if there are no running instances of the
- * dependency.
- *
- * @author Marcin Grzejszczak
- * @author Adam Chudzik, 4financeIT
- * @since 1.0.0
- */
-public class FailOnMissingDependencyChecker implements PresenceChecker {
-
- @Override
- public void checkPresence(String dependencyName,
- List> serviceInstances) {
- if (serviceInstances.isEmpty()) {
- throw new NoInstancesRunningException(dependencyName);
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java
deleted file mode 100755
index a35c0e4af..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.curator.x.discovery.ServiceInstance;
-
-/**
- * Will log the missing microservice dependency.
- *
- * @author Marcin Grzejszczak
- * @author Tomasz Dziurko, 4financeIT
- * @since 1.0.0
- */
-public class LogMissingDependencyChecker implements PresenceChecker {
-
- private static final Log log = LogFactory.getLog(LogMissingDependencyChecker.class);
-
- @Override
- public void checkPresence(String dependencyName,
- List> serviceInstances) {
- if (serviceInstances.isEmpty()) {
- log.warn("Microservice dependency with name [" + dependencyName
- + "] is missing.");
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java
deleted file mode 100755
index 9a5429c63..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-/**
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public class NoInstancesRunningException extends RuntimeException {
-
- public NoInstancesRunningException(String dependencyName) {
- super("Required microservice dependency with name [" + dependencyName
- + "] is missing");
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/PresenceChecker.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/PresenceChecker.java
deleted file mode 100755
index 30e84ca50..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/PresenceChecker.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery.watcher.presence;
-
-import java.util.List;
-
-import org.apache.curator.x.discovery.ServiceInstance;
-
-/**
- * The implementation of this interface will be called upon checking if a dependency with
- * a given name is present upon startup within the provided service instances.
- *
- * @author Marcin Grzejszczak
- * @since 1.0.0
- */
-public interface PresenceChecker {
-
- /**
- * Checks if a given dependency is present.
- * @param dependencyName Name of the dependency.
- * @param serviceInstances - instances to check the dependency for.
- */
- void checkPresence(String dependencyName, List> serviceInstances);
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java
deleted file mode 100644
index 5a54c0435..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.discovery.ServiceInstanceBuilder;
-import org.apache.curator.x.discovery.ServiceType;
-import org.apache.curator.x.discovery.UriSpec;
-
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-
-import static org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties.DEFAULT_URI_SPEC;
-
-/**
- * {@link org.springframework.cloud.client.serviceregistry.Registration} that lazily
- * builds a {@link ServiceInstance} so the port can by dynamically set (for instance, when
- * the user wants a dynamic port for spring boot.
- *
- * @author Spencer Gibb
- */
-public class ServiceInstanceRegistration implements ZookeeperRegistration {
-
- public static RegistrationBuilder builder() {
- try {
- return new RegistrationBuilder(ServiceInstance.builder());
- }
- catch (Exception e) {
- throw new RuntimeException("Error creating ServiceInstanceBuilder", e);
- }
- }
-
- public static RegistrationBuilder builder(
- ServiceInstanceBuilder builder) {
- return new RegistrationBuilder(builder);
- }
-
- protected ServiceInstance serviceInstance;
-
- protected ServiceInstanceBuilder builder;
-
- public ServiceInstanceRegistration(
- ServiceInstanceBuilder builder) {
- this.builder = builder;
- }
-
- public ServiceInstance getServiceInstance() {
- if (this.serviceInstance == null) {
- build();
- }
- return this.serviceInstance;
- }
-
- protected void build() {
- this.serviceInstance = this.builder.build();
- }
-
- @Override
- public String getServiceId() {
- if (this.serviceInstance == null) {
- return null;
- }
- return this.serviceInstance.getName();
- }
-
- public int getPort() {
- if (this.serviceInstance == null) {
- return 0;
- }
- return this.serviceInstance.getPort();
- }
-
- public void setPort(int port) {
- this.builder.port(port);
- this.build();
- }
-
- @Override
- public String getHost() {
- if (this.serviceInstance == null) {
- return null;
- }
- return this.serviceInstance.getAddress();
- }
-
- @Override
- public boolean isSecure() {
- if (this.serviceInstance == null) {
- return false;
- }
- return this.serviceInstance.getSslPort() != null;
- }
-
- @Override
- public URI getUri() {
- if (this.serviceInstance == null) {
- return null;
- }
- return URI.create(this.serviceInstance.buildUriSpec());
- }
-
- @Override
- public Map getMetadata() {
- if (this.serviceInstance == null || this.serviceInstance.getPayload() == null) {
- return Collections.emptyMap();
- }
- return this.serviceInstance.getPayload().getMetadata();
- }
-
- /**
- * A builder for ServiceInstanceRegistration.
- */
- public static class RegistrationBuilder {
-
- protected ServiceInstanceBuilder builder;
-
- public RegistrationBuilder(ServiceInstanceBuilder builder) {
- this.builder = builder;
- }
-
- public ServiceInstanceRegistration build() {
- return new ServiceInstanceRegistration(this.builder);
- }
-
- public RegistrationBuilder name(String name) {
- this.builder.name(name);
- return this;
- }
-
- public RegistrationBuilder address(String address) {
- this.builder.address(address);
- return this;
- }
-
- public RegistrationBuilder id(String id) {
- this.builder.id(id);
- return this;
- }
-
- public RegistrationBuilder port(int port) {
- this.builder.port(port);
- return this;
- }
-
- public RegistrationBuilder sslPort(int port) {
- this.builder.sslPort(port);
- return this;
- }
-
- public RegistrationBuilder payload(ZookeeperInstance payload) {
- this.builder.payload(payload);
- return this;
- }
-
- public RegistrationBuilder serviceType(ServiceType serviceType) {
- this.builder.serviceType(serviceType);
- return this;
- }
-
- public RegistrationBuilder registrationTimeUTC(long registrationTimeUTC) {
- this.builder.registrationTimeUTC(registrationTimeUTC);
- return this;
- }
-
- public RegistrationBuilder uriSpec(UriSpec uriSpec) {
- this.builder.uriSpec(uriSpec);
- return this;
- }
-
- public RegistrationBuilder uriSpec(String uriSpec) {
- this.builder.uriSpec(new UriSpec(uriSpec));
- return this;
- }
-
- public RegistrationBuilder defaultUriSpec() {
- this.builder.uriSpec(new UriSpec(DEFAULT_URI_SPEC));
- return this;
- }
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistration.java
deleted file mode 100644
index 33f67ea93..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistration.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-
-/**
- * Zookeeper {@link AbstractAutoServiceRegistration} that uses
- * {@link ZookeeperServiceRegistry} to register and de-register instances.
- *
- * @author Spencer Gibb
- * @since 1.0.0
- */
-public class ZookeeperAutoServiceRegistration
- extends AbstractAutoServiceRegistration {
-
- private static final Log log = LogFactory
- .getLog(ZookeeperAutoServiceRegistration.class);
-
- private ZookeeperRegistration registration;
-
- private ZookeeperDiscoveryProperties properties;
-
- public ZookeeperAutoServiceRegistration(ZookeeperServiceRegistry registry,
- ZookeeperRegistration registration, ZookeeperDiscoveryProperties properties) {
- this(registry, registration, properties, null);
- }
-
- public ZookeeperAutoServiceRegistration(ZookeeperServiceRegistry registry,
- ZookeeperRegistration registration, ZookeeperDiscoveryProperties properties,
- AutoServiceRegistrationProperties arProperties) {
- super(registry, arProperties);
- this.registration = registration;
- this.properties = properties;
- if (this.properties.getInstancePort() != null) {
- this.registration.setPort(this.properties.getInstancePort());
- }
- }
-
- @Override
- protected ZookeeperRegistration getRegistration() {
- return this.registration;
- }
-
- @Override
- protected ZookeeperRegistration getManagementRegistration() {
- return null;
- }
-
- @Override
- protected void register() {
- if (!this.properties.isRegister()) {
- log.debug("Registration disabled.");
- return;
- }
- if (this.registration.getPort() == 0) {
- this.registration.setPort(getPort().get());
- }
- super.register();
- }
-
- @Override
- protected void deregister() {
- if (!this.properties.isRegister()) {
- return;
- }
- super.deregister();
- }
-
- @Override
- protected boolean isEnabled() {
- return this.properties.isEnabled();
- }
-
- @Override
- protected Object getConfiguration() {
- return this.properties;
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java
deleted file mode 100644
index 4723ede9b..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationAutoConfiguration.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.serviceregistry.ServiceInstanceRegistration.RegistrationBuilder;
-import org.springframework.cloud.zookeeper.support.StatusConstants;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(type = "org.springframework.cloud.zookeeper.discovery.ZookeeperLifecycle")
-@ConditionalOnZookeeperDiscoveryEnabled
-@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
-@AutoConfigureAfter({ ZookeeperServiceRegistryAutoConfiguration.class })
-@AutoConfigureBefore({ AutoServiceRegistrationAutoConfiguration.class,
- ZookeeperDiscoveryAutoConfiguration.class })
-public class ZookeeperAutoServiceRegistrationAutoConfiguration {
-
- @Bean
- public ZookeeperAutoServiceRegistration zookeeperAutoServiceRegistration(
- ZookeeperServiceRegistry registry, ZookeeperRegistration registration,
- ZookeeperDiscoveryProperties properties) {
- return new ZookeeperAutoServiceRegistration(registry, registration, properties);
- }
-
- @Bean
- @ConditionalOnMissingBean(ZookeeperRegistration.class)
- public ServiceInstanceRegistration serviceInstanceRegistration(
- ApplicationContext context, ZookeeperDiscoveryProperties properties) {
- String appName = context.getEnvironment().getProperty("spring.application.name",
- "application");
- String host = properties.getInstanceHost();
- if (!StringUtils.hasText(host)) {
- throw new IllegalStateException("instanceHost must not be empty");
- }
-
- properties.getMetadata().put(StatusConstants.INSTANCE_STATUS_KEY, properties.getInitialStatus());
-
- ZookeeperInstance zookeeperInstance = new ZookeeperInstance(context.getId(),
- appName, properties.getMetadata());
- RegistrationBuilder builder = ServiceInstanceRegistration.builder().address(host)
- .name(appName).payload(zookeeperInstance)
- .uriSpec(properties.getUriSpec());
-
- if (properties.getInstanceSslPort() != null) {
- builder.sslPort(properties.getInstanceSslPort());
- }
- if (properties.getInstanceId() != null) {
- builder.id(properties.getInstanceId());
- }
-
- // TODO add customizer?
-
- return builder.build();
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperRegistration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperRegistration.java
deleted file mode 100644
index ee5c06fc5..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperRegistration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import org.apache.curator.x.discovery.ServiceInstance;
-
-import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-
-/**
- * @author Spencer Gibb
- */
-public interface ZookeeperRegistration extends Registration {
-
- ServiceInstance getServiceInstance();
-
- void setPort(int port);
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistry.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistry.java
deleted file mode 100644
index e6cc36200..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistry.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-
-import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import static org.springframework.cloud.zookeeper.support.StatusConstants.INSTANCE_STATUS_KEY;
-import static org.springframework.cloud.zookeeper.support.StatusConstants.STATUS_UP;
-import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
-
-/**
- * @author Spencer Gibb
- */
-public class ZookeeperServiceRegistry implements ServiceRegistry,
- SmartInitializingSingleton, Closeable {
-
- // private AtomicBoolean started = new AtomicBoolean();
-
- protected CuratorFramework curator;
-
- protected ZookeeperDiscoveryProperties properties;
-
- // protected InstanceSerializer instanceSerializer;
- private ServiceDiscovery serviceDiscovery;
-
- public ZookeeperServiceRegistry(
- ServiceDiscovery serviceDiscovery) {
- this.serviceDiscovery = serviceDiscovery;
- }
-
- /**
- * TODO: add when ZookeeperServiceDiscovery is removed One can override this method to
- * provide custom way of registering {@link ServiceDiscovery}
- */
- /*
- * private void configureServiceDiscovery() {
- * this.zookeeperServiceDiscovery.configureServiceDiscovery(this.
- * zookeeperServiceDiscovery.getServiceDiscoveryRef(), this.curator, this.properties,
- * this.instanceSerializer, this.zookeeperServiceDiscovery.getServiceInstanceRef()); }
- */
-
- @Override
- public void register(ZookeeperRegistration registration) {
- try {
- getServiceDiscovery().registerService(registration.getServiceInstance());
- }
- catch (Exception e) {
- rethrowRuntimeException(e);
- }
- }
-
- private ServiceDiscovery getServiceDiscovery() {
- return this.serviceDiscovery;
- }
-
- @Override
- public void deregister(ZookeeperRegistration registration) {
- try {
- getServiceDiscovery().unregisterService(registration.getServiceInstance());
- }
- catch (Exception e) {
- rethrowRuntimeException(e);
- }
- }
-
- @Override
- public void afterSingletonsInstantiated() {
- try {
- getServiceDiscovery().start();
- }
- catch (Exception e) {
- rethrowRuntimeException(e);
- }
- }
-
- @Override
- public void close() {
- try {
- getServiceDiscovery().close();
- }
- catch (IOException e) {
- rethrowRuntimeException(e);
- }
- }
-
- @Override
- public void setStatus(ZookeeperRegistration registration, String status) {
- ServiceInstance serviceInstance = registration
- .getServiceInstance();
- ZookeeperInstance instance = serviceInstance.getPayload();
- instance.getMetadata().put(INSTANCE_STATUS_KEY, status);
- try {
- getServiceDiscovery().updateService(serviceInstance);
- }
- catch (Exception e) {
- ReflectionUtils.rethrowRuntimeException(e);
- }
- }
-
- @Override
- public Object getStatus(ZookeeperRegistration registration) {
- ZookeeperInstance instance = registration.getServiceInstance().getPayload();
- String instanceStatus = instance.getMetadata().get(INSTANCE_STATUS_KEY);
-
- if (!StringUtils.hasText(instanceStatus)) {
- instanceStatus = STATUS_UP;
- }
- return instanceStatus;
- }
-
- @Deprecated
- protected CuratorFramework getCurator() {
- return this.curator;
- }
-
- /*
- * protected AtomicReference>
- * getServiceDiscoveryRef() { return
- * this.zookeeperServiceDiscovery.getServiceDiscoveryRef(); }
- */
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java
deleted file mode 100644
index d07216ca5..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperServiceRegistryAutoConfiguration.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.serviceregistry;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.details.InstanceSerializer;
-import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-
-import org.springframework.beans.BeansException;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnZookeeperDiscoveryEnabled
-@ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true)
-@AutoConfigureBefore(ServiceRegistryAutoConfiguration.class)
-public class ZookeeperServiceRegistryAutoConfiguration
- implements ApplicationContextAware {
-
- private ApplicationContext context;
-
- @Override
- public void setApplicationContext(ApplicationContext context) throws BeansException {
- this.context = context;
- }
-
- @Bean
- @ConditionalOnBean(ServiceDiscovery.class)
- @SuppressWarnings("unchecked")
- public ZookeeperServiceRegistry zookeeperServiceRegistry() {
- return new ZookeeperServiceRegistry(this.context.getBean(ServiceDiscovery.class));
- }
-
- @Bean
- @ConditionalOnMissingBean
- public InstanceSerializer instanceSerializer() {
- return new JsonInstanceSerializer<>(ZookeeperInstance.class);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ZookeeperDiscoveryProperties zookeeperDiscoveryProperties(
- InetUtils inetUtils) {
- return new ZookeeperDiscoveryProperties(inetUtils);
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java
deleted file mode 100644
index c3bd12e30..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/CuratorServiceDiscoveryAutoConfiguration.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.support;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-import org.apache.curator.x.discovery.details.InstanceSerializer;
-import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryAutoConfiguration;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistryAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnZookeeperDiscoveryEnabled
-@AutoConfigureBefore({ ZookeeperDiscoveryAutoConfiguration.class,
- ZookeeperServiceRegistryAutoConfiguration.class })
-public class CuratorServiceDiscoveryAutoConfiguration {
-
- @Bean
- @ConditionalOnMissingBean(ServiceDiscoveryCustomizer.class)
- public DefaultServiceDiscoveryCustomizer defaultServiceDiscoveryCustomizer(
- CuratorFramework curator, ZookeeperDiscoveryProperties properties,
- InstanceSerializer serializer) {
- return new DefaultServiceDiscoveryCustomizer(curator, properties, serializer);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public InstanceSerializer deprecatedInstanceSerializer() {
- return new JsonInstanceSerializer<>(ZookeeperInstance.class);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ServiceDiscovery curatorServiceDiscovery(
- ServiceDiscoveryCustomizer customizer) {
- return customizer
- .customize(ServiceDiscoveryBuilder.builder(ZookeeperInstance.class));
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/DefaultServiceDiscoveryCustomizer.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/DefaultServiceDiscoveryCustomizer.java
deleted file mode 100644
index cbaf3af9e..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/DefaultServiceDiscoveryCustomizer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.support;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-import org.apache.curator.x.discovery.details.InstanceSerializer;
-
-import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-
-/**
- * @author Spencer Gibb
- */
-public class DefaultServiceDiscoveryCustomizer implements ServiceDiscoveryCustomizer {
-
- protected CuratorFramework curator;
-
- protected ZookeeperDiscoveryProperties properties;
-
- protected InstanceSerializer instanceSerializer;
-
- public DefaultServiceDiscoveryCustomizer(CuratorFramework curator,
- ZookeeperDiscoveryProperties properties,
- InstanceSerializer instanceSerializer) {
- this.curator = curator;
- this.properties = properties;
- this.instanceSerializer = instanceSerializer;
- }
-
- @Override
- public ServiceDiscovery customize(
- ServiceDiscoveryBuilder builder) {
- // @formatter:off
- return builder
- .client(this.curator)
- .basePath(this.properties.getRoot())
- .serializer(this.instanceSerializer)
- .build();
- // @formatter:on
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/ServiceDiscoveryCustomizer.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/ServiceDiscoveryCustomizer.java
deleted file mode 100644
index cabe4d70c..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/ServiceDiscoveryCustomizer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.support;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-
-/**
- * @author Spencer Gibb
- */
-public interface ServiceDiscoveryCustomizer {
-
- ServiceDiscovery customize(
- ServiceDiscoveryBuilder builder);
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/StatusConstants.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/StatusConstants.java
deleted file mode 100644
index 5e29a15ec..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/support/StatusConstants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.support;
-
-import org.springframework.cloud.zookeeper.discovery.ZookeeperInstance;
-
-/**
- * @author Spencer Gibb
- */
-public final class StatusConstants {
-
- private StatusConstants() {
- }
-
- /**
- * Key to the
- * {@link ZookeeperInstance#getMetadata()}
- * map.
- */
- public static final String INSTANCE_STATUS_KEY = "instance_status";
-
- /**
- * UP value for {@link StatusConstants#INSTANCE_STATUS_KEY} key.
- */
- public static final String STATUS_UP = "UP";
-
- /**
- * OUT_OF_SERVICE value for {@link StatusConstants#INSTANCE_STATUS_KEY} key.
- */
- public static final String STATUS_OUT_OF_SERVICE = "OUT_OF_SERVICE";
-
-}
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
deleted file mode 100644
index bc1944e85..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,9 +0,0 @@
-# Environment Post Processors
-org.springframework.boot.env.EnvironmentPostProcessor=\
-org.springframework.cloud.zookeeper.discovery.dependency.DependencyEnvironmentPostProcessor
-
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.zookeeper.discovery.configclient.ZookeeperDiscoveryClientConfigServiceBootstrapConfiguration
-
-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/main/resources/META-INF/spring/aot.factories b/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index cd162f1ba..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryHints
\ No newline at end of file
diff --git a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 260956de6..000000000
--- a/spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,11 +0,0 @@
-org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.dependency.DependencyFeignClientAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.dependency.DependencyRestTemplateAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependenciesAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.watcher.DependencyWatcherAutoConfiguration
-org.springframework.cloud.zookeeper.serviceregistry.ZookeeperAutoServiceRegistrationAutoConfiguration
-org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistryAutoConfiguration
-org.springframework.cloud.zookeeper.support.CuratorServiceDiscoveryAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryClientConfiguration
-org.springframework.cloud.zookeeper.discovery.LoadBalancerZookeeperAutoConfiguration
-org.springframework.cloud.zookeeper.discovery.reactive.ZookeeperReactiveDiscoveryClientConfiguration
\ No newline at end of file
diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/TestServiceRegistrar.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/TestServiceRegistrar.java
deleted file mode 100644
index e20866b1b..000000000
--- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/TestServiceRegistrar.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.io.IOException;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.discovery.UriSpec;
-
-public class TestServiceRegistrar {
-
- private final int serverPort;
-
- private final CuratorFramework curatorFramework;
-
- private final ServiceDiscovery serviceDiscovery;
-
- public TestServiceRegistrar(int serverPort, CuratorFramework curatorFramework) {
- this.serverPort = serverPort;
- this.curatorFramework = curatorFramework;
- this.serviceDiscovery = serviceDiscovery();
- }
-
- public void start() {
- try {
- this.serviceDiscovery.start();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public ServiceInstance serviceInstance() {
- try {
- return ServiceInstance.builder()
- .uriSpec(new UriSpec("{scheme}://{address}:{port}/"))
- .address("localhost").port(this.serverPort).name("testInstance")
- .build();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public ServiceDiscovery serviceDiscovery() {
- return ServiceDiscoveryBuilder.builder(Void.class).basePath("/services")
- .client(this.curatorFramework).thisInstance(serviceInstance()).build();
- }
-
- public void stop() {
- try {
- this.serviceDiscovery.close();
- }
- catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java
deleted file mode 100644
index fce391371..000000000
--- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryAutoRegistrationFalseTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient;
-import org.springframework.cloud.zookeeper.discovery.test.CommonTestConfig;
-import org.springframework.cloud.zookeeper.test.ZookeeperTestingServer;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ZookeeperDiscoveryAutoRegistrationFalseTests.Config.class, properties = {
- "spring.application.name=testzkautoregfalse",
- "debug=true" }, webEnvironment = RANDOM_PORT)
-@ContextConfiguration(loader = ZookeeperTestingServer.Loader.class)
-@DirtiesContext
-public class ZookeeperDiscoveryAutoRegistrationFalseTests {
-
- @Autowired
- DiscoveryClient discoveryClient;
-
- @Value("${spring.application.name}")
- String springAppName;
-
- @Test
- public void discovery_client_is_zookeeper() {
- // given: this.discoveryClient
- // expect:
- then(discoveryClient).isInstanceOf(CompositeDiscoveryClient.class);
- CompositeDiscoveryClient composite = (CompositeDiscoveryClient) discoveryClient;
- List discoveryClients = composite.getDiscoveryClients();
- DiscoveryClient first = discoveryClients.get(0);
- then(first).isInstanceOf(ZookeeperDiscoveryClient.class);
- }
-
- @Test
- public void application_should_not_have_been_registered() {
- // given:
- List instances = this.discoveryClient
- .getInstances(springAppName);
- // expect:
- then(instances).isEmpty();
- }
-
- @Configuration
- @EnableAutoConfiguration
- @Import(CommonTestConfig.class)
- @EnableDiscoveryClient(autoRegister = false)
- static class Config {
-
- }
-
-}
diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientTests.java
deleted file mode 100644
index 40f61ad40..000000000
--- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.zookeeper.discovery;
-
-import java.util.List;
-
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.junit.Test;
-
-import org.springframework.cloud.client.ServiceInstance;
-
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Marcin Grzejszczak
- */
-public class ZookeeperDiscoveryClientTests {
-
- @Test
- public void should_return_an_empty_list_of_services_if_service_discovery_is_null() {
- // given:
- ServiceDiscovery serviceDiscovery = mock(
- ServiceDiscovery.class);
- ZookeeperDiscoveryClient zookeeperDiscoveryClient = new ZookeeperDiscoveryClient(
- serviceDiscovery, null, new ZookeeperDiscoveryProperties());
- // when:
- List services = zookeeperDiscoveryClient.getServices();
- // then:
- then(services).isEmpty();
- }
-
- @Test
- public void getServicesShouldReturnEmptyWhenNoNodeException() throws Exception {
- // given:
- ServiceDiscovery serviceDiscovery = mock(
- ServiceDiscovery.class);
- when(serviceDiscovery.queryForNames()).thenThrow(new NoNodeException());
- ZookeeperDiscoveryClient discoveryClient = new ZookeeperDiscoveryClient(
- serviceDiscovery, null, new ZookeeperDiscoveryProperties());
- // when:
- List services = discoveryClient.getServices();
- // then:
- then(services).isEmpty();
- }
-
- @Test
- public void getInstancesshouldReturnEmptyWhenNoNodeException() throws Exception {
- // given:
- ServiceDiscovery