diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f85cb0d91..524a45f9a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,15 +1,5 @@ version: 2 updates: - - package-ecosystem: "github-actions" - directory: "/" - target-branch: "4.1.x" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - target-branch: "4.2.x" - schedule: - interval: "weekly" - package-ecosystem: "github-actions" directory: "/" target-branch: "main" @@ -19,7 +9,7 @@ updates: directory: / schedule: interval: daily - target-branch: 4.1.x + target-branch: 4.3.x ignore: # only upgrade patch versions for maintenance branch - dependency-name: "*" @@ -30,23 +20,13 @@ updates: directory: / schedule: interval: daily - target-branch: 4.2.x + target-branch: main ignore: # only upgrade patch versions for maintenance branch - dependency-name: "*" update-types: - version-update:semver-major - version-update:semver-minor - - package-ecosystem: maven - directory: / - schedule: - interval: daily - target-branch: main - ignore: - # only upgrade by minor or patch - - dependency-name: "*" - update-types: - - version-update:semver-major - package-ecosystem: npm target-branch: docs-build directory: / @@ -58,12 +38,7 @@ updates: schedule: interval: weekly - package-ecosystem: npm - target-branch: 4.1.x - directory: /docs - schedule: - interval: weekly - - package-ecosystem: npm - target-branch: 4.2.x + target-branch: 4.3.x directory: /docs schedule: interval: weekly diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5281c4bf..06ee74428 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,6 +3,7 @@ name: Spring Cloud Consul CI Job on: push: branches: + - main - 4.3.x # Scheduled builds run daily at midnight UTC @@ -15,7 +16,7 @@ on: branches: description: "Which branch should be built (can be a comma-separated list of branches)" required: true - default: '4.3.x' + default: 'main' type: string jobs: diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index dd90e16bc..19839c052 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -16,7 +16,7 @@ jobs: # if: github.repository_owner == 'spring-cloud' steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: ref: docs-build fetch-depth: 1 diff --git a/docs/modules/ROOT/pages/retry.adoc b/docs/modules/ROOT/pages/retry.adoc index 3bd928f35..ddf16dc4b 100644 --- a/docs/modules/ROOT/pages/retry.adoc +++ b/docs/modules/ROOT/pages/retry.adoc @@ -3,7 +3,7 @@ If you expect that the consul agent may occasionally be unavailable when your app starts, you can ask it to keep trying after a failure. You need to add -`spring-retry` and `spring-boot-starter-aop` to your classpath. The default +`spring-retry` and `spring-boot-starter-aspectj` to your classpath. The default behaviour is to retry 6 times with an initial backoff interval of 1000ms and an exponential multiplier of 1.1 for subsequent backoffs. You can configure these properties (and others) using `spring.cloud.consul.retry.*` configuration properties. diff --git a/docs/pom.xml b/docs/pom.xml index 6ad7df237..3d886eb25 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-consul-docs diff --git a/pom.xml b/pom.xml index 209e3ce31..73ebcc552 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -16,20 +16,20 @@ org.springframework.cloud spring-cloud-build - 4.3.4-SNAPSHOT + 5.0.2-SNAPSHOT - 4.3.1 - 4.3.3-SNAPSHOT - 4.3.2 + 5.0.2-SNAPSHOT + 5.0.2-SNAPSHOT + 5.0.2 2.8.3 - 4.3.3-SNAPSHOT - 4.3.3-SNAPSHOT - 1.21.2 - 5.15.0 + 5.0.2-SNAPSHOT + 5.0.2-SNAPSHOT + 1.21.4 + 5.15.0 @@ -123,10 +123,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.15.0 - 1.8 - 1.8 + 17 + 17 @@ -164,6 +164,12 @@ ${spring-cloud-deployer.version} test + + org.springframework.cloud + spring-cloud-deployer-spi + ${spring-cloud-deployer.version} + test + org.springframework.cloud spring-cloud-stream-binder-test @@ -239,7 +245,12 @@ org.mock-server mockserver-client-java - ${mockserverclient.version} + ${mockserver.version} + + + org.mock-server + mockserver-netty + ${mockserver.version} diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index ea50c6fb8..a7f992d10 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. @@ -32,13 +32,13 @@ spring-cloud-stream - com.ecwid.consul - consul-api - true + org.springframework.cloud + spring-cloud-deployer-local + test org.springframework.cloud - spring-cloud-deployer-local + spring-cloud-deployer-spi test diff --git a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducer.java b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducer.java index 1b1f703d5..f03a886bd 100644 --- a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducer.java +++ b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducer.java @@ -23,11 +23,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.OperationException; -import com.ecwid.consul.v1.event.model.Event; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.cloud.consul.model.http.event.Event; import org.springframework.integration.endpoint.MessageProducerSupport; /** @@ -103,11 +102,6 @@ public void getEvents() { .build()); } } - catch (OperationException e) { - if (logger.isErrorEnabled()) { - logger.error("Error getting consul events: " + e); - } - } catch (Exception e) { if (logger.isErrorEnabled()) { logger.error("Error getting consul events: " + e.getMessage()); diff --git a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java index a192b56be..becc4f3d0 100644 --- a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java +++ b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java @@ -18,12 +18,9 @@ import java.util.Arrays; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.event.model.Event; -import com.ecwid.consul.v1.event.model.EventParams; - +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.event.Event; +import org.springframework.http.ResponseEntity; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.messaging.Message; @@ -56,8 +53,7 @@ protected void handleMessageInternal(Message message) { // TODO: support headers // TODO: support consul event filters: NodeFilter, ServiceFilter, TagFilter - Response event = this.consul.eventFire(this.eventName, (String) payload, new EventParams(), - QueryParams.DEFAULT); + ResponseEntity event = this.consul.eventFire(this.eventName, (String) payload); // TODO: return event? } diff --git a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/EventService.java b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/EventService.java index 9f6f95d1c..ebe84e3ab 100644 --- a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/EventService.java +++ b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/EventService.java @@ -19,16 +19,14 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.event.EventListRequest; -import com.ecwid.consul.v1.event.model.Event; -import com.ecwid.consul.v1.event.model.EventParams; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.annotation.PostConstruct; +import tools.jackson.databind.ObjectMapper; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.binder.config.ConsulBinderProperties; +import org.springframework.cloud.consul.model.http.ConsulHeaders; +import org.springframework.cloud.consul.model.http.event.Event; +import org.springframework.http.ResponseEntity; /** * @author Spencer Gibb @@ -62,24 +60,24 @@ public Long getLastIndex() { return this.lastIndex.get(); } - private void setLastIndex(Response response) { - Long consulIndex = response.getConsulIndex(); + private void setLastIndex(ResponseEntity response) { + Long consulIndex = ConsulHeaders.getConsulIndex(response); if (consulIndex != null) { - this.lastIndex.set(response.getConsulIndex()); + this.lastIndex.set(consulIndex); } } public Event fire(String name, String payload) { - Response response = this.consul.eventFire(name, payload, new EventParams(), QueryParams.DEFAULT); - return response.getValue(); + ResponseEntity response = this.consul.eventFire(name, payload); + return response.getBody(); } - public Response> getEventsResponse() { - return this.consul.eventList(EventListRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); + public ResponseEntity> getEventsResponse() { + return this.consul.eventList(); } public List getEvents() { - return getEventsResponse().getValue(); + return getEventsResponse().getBody(); } public List getEvents(Long lastIndex) { @@ -100,14 +98,13 @@ public List watch(Long lastIndex) { if (this.properties != null) { eventTimeout = this.properties.getEventTimeout(); } - Response> watch = this.consul - .eventList(EventListRequest.newBuilder().setQueryParams(new QueryParams(eventTimeout, index)).build()); + ResponseEntity> watch = this.consul.eventList(eventTimeout, index); return filterEvents(readEvents(watch), lastIndex); } - protected List readEvents(Response> response) { + protected List readEvents(ResponseEntity> response) { setLastIndex(response); - return response.getValue(); + return response.getBody(); } /** diff --git a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java index cdea5025c..7f1ec8276 100644 --- a/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java +++ b/spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java @@ -16,14 +16,14 @@ package org.springframework.cloud.consul.binder.config; -import com.ecwid.consul.v1.ConsulClient; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.binder.ConsulBinder; import org.springframework.cloud.consul.binder.EventService; import org.springframework.cloud.stream.binder.Binder; diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java index 88ad4f655..2e767c01a 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java @@ -16,9 +16,12 @@ package org.springframework.cloud.consul.binder; +import java.io.IOException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; import com.github.tomakehurst.wiremock.junit.WireMockRule; import org.junit.Before; import org.junit.Ignore; @@ -29,6 +32,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulProperties; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -112,8 +118,12 @@ interface Events { public static class Application { @Bean - public ConsulClient consulClient() { - return new ConsulClient("localhost", 18500); + public ConsulClient consulClient() + throws CertificateException, KeyStoreException, IOException, NoSuchAlgorithmException { + ConsulProperties consulProperties = new ConsulProperties(); + consulProperties.setHost("localhost"); + consulProperties.setPort(18500); + return ConsulAutoConfiguration.createNewConsulClient(consulProperties); } @Bean diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducerTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducerTests.java index 88303d51d..d4e3e395b 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducerTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulInboundMessageProducerTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.consul.binder; -import com.ecwid.consul.v1.OperationException; import org.junit.Test; import static org.assertj.core.api.Assertions.fail; @@ -31,7 +30,7 @@ public class ConsulInboundMessageProducerTests { @Test public void getEventsShouldNotThrowException() { EventService eventService = mock(EventService.class); - when(eventService.watch()).thenThrow(new OperationException(500, "error", "")); + when(eventService.watch()).thenThrow(new RuntimeException("error")); ConsulInboundMessageProducer producer = new ConsulInboundMessageProducer(eventService); diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index cd160ad9d..1bd35e4ae 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. @@ -36,11 +36,6 @@ spring-boot-starter-actuator true - - com.ecwid.consul - consul-api - true - org.springframework.cloud spring-cloud-consul-core @@ -69,7 +64,7 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj test @@ -82,6 +77,11 @@ junit-vintage-engine test + + com.ecwid.consul + consul-api + test + org.testcontainers consul diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java index a340543ec..68821e23e 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java @@ -16,25 +16,27 @@ package org.springframework.cloud.consul.config; +import java.time.Duration; import java.util.LinkedHashMap; import java.util.List; import java.util.Objects; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicBoolean; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.kv.model.GetValue; import io.micrometer.core.annotation.Timed; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.ConsulHeaders; +import org.springframework.cloud.consul.model.http.kv.GetValue; import org.springframework.cloud.endpoint.event.RefreshEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.SmartLifecycle; import org.springframework.core.style.ToStringCreator; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.ObjectUtils; @@ -93,7 +95,7 @@ public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { public void start() { if (this.running.compareAndSet(false, true)) { this.watchFuture = this.taskScheduler.scheduleWithFixedDelay(this::watchConfigKeyValues, - this.properties.getWatch().getDelay()); + Duration.ofMillis(this.properties.getWatch().getDelay())); } } @@ -154,13 +156,14 @@ public void watchConfigKeyValues() { aclToken = null; } - Response> response = this.consul.getKVValues(context, aclToken, - new QueryParams(this.properties.getWatch().getWaitTime(), currentIndex)); + ResponseEntity> response = this.consul.getKVValues(context, aclToken, + (long) properties.getWatch().getWaitTime(), currentIndex); // if response.value == null, response was a 404, otherwise it was a // 200, reducing churn if there wasn't anything - if (response.getValue() != null && !response.getValue().isEmpty()) { - Long newIndex = response.getConsulIndex(); + if (HttpStatus.OK.isSameCodeAs(response.getStatusCode()) && response.hasBody() + && !response.getBody().isEmpty()) { + Long newIndex = ConsulHeaders.getConsulIndex(response); if (newIndex != null && !newIndex.equals(currentIndex)) { // don't publish the same index again, don't publish the first diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulBootstrapper.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulBootstrapper.java index 12ccf515a..7e9be2c95 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulBootstrapper.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulBootstrapper.java @@ -19,14 +19,13 @@ import java.util.function.BiFunction; import java.util.function.Function; -import com.ecwid.consul.v1.ConsulClient; - -import org.springframework.boot.BootstrapContext; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataLoaderContext; import org.springframework.boot.context.properties.bind.Binder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.util.Assert; diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java index df3a4254b..3122b2a72 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java @@ -16,14 +16,13 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; 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.consul.ConditionalOnConsulEnabled; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.endpoint.RefreshEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java index a58a3b148..5b009abbc 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java @@ -16,14 +16,12 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.v1.ConsulClient; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -44,9 +42,12 @@ public class ConsulConfigBootstrapConfiguration { @ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true) protected static class ConsulPropertySourceConfiguration { - @Autowired private ConsulClient consul; + public ConsulPropertySourceConfiguration(ConsulClient consul) { + this.consul = consul; + } + @Bean @ConditionalOnMissingBean public ConsulConfigProperties consulConfigProperties(Environment env) { diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java index 86d32996d..a38c15227 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLoader.java @@ -21,7 +21,6 @@ import java.util.EnumSet; import java.util.List; -import com.ecwid.consul.v1.ConsulClient; import org.apache.commons.logging.Log; import org.springframework.boot.context.config.ConfigData; @@ -32,6 +31,7 @@ import org.springframework.boot.context.config.ConfigDataResourceNotFoundException; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.logging.DeferredLogFactory; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.config.ConsulBootstrapper.LoadContext; import org.springframework.cloud.consul.config.ConsulBootstrapper.LoaderInterceptor; import org.springframework.util.StringUtils; diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java index 94bbfdd8f..15dc741f3 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolver.java @@ -23,12 +23,11 @@ import java.util.List; import java.util.stream.Collectors; -import com.ecwid.consul.v1.ConsulClient; import org.apache.commons.logging.Log; -import org.springframework.boot.BootstrapContext; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; -import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.context.config.ConfigDataLocation; import org.springframework.boot.context.config.ConfigDataLocationNotFoundException; import org.springframework.boot.context.config.ConfigDataLocationResolver; @@ -39,10 +38,10 @@ import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.cloud.consul.config.ConsulPropertySources.Context; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.lang.Nullable; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.util.UriComponents; @@ -143,7 +142,6 @@ protected List getSuffixes(ConsulConfigProperties properties) { return DIR_SUFFIXES; } - @Nullable protected UriComponents parseLocation(ConfigDataLocationResolverContext context, ConfigDataLocation location) { String originalLocation = location.getNonPrefixedValue(PREFIX); if (!StringUtils.hasText(originalLocation)) { @@ -185,8 +183,12 @@ protected void registerBean(ConfigDataLocationResolverContext context, Class protected ConsulClient createConsulClient(BootstrapContext context) { ConsulProperties properties = context.get(ConsulProperties.class); - return ConsulAutoConfiguration.createConsulClient(properties, - ConsulAutoConfiguration.createConsulRawClientBuilder()); + try { + return ConsulAutoConfiguration.createNewConsulClient(properties); + } + catch (Exception e) { + throw new RuntimeException(e); + } } protected ConsulProperties loadProperties(ConfigDataLocationResolverContext resolverContext, diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulFilesPropertySource.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulFilesPropertySource.java index 7fb5cd2d8..15fc10f11 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulFilesPropertySource.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulFilesPropertySource.java @@ -16,8 +16,8 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.kv.model.GetValue; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.kv.GetValue; import static org.springframework.cloud.consul.config.ConsulConfigProperties.Format.PROPERTIES; import static org.springframework.cloud.consul.config.ConsulConfigProperties.Format.YAML; diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java index 4c564decd..ddf15f30b 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java @@ -26,14 +26,13 @@ import java.util.Properties; import java.util.Set; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.kv.model.GetValue; - import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.ConsulHeaders; +import org.springframework.cloud.consul.model.http.kv.GetValue; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.io.ByteArrayResource; +import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; import static org.springframework.cloud.consul.config.ConsulConfigProperties.Format.PROPERTIES; @@ -66,13 +65,16 @@ public void init() { if (this.context.startsWith("/")) { this.context = this.context.substring(1); } + if (this.context.contains("//")) { + this.context = this.context.replace("//", "/"); + } - Response> response = this.source.getKVValues(this.context, this.configProperties.getAclToken(), - QueryParams.DEFAULT); + ResponseEntity> response = this.source.getKVValues(this.context, + this.configProperties.getAclToken()); - this.initialIndex = response.getConsulIndex(); + this.initialIndex = ConsulHeaders.getConsulIndex(response); - final List values = response.getValue(); + final List values = response.getBody(); ConsulConfigProperties.Format format = this.configProperties.getFormat(); switch (format) { case KEY_VALUE: diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java index 93be8a75f..0592ebe46 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocator.java @@ -22,11 +22,11 @@ import java.util.LinkedHashMap; import java.util.List; -import com.ecwid.consul.v1.ConsulClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.bootstrap.config.PropertySourceLocator; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.core.annotation.Order; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySources.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySources.java index 0b46b62ba..17e9f375d 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySources.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySources.java @@ -23,12 +23,14 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.kv.model.GetValue; import org.apache.commons.logging.Log; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulException; +import org.springframework.cloud.consul.model.http.ConsulHeaders; +import org.springframework.cloud.consul.model.http.kv.GetValue; import org.springframework.core.style.ToStringCreator; +import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; import static org.springframework.cloud.consul.config.ConsulConfigProperties.Format.FILES; @@ -124,12 +126,29 @@ public ConsulPropertySource createPropertySource(String propertySourceContext, C ConsulPropertySource propertySource = null; if (properties.getFormat() == FILES) { - Response response = consul.getKVValue(propertySourceContext, properties.getAclToken()); - indexConsumer.accept(propertySourceContext, response.getConsulIndex()); - if (response.getValue() != null) { + ResponseEntity> response = consul.getKVValue(propertySourceContext, + properties.getAclToken()); + + GetValue value = null; + if (response.getStatusCode().is2xxSuccessful()) { + List values = response.getBody(); + if (values.size() == 0) { + value = new GetValue(); + } + else if (values.size() == 1) { + value = values.get(0); + } + else { + throw new ConsulException("Strange response (list size=" + values.size() + ")"); + } + } + + Long consulIndex = ConsulHeaders.getConsulIndex(response); + indexConsumer.accept(propertySourceContext, consulIndex); + if (response.hasBody()) { ConsulFilesPropertySource filesPropertySource = new ConsulFilesPropertySource(propertySourceContext, consul, properties); - filesPropertySource.init(response.getValue()); + filesPropertySource.init(value); propertySource = filesPropertySource; } } diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulRetryBootstrapper.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulRetryBootstrapper.java index 16a78efe6..b615e49ef 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulRetryBootstrapper.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulRetryBootstrapper.java @@ -16,8 +16,8 @@ package org.springframework.cloud.consul.config; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.consul.RetryProperties; import org.springframework.cloud.consul.config.ConsulBootstrapper.LoaderInterceptor; diff --git a/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories index d9dd0d088..6b7f22480 100644 --- a/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories @@ -3,7 +3,7 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.consul.config.ConsulConfigBootstrapConfiguration # Environment PostProcessor -org.springframework.boot.env.EnvironmentPostProcessor=\ +org.springframework.boot.EnvironmentPostProcessor=\ org.springframework.cloud.consul.config.ConsulConfigDataMissingEnvironmentPostProcessor org.springframework.boot.diagnostics.FailureAnalyzer=\ @@ -18,5 +18,5 @@ org.springframework.boot.context.config.ConfigDataLoader=\ org.springframework.cloud.consul.config.ConsulConfigDataLoader # Spring Boot Bootstrappers -org.springframework.boot.BootstrapRegistryInitializer=\ +org.springframework.boot.bootstrap.BootstrapRegistryInitializer=\ org.springframework.cloud.consul.config.ConsulRetryBootstrapper diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java index 54b56f799..60d16ec92 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java @@ -21,18 +21,22 @@ import java.util.LinkedHashMap; import java.util.List; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.kv.model.GetValue; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.ConsulHeaders; +import org.springframework.cloud.consul.model.http.kv.GetValue; import org.springframework.cloud.endpoint.event.RefreshEvent; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.ResponseEntity.BodyBuilder; import org.springframework.util.StringUtils; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; @@ -102,12 +106,21 @@ private void setupWatch(ApplicationEventPublisher eventPublisher, GetValue getVa ConsulClient consul = mock(ConsulClient.class); List getValues = null; + BodyBuilder response; if (getValue != null) { getValues = Arrays.asList(getValue); + response = ResponseEntity.status(HttpStatus.OK); + } + else { + response = ResponseEntity.status(HttpStatus.NOT_FOUND); } - Response> response = new Response<>(getValues, 1L, false, 1L); - when(consul.getKVValues(eq(context), nullable(String.class), any(QueryParams.class))).thenReturn(response); + HttpHeaders headers = new HttpHeaders(); + headers.add(ConsulHeaders.INDEX_HEADER, "1"); + headers.add(ConsulHeaders.LAST_CONTACT_HEADER, "1"); + response.headers(headers); + when(consul.getKVValues(eq(context), nullable(String.class), anyLong(), anyLong())) + .thenReturn(response.body(getValues)); if (StringUtils.hasText(aclToken)) { this.configProperties.setAclToken(aclToken); @@ -132,10 +145,10 @@ public void firstCallDoesNotPublishEvent() { ConsulClient consul = mock(ConsulClient.class); List getValues = Collections.singletonList(getValue); - Response> response = new Response<>(getValues, 1L, false, 1L); - when(consul.getKVValues(eq(context), anyString(), any(QueryParams.class))).thenReturn(response); + ResponseEntity> response = ResponseEntity.ok(getValues); + when(consul.getKVValues(eq(context), anyString(), anyLong(), anyLong())).thenReturn(response); - ConfigWatch watch = new ConfigWatch(this.configProperties, consul, new LinkedHashMap()); + ConfigWatch watch = new ConfigWatch(this.configProperties, consul, new LinkedHashMap<>()); watch.setApplicationEventPublisher(eventPublisher); watch.watchConfigKeyValues(); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfigurationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfigurationTests.java index 2a61deda0..a35e2eb19 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfigurationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfigurationTests.java @@ -66,7 +66,7 @@ public void testConfigPropsBeanKicksIn() { /** * Test config that simulates a "user provided bean". */ - private static class TestConfig { + private static final class TestConfig { @Bean public ConsulConfigProperties consulConfigProperties() { diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataCustomizationIntegrationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataCustomizationIntegrationTests.java index 6ef9a1289..bcd58654f 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataCustomizationIntegrationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataCustomizationIntegrationTests.java @@ -18,22 +18,22 @@ import java.util.UUID; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.context.config.ConfigData; 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.consul.ConsulProperties; +import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -67,7 +67,8 @@ public static void setup() { application.setWebApplicationType(WebApplicationType.NONE); bindHandlerBootstrapper = new BindHandlerBootstrapper(); application.addBootstrapRegistryInitializer(bindHandlerBootstrapper); - application.addBootstrapRegistryInitializer(ConsulBootstrapper.fromConsulProperties(TestConsulClient::new)); + application.addBootstrapRegistryInitializer( + ConsulBootstrapper.fromConsulProperties(ConsulAutoConfiguration::createNewConsulClient)); application.addBootstrapRegistryInitializer( registry -> registry.register(ConsulBootstrapper.LoaderInterceptor.class, context1 -> loadContext -> { ConfigData configData = loadContext.getInvocation() @@ -102,20 +103,12 @@ public static void teardown() { } @Test - public void consulClientIsCustom() { + void consulClientIsCustom() { ConsulClient client = context.getBean(ConsulClient.class); - assertThat(client).isInstanceOf(TestConsulClient.class); + assertThat(client).isInstanceOf(ConsulClient.class); assertThat(bindHandlerBootstrapper.onSuccessCount).isGreaterThan(0); } - static class TestConsulClient extends ConsulClient { - - TestConsulClient(ConsulProperties properties) { - super(properties.getHost(), properties.getPort()); - } - - } - @Configuration @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataFileIntegrationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataFileIntegrationTests.java index c670d9f54..c34022f47 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataFileIntegrationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataFileIntegrationTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,6 +27,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.context.ApplicationListener; @@ -75,35 +75,33 @@ public class ConsulConfigDataFileIntegrationTests { private static ConfigurableEnvironment environment; - private static ConsulClient client; + private static ConsulClient testClient; @BeforeAll public static void setup() { ConsulTestcontainers.start(); - client = ConsulTestcontainers.client(); - client.deleteKVValues(PREFIX); - client.setKVValue(KEY1, TEST_PROP + "=" + VALUE1 + "\n" + TEST_PROP2 + "=" + VALUE2); + testClient = ConsulTestcontainers.client(); + testClient.deleteKVValues(PREFIX); + testClient.setKVValue(KEY1, TEST_PROP + "=" + VALUE1 + "\n" + TEST_PROP2 + "=" + VALUE2); context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=" + APP_NAME, "--spring.cloud.consul.config.format=files", "--spring.config.import=optional:consul:" + ConsulTestcontainers.getHost() + ":" + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.prefix=" + ROOT, "--spring.cloud.consul.config.watch.delay=10"); - - client = context.getBean(ConsulClient.class); environment = context.getEnvironment(); } @AfterAll public static void teardown() { - client.deleteKVValues(PREFIX); + testClient.deleteKVValues(PREFIX); if (context != null) { context.close(); } } @Test - public void propertyLoaded() { + void propertyLoaded() { String testProp = environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as(TEST_PROP + " was wrong").isEqualTo(VALUE1); String testProp2 = environment.getProperty(TEST_PROP2_CANONICAL); @@ -111,11 +109,11 @@ public void propertyLoaded() { } @Test - public void propertyLoadedAndUpdated() throws Exception { + void propertyLoadedAndUpdated() throws Exception { String testProp = environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as("testProp was wrong").isEqualTo(VALUE1); - client.setKVValue(KEY1, TEST_PROP + "=testPropValUpdate\n" + TEST_PROP2 + "=" + VALUE2); + testClient.setKVValue(KEY1, TEST_PROP + "=testPropValUpdate\n" + TEST_PROP2 + "=" + VALUE2); CountDownLatch latch = context.getBean("countDownLatch1", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); @@ -126,11 +124,11 @@ public void propertyLoadedAndUpdated() throws Exception { } @Test - public void contextDoesNotExistThenExists() throws Exception { + void contextDoesNotExistThenExists() throws Exception { String testProp = environment.getProperty(TEST_PROP3_CANONICAL); assertThat(testProp).as(TEST_PROP3 + " was wrong").isNull(); - client.setKVValue(KEY3, TEST_PROP3 + "=testPropValInsert"); + testClient.setKVValue(KEY3, TEST_PROP3 + "=testPropValInsert"); CountDownLatch latch = context.getBean("countDownLatch2", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataIntegrationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataIntegrationTests.java index 3d81f9635..6216b8968 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataIntegrationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataIntegrationTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,6 +27,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.context.ApplicationListener; @@ -81,16 +81,16 @@ public class ConsulConfigDataIntegrationTests { private static ConfigurableEnvironment environment; - private static ConsulClient client; + private static ConsulClient testClient; @BeforeAll public static void setup() { ConsulTestcontainers.start(); - client = ConsulTestcontainers.client(); - client.deleteKVValues(PREFIX); - client.setKVValue(KEY1, VALUE1); - client.setKVValue(KEY2, VALUE2_DEFAULT); - client.setKVValue(KEY2_APP_NAME, VALUE2); + testClient = ConsulTestcontainers.client(); + testClient.deleteKVValues(PREFIX); + testClient.setKVValue(KEY1, VALUE1); + testClient.setKVValue(KEY2, VALUE2_DEFAULT); + testClient.setKVValue(KEY2_APP_NAME, VALUE2); context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE) .run("--logging.level.org.springframework.cloud.consul.config.ConfigWatch=TRACE", @@ -99,31 +99,29 @@ public static void setup() { + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.prefix=" + ROOT, "--spring.cloud.consul.config.watch.delay=10", "--spring.cloud.consul.config.watch.wait-time=1"); - - client = context.getBean(ConsulClient.class); environment = context.getEnvironment(); } @AfterAll public static void teardown() { - client.deleteKVValues(PREFIX); + testClient.deleteKVValues(PREFIX); if (context != null) { context.close(); } } @Test - public void propertyLoaded() { + void propertyLoaded() { String testProp2 = environment.getProperty(TEST_PROP2_CANONICAL); assertThat(testProp2).as(TEST_PROP2 + " was wrong").isEqualTo(VALUE2); } @Test - public void propertyLoadedAndUpdated() throws Exception { + void propertyLoadedAndUpdated() throws Exception { String testProp = environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as("testProp was wrong").isEqualTo(VALUE1); - client.setKVValue(KEY1, "testPropValUpdate"); + testClient.setKVValue(KEY1, "testPropValUpdate"); CountDownLatch latch = context.getBean("countDownLatch1", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); @@ -134,11 +132,11 @@ public void propertyLoadedAndUpdated() throws Exception { } @Test - public void contextDoesNotExistThenExists() throws Exception { + void contextDoesNotExistThenExists() throws Exception { String testProp = environment.getProperty(TEST_PROP3_CANONICAL); assertThat(testProp).as("testProp was wrong").isNull(); - client.setKVValue(KEY3, "testPropValInsert"); + testClient.setKVValue(KEY3, "testPropValInsert"); CountDownLatch latch = context.getBean("countDownLatch2", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java index e5ab26ba5..3270b3295 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataLocationResolverTests.java @@ -25,8 +25,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; -import org.springframework.boot.DefaultBootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.DefaultBootstrapContext; import org.springframework.boot.context.config.ConfigDataLocation; import org.springframework.boot.context.config.ConfigDataLocationResolverContext; import org.springframework.boot.context.config.Profiles; diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataMultiplePrefixesIntegrationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataMultiplePrefixesIntegrationTests.java index 04386cba0..7243866f4 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataMultiplePrefixesIntegrationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataMultiplePrefixesIntegrationTests.java @@ -18,7 +18,6 @@ import java.util.UUID; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -26,6 +25,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -88,8 +88,6 @@ public static void setup() { + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.prefixes=" + ROOT + "," + ROOT2, "--spring.cloud.consul.config.watch.delay=10", "--spring.cloud.consul.config.watch.wait-time=1"); - - client = context.getBean(ConsulClient.class); environment = context.getEnvironment(); } @@ -103,7 +101,7 @@ public static void teardown() { } @Test - public void propertyLoaded() { + void propertyLoaded() { String testProp = environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as(TEST_PROP + " was wrong").isEqualTo(VALUE1); String testProp2 = environment.getProperty(TEST_PROP2_CANONICAL); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataNoImportIntegrationTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataNoImportIntegrationTests.java index 6ede3a328..500dbeb5c 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataNoImportIntegrationTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigDataNoImportIntegrationTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.v1.ConsulClient; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -29,6 +28,7 @@ import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.cloud.commons.ConfigDataMissingEnvironmentPostProcessor; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertyPrefixTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertyPrefixTests.java index 59b8a2543..094ee4c2b 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertyPrefixTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertyPrefixTests.java @@ -16,36 +16,41 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.v1.ConsulClient; +import java.io.IOException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; + import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import static org.assertj.core.api.Assertions.assertThat; public class ConsulPropertyPrefixTests { - private ConsulClient client; + private ConsulClient consulClient; @Before - public void setup() { + public void setup() throws CertificateException, KeyStoreException, IOException, NoSuchAlgorithmException { ConsulTestcontainers.start(); - this.client = ConsulTestcontainers.client(); + this.consulClient = ConsulTestcontainers.client(); } @After public void teardown() { - this.client.deleteKVValues(""); + this.consulClient.deleteKVValues(""); } @Test public void testEmptyPrefix() { // because prefix is empty, a leading forward slash is omitted String kvContext = "appname"; - this.client.setKVValue(kvContext + "/fooprop", "fookvval"); - this.client.setKVValue(kvContext + "/bar/prop", "8080"); + this.consulClient.setKVValue(kvContext + "/fooprop", "fookvval"); + this.consulClient.setKVValue(kvContext + "/bar/prop", "8080"); ConsulPropertySource source = getConsulPropertySource(new ConsulConfigProperties(), kvContext); assertProperties(source, "fookvval", "8080"); @@ -58,7 +63,7 @@ private void assertProperties(ConsulPropertySource source, Object fooval, Object @SuppressWarnings("Duplicates") private ConsulPropertySource getConsulPropertySource(ConsulConfigProperties configProperties, String context) { - ConsulPropertySource source = new ConsulPropertySource(context, this.client, configProperties); + ConsulPropertySource source = new ConsulPropertySource(context, this.consulClient, configProperties); source.init(); String[] names = source.getPropertyNames(); assertThat(names).as("names was null").isNotNull(); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java index 3bf74fed5..9f35dec33 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java @@ -18,7 +18,6 @@ import java.util.UUID; -import com.ecwid.consul.v1.ConsulClient; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -26,6 +25,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -62,15 +62,15 @@ public class ConsulPropertySourceLocatorAppNameCustomizedTests { private ConfigurableEnvironment environment; - private ConsulClient client; + private ConsulClient testClient; @Before public void setup() { ConsulTestcontainers.start(); - this.client = ConsulTestcontainers.client(); - this.client.deleteKVValues(PREFIX); - this.client.setKVValue(KEY1, VALUE1); - this.client.setKVValue(KEY2, VALUE2); + this.testClient = ConsulTestcontainers.client(); + this.testClient.deleteKVValues(PREFIX); + this.testClient.setKVValue(KEY1, VALUE1); + this.testClient.setKVValue(KEY2, VALUE2); this.context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=testConsulPropertySourceLocatorAppNameCustomized", @@ -78,14 +78,12 @@ public void setup() { "--spring.cloud.consul.host=" + ConsulTestcontainers.getHost(), "--spring.cloud.consul.port=" + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.name=" + CONFIG_NAME, "--spring.cloud.consul.config.prefix=" + ROOT); - - this.client = this.context.getBean(ConsulClient.class); this.environment = this.context.getEnvironment(); } @After public void teardown() { - this.client.deleteKVValues(PREFIX); + this.testClient.deleteKVValues(PREFIX); if (context != null) { this.context.close(); } diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java index 3666386d8..c30f055df 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java @@ -18,7 +18,6 @@ import java.util.UUID; -import com.ecwid.consul.v1.ConsulClient; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -26,6 +25,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -59,17 +59,17 @@ public class ConsulPropertySourceLocatorFilesTests { private ConfigurableEnvironment environment; - private ConsulClient client; + private ConsulClient testClient; @Before public void setup() { ConsulTestcontainers.start(); - this.client = ConsulTestcontainers.client(); - this.client.setKVValue(ROOT + APPLICATION_YML, "foo: bar\nmy.baz: ${foo}"); - this.client.setKVValue(ROOT + APPLICATION_DEV_YML, "foo: bar-dev\nmy.baz: ${foo}"); - this.client.setKVValue(ROOT + "/master.ref", UUID.randomUUID().toString()); - this.client.setKVValue(ROOT + APP_NAME_PROPS, "foo: bar-app\nmy.baz: ${foo}"); - this.client.setKVValue(ROOT + APP_NAME_DEV_PROPS, "foo: bar-app-dev\nmy.baz: ${foo}"); + this.testClient = ConsulTestcontainers.client(); + this.testClient.setKVValue(ROOT + APPLICATION_YML, "foo: bar\nmy.baz: ${foo}"); + this.testClient.setKVValue(ROOT + APPLICATION_DEV_YML, "foo: bar-dev\nmy.baz: ${foo}"); + this.testClient.setKVValue(ROOT + "/master.ref", UUID.randomUUID().toString()); + this.testClient.setKVValue(ROOT + APP_NAME_PROPS, "foo: bar-app\nmy.baz: ${foo}"); + this.testClient.setKVValue(ROOT + APP_NAME_DEV_PROPS, "foo: bar-app-dev\nmy.baz: ${foo}"); this.context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=" + APP_NAME, "--spring.config.use-legacy-processing=true", @@ -77,14 +77,12 @@ public void setup() { "--spring.cloud.consul.port=" + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.prefix=" + ROOT, "--spring.cloud.consul.config.format=FILES", "--spring.profiles.active=dev", "spring.cloud.consul.config.watch.delay=1"); - - this.client = this.context.getBean(ConsulClient.class); this.environment = this.context.getEnvironment(); } @After public void teardown() { - this.client.deleteKVValues(PREFIX); + this.testClient.deleteKVValues(PREFIX); if (this.context != null) { this.context.close(); } diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java index c81947e78..109394518 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorRetryTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.consul.config; -import com.ecwid.consul.transport.TransportException; import org.junit.Rule; import org.junit.Test; @@ -24,6 +23,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.ResourceAccessException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -49,7 +49,7 @@ public void testRetry() { "spring.cloud.consul.config.failFast=true") .run(); fail("Did not throw expected exception"); - }).hasCauseInstanceOf(TransportException.class); + }).hasCauseInstanceOf(ResourceAccessException.class); assertThat(output).contains("RetryContext retrieved"); } diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java index 16fcbb370..4e3cdc4d9 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -28,6 +27,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.context.ApplicationListener; @@ -77,29 +77,27 @@ public class ConsulPropertySourceLocatorTests { private static ConfigurableEnvironment environment; - private static ConsulClient client; + private static ConsulClient testClient; @BeforeAll public static void setup() { ConsulTestcontainers.start(); - client = ConsulTestcontainers.client(); - client.deleteKVValues(PREFIX); - client.setKVValue(KEY1, VALUE1); - client.setKVValue(KEY2, VALUE2); + testClient = ConsulTestcontainers.client(); + testClient.deleteKVValues(PREFIX); + testClient.setKVValue(KEY1, VALUE1); + testClient.setKVValue(KEY2, VALUE2); context = new SpringApplicationBuilder(Config.class).web(WebApplicationType.NONE) .run("--spring.application.name=" + APP_NAME, "--spring.config.use-legacy-processing=true", "--spring.cloud.consul.host=" + ConsulTestcontainers.getHost(), "--spring.cloud.consul.port=" + ConsulTestcontainers.getPort(), "--spring.cloud.consul.config.prefixes=" + ROOT, "--spring.cloud.consul.config.watch.delay=10"); - - client = context.getBean(ConsulClient.class); environment = context.getEnvironment(); } @AfterAll public static void teardown() { - client.deleteKVValues(PREFIX); + testClient.deleteKVValues(PREFIX); if (context != null) { context.close(); } @@ -116,7 +114,7 @@ public void propertyLoadedAndUpdated() throws Exception { String testProp = environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as("testProp was wrong").isEqualTo(VALUE1); - client.setKVValue(KEY1, "testPropValUpdate"); + testClient.setKVValue(KEY1, "testPropValUpdate"); CountDownLatch latch = context.getBean("countDownLatch1", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); @@ -131,7 +129,7 @@ public void contextDoesNotExistThenExists() throws Exception { String testProp = environment.getProperty(TEST_PROP3_CANONICAL); assertThat(testProp).as("testProp was wrong").isNull(); - client.setKVValue(KEY3, "testPropValInsert"); + testClient.setKVValue(KEY3, "testPropValInsert"); CountDownLatch latch = context.getBean("countDownLatch2", CountDownLatch.class); boolean receivedEvent = latch.await(15, TimeUnit.SECONDS); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java index 2097e2a28..029363fa0 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java @@ -16,14 +16,20 @@ package org.springframework.cloud.consul.config; +import java.io.IOException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.Random; -import com.ecwid.consul.v1.ConsulClient; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import static org.assertj.core.api.Assertions.assertThat; @@ -32,7 +38,7 @@ */ public class ConsulPropertySourceTests { - private ConsulClient client; + private ConsulClient consulClient; private String prefix; @@ -41,23 +47,30 @@ public class ConsulPropertySourceTests { private String propertiesContext; @Before - public void setup() { + public void setup() throws CertificateException, KeyStoreException, IOException, NoSuchAlgorithmException { ConsulTestcontainers.start(); - this.prefix = "/consulPropertySourceTests" + new Random().nextInt(Integer.MAX_VALUE); - this.client = ConsulTestcontainers.client(); + this.prefix = "consulPropertySourceTests" + new Random().nextInt(Integer.MAX_VALUE); + this.consulClient = ConsulTestcontainers.client(); } @After public void teardown() { - this.client.deleteKVValues(this.prefix); + this.consulClient.deleteKVValues(this.prefix); } @Test public void testKv() { // key value properties this.kvContext = this.prefix + "/kv"; - this.client.setKVValue(this.kvContext + "/fooprop", "fookvval"); - this.client.setKVValue(this.prefix + "/kv" + "/bar/prop", "8080"); + ResponseEntity fookvval = this.consulClient.setKVValue(this.kvContext + "/fooprop", "fookvval"); + assertThat(fookvval).isNotNull(); + assertThat(fookvval.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(fookvval.getBody()).isTrue(); + ResponseEntity listResponseEntity = this.consulClient.setKVValue(this.prefix + "/kv" + "/bar/prop", + "8080"); + assertThat(listResponseEntity).isNotNull(); + assertThat(listResponseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(listResponseEntity.getBody()).isTrue(); ConsulPropertySource source = getConsulPropertySource(new ConsulConfigProperties(), this.kvContext); @@ -73,7 +86,7 @@ private void assertProperties(ConsulPropertySource source, Object fooval, Object public void testProperties() { // properties file property this.propertiesContext = this.prefix + "/properties"; - this.client.setKVValue(this.propertiesContext + "/data", "fooprop=foopropval\nbar.prop=8080"); + this.consulClient.setKVValue(this.propertiesContext + "/data", "fooprop=foopropval\nbar.prop=8080"); ConsulConfigProperties configProperties = new ConsulConfigProperties(); configProperties.setFormat(ConsulConfigProperties.Format.PROPERTIES); @@ -86,7 +99,7 @@ public void testProperties() { public void testYaml() { // yaml file property String yamlContext = this.prefix + "/yaml"; - this.client.setKVValue(yamlContext + "/data", "fooprop: fooymlval\nbar:\n prop: 8080"); + this.consulClient.setKVValue(yamlContext + "/data", "fooprop: fooymlval\nbar:\n prop: 8080"); ConsulConfigProperties configProperties = new ConsulConfigProperties(); configProperties.setFormat(ConsulConfigProperties.Format.YAML); @@ -99,17 +112,17 @@ public void testYaml() { public void testEmptyYaml() { // yaml file property String yamlContext = this.prefix + "/yaml"; - this.client.setKVValue(yamlContext + "/data", ""); + this.consulClient.setKVValue(yamlContext + "/data", ""); ConsulConfigProperties configProperties = new ConsulConfigProperties(); configProperties.setFormat(ConsulConfigProperties.Format.YAML); - ConsulPropertySource source = new ConsulPropertySource(yamlContext, this.client, configProperties); + ConsulPropertySource source = new ConsulPropertySource(yamlContext, this.consulClient, configProperties); // Should NOT throw a NPE source.init(); } private ConsulPropertySource getConsulPropertySource(ConsulConfigProperties configProperties, String context) { - ConsulPropertySource source = new ConsulPropertySource(context, this.client, configProperties); + ConsulPropertySource source = new ConsulPropertySource(context, this.consulClient, configProperties); source.init(); String[] names = source.getPropertyNames(); assertThat(names).as("names was null").isNotNull(); @@ -119,7 +132,7 @@ private ConsulPropertySource getConsulPropertySource(ConsulConfigProperties conf @Test public void testExtraSlashInContext() { - ConsulPropertySource source = new ConsulPropertySource("/my/very/custom/context", this.client, + ConsulPropertySource source = new ConsulPropertySource("/my/very/custom/context", this.consulClient, new ConsulConfigProperties()); source.init(); assertThat(source.getContext()).as("context was wrong").isEqualTo("my/very/custom/context/"); diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourcesTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourcesTests.java index 560ec07b7..627abf33d 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourcesTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourcesTests.java @@ -20,15 +20,16 @@ import java.util.LinkedHashMap; import java.util.List; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.kv.model.GetValue; import org.apache.commons.logging.LogFactory; import org.junit.Test; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.kv.GetValue; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -48,8 +49,8 @@ public class ConsulPropertySourcesTests { @Test public void createPropertySourceStoresNormalizedContextInIndex() { ConsulClient consul = mock(ConsulClient.class); - Response> response = new Response<>(Collections.emptyList(), 1L, false, 1L); - when(consul.getKVValues(eq("test/"), nullable(String.class), any(QueryParams.class))).thenReturn(response); + ResponseEntity> response = new ResponseEntity>(HttpStatus.OK); + when(consul.getKVValues(eq("test/"), nullable(String.class))).thenReturn(response); ConsulConfigProperties properties = new ConsulConfigProperties(); ConsulPropertySources sources = new ConsulPropertySources(properties, @@ -65,7 +66,10 @@ public void createPropertySourceStoresNormalizedContextInIndex() { @Test public void createPropertySourceFilesFormatStoresNormalizedContextInIndex() { ConsulClient consul = mock(ConsulClient.class); - Response response = new Response<>(null, 1L, false, 1L); + ResponseEntity> response = mock(ResponseEntity.class); + when(response.getStatusCode()).thenReturn(HttpStatus.OK); + when(response.getBody()).thenReturn(Collections.emptyList()); + when(response.getHeaders()).thenReturn(new HttpHeaders()); when(consul.getKVValue(eq("test.yml"), nullable(String.class))).thenReturn(response); ConsulConfigProperties properties = new ConsulConfigProperties(); diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index dfc3a91bf..f721b71f6 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. @@ -26,6 +26,10 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.boot + spring-boot-restclient + org.springframework.boot spring-boot-starter-web @@ -43,7 +47,7 @@ org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj true @@ -93,18 +97,33 @@ junit-vintage-engine test + + org.testcontainers + junit-jupiter + test + org.testcontainers consul test + + org.testcontainers + mockserver + test + + + org.mock-server + mockserver-netty + test + org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.5.0 @@ -113,6 +132,6 @@ - + diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java index 6d3f4253f..a6f87f8eb 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java @@ -21,12 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ecwid.consul.v1.ConsulClient; - -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Conditional; /** * When both property and consul classes are on the classpath. @@ -35,34 +30,7 @@ */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) -@Conditional(ConditionalOnConsulEnabled.OnConsulEnabledCondition.class) +@ConditionalOnProperty(value = "spring.cloud.consul.enabled", matchIfMissing = true) public @interface ConditionalOnConsulEnabled { - /** - * Verifies multiple conditions to see if Consul should be enabled. - */ - class OnConsulEnabledCondition extends AllNestedConditions { - - OnConsulEnabledCondition() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - /** - * Consul property is enabled. - */ - @ConditionalOnProperty(value = "spring.cloud.consul.enabled", matchIfMissing = true) - static class FoundProperty { - - } - - /** - * Consul client class found. - */ - @ConditionalOnClass(ConsulClient.class) - static class FoundClass { - - } - - } - } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java index 3773de2dd..673496ab9 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java @@ -16,30 +16,58 @@ package org.springframework.cloud.consul; -import java.util.function.Supplier; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.Collections; -import com.ecwid.consul.transport.TLSConfig; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.ConsulRawClient; -import com.ecwid.consul.v1.ConsulRawClient.Builder; import org.aspectj.lang.annotation.Aspect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder; +import org.springframework.boot.http.client.HttpClientSettings; +import org.springframework.boot.ssl.SslBundle; +import org.springframework.boot.ssl.SslStoreBundle; +import org.springframework.cloud.consul.ConsulClient.QueryParams; +import org.springframework.cloud.consul.model.http.KeyStoreInstanceType; +import org.springframework.cloud.consul.model.http.format.WaitTimeAnnotationFormatterFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.core.MethodParameter; +import org.springframework.core.convert.ConversionService; +import org.springframework.format.support.DefaultFormattingConversionService; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.retry.annotation.EnableRetry; import org.springframework.retry.annotation.Retryable; import org.springframework.retry.interceptor.RetryInterceptorBuilder; import org.springframework.retry.interceptor.RetryOperationsInterceptor; import org.springframework.util.StringUtils; +import org.springframework.web.client.RestClient; +import org.springframework.web.client.support.RestClientAdapter; +import org.springframework.web.service.invoker.HttpExchangeAdapter; +import org.springframework.web.service.invoker.HttpRequestValues; +import org.springframework.web.service.invoker.HttpServiceArgumentResolver; +import org.springframework.web.service.invoker.HttpServiceProxyFactory; +import org.springframework.web.util.DefaultUriBuilderFactory; +import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode; +import org.springframework.web.util.UriBuilder; /** * @author Spencer Gibb @@ -49,6 +77,8 @@ @ConditionalOnConsulEnabled public class ConsulAutoConfiguration { + private static final Logger LOGGER = LoggerFactory.getLogger(ConsulAutoConfiguration.class); + @Bean @ConditionalOnMissingBean public ConsulProperties consulProperties() { @@ -56,49 +86,108 @@ public ConsulProperties consulProperties() { } @Bean - @ConditionalOnMissingBean(value = ConsulRawClient.Builder.class, parameterizedContainer = Supplier.class) - public Supplier consulRawClientBuilderSupplier() { - return createConsulRawClientBuilder(); + @ConditionalOnMissingBean + public ConsulClientSettings consulClientRestClientAdapter(ConsulProperties consulProperties) { + String baseUrl = createConsulClientBaseUrl(consulProperties); + return createConsulClientSettings(baseUrl, consulProperties.getTls()); } @Bean @ConditionalOnMissingBean - public ConsulClient consulClient(ConsulProperties consulProperties, - Supplier consulRawClientBuilderSupplier) { - return createConsulClient(consulProperties, consulRawClientBuilderSupplier); + public ConsulClient coreConsulClient(ConsulProperties consulProperties) { + return createNewConsulClient(consulProperties); } - public static Supplier createConsulRawClientBuilder() { - return Builder::builder; - } + public static String createConsulClientBaseUrl(ConsulProperties consulProperties) { + UriBuilder uriBuilder = new DefaultUriBuilderFactory().builder(); - public static ConsulClient createConsulClient(ConsulProperties consulProperties, - Supplier consulRawClientBuilderSupplier) { - ConsulRawClient.Builder builder = consulRawClientBuilderSupplier.get(); - final String agentPath = consulProperties.getPath(); - final String agentHost = StringUtils.hasLength(consulProperties.getScheme()) - ? consulProperties.getScheme() + "://" + consulProperties.getHost() : consulProperties.getHost(); - builder.setHost(agentHost).setPort(consulProperties.getPort()); - - if (consulProperties.getTls() != null) { - ConsulProperties.TLSConfig tls = consulProperties.getTls(); - TLSConfig tlsConfig = new TLSConfig(tls.getKeyStoreInstanceType(), tls.getCertificatePath(), - tls.getCertificatePassword(), tls.getKeyStorePath(), tls.getKeyStorePassword()); - builder.setTlsConfig(tlsConfig); + if (StringUtils.hasLength(consulProperties.getScheme())) { + uriBuilder.scheme(consulProperties.getScheme()); + } + else { + uriBuilder.scheme("http"); } + uriBuilder.host(consulProperties.getHost()).port(consulProperties.getPort()); + + final String agentPath = consulProperties.getPath(); if (StringUtils.hasLength(agentPath)) { String normalizedAgentPath = StringUtils.trimTrailingCharacter(agentPath, '/'); normalizedAgentPath = StringUtils.trimLeadingCharacter(normalizedAgentPath, '/'); - builder.setPath(normalizedAgentPath); + uriBuilder.path(normalizedAgentPath); } - return new ConsulClient(builder.build()); + String baseUrl = uriBuilder.build().toString(); + return baseUrl; + } + + public static ConsulClient createNewConsulClient(ConsulProperties consulProperties) { + String baseUrl = createConsulClientBaseUrl(consulProperties); + HttpExchangeAdapter adapter = createConsulClientSettings(baseUrl, consulProperties.getTls()).adapter(); + return createNewConsulClient(adapter); + } + + public static ConsulClient createNewConsulClient(HttpExchangeAdapter adapter) { + HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter) + .customArgumentResolver(new QueryParamsArgumentResolver()) + .conversionService(createConsulClientConversionService()) + .build(); + + return factory.createClient(ConsulClient.class); + } + + // TODO: migrate to boot managed sslbundle + public static ConsulClientSettings createConsulClientSettings(String baseUrl, + ConsulProperties.TLSConfig tlsConfig) { + try { + DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(baseUrl); + uriBuilderFactory.setEncodingMode(EncodingMode.NONE); + RestClient.Builder builder = RestClient.builder() + .defaultStatusHandler(HttpStatusCode::is4xxClientError, (request, response) -> { + }) + .defaultStatusHandler(HttpStatusCode::is5xxServerError, + (request, response) -> LOGGER + .error(new String(response.getBody().readAllBytes(), StandardCharsets.UTF_8))) + .uriBuilderFactory(uriBuilderFactory); + + HttpClientSettings settings = null; + if (tlsConfig != null) { + KeyStore clientStore = KeyStore.getInstance(tlsConfig.getKeyStoreInstanceType().name()); + clientStore.load(Files.newInputStream(Paths.get(tlsConfig.getCertificatePath())), + tlsConfig.getCertificatePassword().toCharArray()); + + KeyStore trustStore = KeyStore.getInstance(KeyStoreInstanceType.JKS.name()); + trustStore.load(Files.newInputStream(Paths.get(tlsConfig.getKeyStorePath())), + tlsConfig.getKeyStorePassword().toCharArray()); + + SslStoreBundle sslStoreBundle = SslStoreBundle.of(clientStore, tlsConfig.getKeyStorePassword(), + trustStore); + SslBundle sslBundle = SslBundle.of(sslStoreBundle); + settings = HttpClientSettings.ofSslBundle(sslBundle); + ClientHttpRequestFactory requestFactory = ClientHttpRequestFactoryBuilder.detect().build(settings); + builder.requestFactory(requestFactory); + } + + return new ConsulClientSettings(baseUrl, settings, RestClientAdapter.create(builder.build())); + } + catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e) { + throw new RuntimeException(e); + } + } + + public static ConversionService createConsulClientConversionService() { + DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService(); + conversionService.addFormatterForFieldAnnotation(new WaitTimeAnnotationFormatterFactory()); + return conversionService; + } + + public record ConsulClientSettings(String baseUrl, HttpClientSettings httpClientSettings, + RestClientAdapter adapter) { } @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(Endpoint.class) + @ConditionalOnClass({ Endpoint.class, Health.class }) @EnableConfigurationProperties(ConsulHealthIndicatorProperties.class) protected static class ConsulHealthConfig { @@ -139,4 +228,40 @@ public RetryOperationsInterceptor consulRetryInterceptor(RetryProperties propert } + static class QueryParamsArgumentResolver implements HttpServiceArgumentResolver { + + @Override + public boolean resolve(Object argument, MethodParameter parameter, HttpRequestValues.Builder builder) { + if (parameter.getParameterType().equals(QueryParams.class)) { + if (argument == null) { + return false; + } + QueryParams params = (QueryParams) argument; + if (params.getDatacenter() != null) { + builder.addRequestParameter("dc", params.getDatacenter()); + } + + if (params.getConsistencyMode() != ConsulClient.ConsistencyMode.DEFAULT) { + builder.configureRequestParams( + map -> map.put(params.getConsistencyMode().getParamName(), Collections.emptyList())); + } + + if (params.getWaitTime() != -1) { + builder.addRequestParameter("wait", params.getWaitTime() + "s"); + } + + if (params.getIndex() != -1) { + builder.addRequestParameter("index", Long.toUnsignedString(params.getIndex())); + } + + if (params.getNear() != null) { + builder.addRequestParameter("near", params.getNear()); + } + return true; + } + return false; + } + + } + } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulClient.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulClient.java new file mode 100644 index 000000000..eaaeec554 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulClient.java @@ -0,0 +1,253 @@ +/* + * Copyright 2013-present 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.consul; + +import java.util.List; +import java.util.Map; + +import org.springframework.cloud.consul.model.http.agent.NewService; +import org.springframework.cloud.consul.model.http.agent.Service; +import org.springframework.cloud.consul.model.http.catalog.CatalogService; +import org.springframework.cloud.consul.model.http.catalog.Node; +import org.springframework.cloud.consul.model.http.event.Event; +import org.springframework.cloud.consul.model.http.format.WaitTimeFormat; +import org.springframework.cloud.consul.model.http.health.Check; +import org.springframework.cloud.consul.model.http.health.HealthService; +import org.springframework.cloud.consul.model.http.kv.GetValue; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.service.annotation.DeleteExchange; +import org.springframework.web.service.annotation.GetExchange; +import org.springframework.web.service.annotation.PostExchange; +import org.springframework.web.service.annotation.PutExchange; + +public interface ConsulClient { + + /** + * Header name for Consul ACL Tokens. + */ + String ACL_TOKEN_HEADER = "X-Consul-Token"; + + @GetExchange("/v1/status/leader") + ResponseEntity getStatusLeader(); + + @GetExchange("/v1/status/peers") + ResponseEntity> getStatusPeers(); + + @GetExchange("/v1/catalog/datacenters") + ResponseEntity> getCatalogDatacenters( + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/catalog/services") + ResponseEntity>> getCatalogServices(); + + @GetExchange("/v1/catalog/services") + ResponseEntity>> getCatalogServices( + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken, QueryParams queryParams); + + @PutExchange("/v1/agent/check/fail/{checkId}") + ResponseEntity agentCheckFail(@PathVariable String checkId, @RequestParam(required = false) String note, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @PutExchange("/v1/agent/check/pass/{checkId}") + ResponseEntity agentCheckPass(@PathVariable String checkId, @RequestParam(required = false) String note, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @PutExchange("/v1/agent/check/warn/{checkId}") + ResponseEntity agentCheckWarn(@PathVariable String checkId, @RequestParam(required = false) String note, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/agent/services") + ResponseEntity> getAgentServices(); + + @PutExchange("/v1/agent/service/deregister/{serviceId}") + ResponseEntity agentServiceDeregister(@PathVariable String serviceId, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @PutExchange("/v1/agent/service/register") + ResponseEntity agentServiceRegister(@RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken, + @RequestBody NewService newService); + + @PutExchange("/v1/agent/service/maintenance/{serviceId}") + ResponseEntity agentServiceSetMaintenance(@PathVariable String serviceId, + @RequestParam(required = false) Boolean enable, @RequestParam(required = false) String reason, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/catalog/service/{serviceId}") + ResponseEntity> getCatalogService(@PathVariable String serviceId); + + @GetExchange("/v1/catalog/nodes") + ResponseEntity> getCatalogNodes(); + + @GetExchange("/v1/health/checks/{serviceName}") + ResponseEntity> getHealthChecksForService(@PathVariable String serviceName); + + @GetExchange("/v1/health/service/{serviceName}") + ResponseEntity> getHealthServices(@PathVariable String serviceName); + + @GetExchange("/v1/health/service/{serviceName}") + ResponseEntity> getHealthServices(@PathVariable String serviceName, + @RequestParam boolean passing, @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken, + @RequestParam(required = false) List tag, QueryParams queryParams); + + @DeleteExchange("/v1/kv/{context}") + ResponseEntity deleteKVValues(@PathVariable String context); + + @DeleteExchange("/v1/kv/{context}") + ResponseEntity deleteKVValues(@PathVariable String context, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/kv/{context}") + ResponseEntity> getKVValue(@PathVariable String context, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/kv/{context}?recurse") + ResponseEntity> getKVValues(@PathVariable String context, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken); + + @GetExchange("/v1/kv/{context}?recurse") + ResponseEntity> getKVValues(@PathVariable String context, + @RequestHeader(name = ACL_TOKEN_HEADER, required = false) String aclToken, + @RequestParam("wait") @WaitTimeFormat Long waitTime, @RequestParam("index") long index); + + @PutExchange(url = "/v1/kv/{context}", contentType = MediaType.TEXT_PLAIN_VALUE) + ResponseEntity setKVValue(@PathVariable String context, @RequestBody String value); + + @GetExchange("/v1/events") + ResponseEntity> eventList(); + + @GetExchange("/v1/events") + ResponseEntity> eventList(int eventTimeout, long index); + + @PostExchange("/v1/event/fire/{name}") + ResponseEntity eventFire(@PathVariable String name, @RequestBody String payload); + + class QueryParams { + + /** + * Default QueryParams to use. Passing null results in an exception. + */ + public static final QueryParams DEFAULT = new QueryParams(); + + private final String datacenter; + + private final ConsistencyMode consistencyMode; + + private final long waitTime; + + private final long index; + + private final String near; + + public QueryParams() { + this(null, ConsistencyMode.DEFAULT, -1, -1); + } + + public QueryParams(String datacenter) { + this(datacenter, ConsistencyMode.DEFAULT, -1, -1); + } + + public QueryParams(ConsistencyMode consistencyMode) { + this(null, consistencyMode, -1, -1); + } + + public QueryParams(String datacenter, ConsistencyMode consistencyMode) { + this(datacenter, consistencyMode, -1, -1); + } + + public QueryParams(long waitTime, long index) { + this(null, ConsistencyMode.DEFAULT, waitTime, index); + } + + public QueryParams(String datacenter, long waitTime, long index) { + this(datacenter, ConsistencyMode.DEFAULT, waitTime, index, null); + } + + private QueryParams(String datacenter, ConsistencyMode consistencyMode, long waitTime, long index) { + this(datacenter, consistencyMode, waitTime, index, null); + } + + private QueryParams(String datacenter, ConsistencyMode consistencyMode, long waitTime, long index, + String near) { + this.datacenter = datacenter; + this.consistencyMode = consistencyMode; + this.waitTime = waitTime; + this.index = index; + this.near = near; + } + + public String getDatacenter() { + return datacenter; + } + + public ConsistencyMode getConsistencyMode() { + return consistencyMode; + } + + public long getWaitTime() { + return waitTime; + } + + public long getIndex() { + return index; + } + + public String getNear() { + return near; + } + + } + + enum ConsistencyMode { + + /** + * Default Consul Consistency Mode. + */ + DEFAULT("default"), + + /** + * Stale Consul Consistency Mode. + */ + STALE("stale"), + + /** + * Consistent Consul Consistency Mode. + */ + CONSISTENT("consistent"); + + private String paramName; + + ConsistencyMode(String paramName) { + this.paramName = paramName; + } + + public String getParamName() { + return paramName; + } + + @Override + public String toString() { + return this.paramName; + } + + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulEndpoint.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulEndpoint.java index 6b5de8f6c..1ca561ff5 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulEndpoint.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulEndpoint.java @@ -20,18 +20,11 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import com.ecwid.consul.v1.catalog.CatalogNodesRequest; -import com.ecwid.consul.v1.catalog.CatalogServiceRequest; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; -import com.ecwid.consul.v1.catalog.model.CatalogService; -import com.ecwid.consul.v1.catalog.model.Node; - import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; +import org.springframework.cloud.consul.model.http.agent.Service; +import org.springframework.cloud.consul.model.http.catalog.CatalogService; +import org.springframework.cloud.consul.model.http.catalog.Node; import org.springframework.core.style.ToStringCreator; /** @@ -40,7 +33,7 @@ @Endpoint(id = "consul") public class ConsulEndpoint { - private ConsulClient consul; + private final ConsulClient consul; public ConsulEndpoint(ConsulClient consul) { this.consul = consul; @@ -50,21 +43,18 @@ public ConsulEndpoint(ConsulClient consul) { public ConsulData invoke() { ConsulData data = new ConsulData(); // data.setKeyValues(kvClient.getKeyValueRecurse()); - Response> agentServices = this.consul.getAgentServices(); - data.setAgentServices(agentServices.getValue()); + Map agentServices = this.consul.getAgentServices().getBody(); + data.setAgentServices(agentServices); - Response>> catalogServices = this.consul - .getCatalogServices(CatalogServicesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); + Map> catalogServices = this.consul.getCatalogServices().getBody(); - for (String serviceId : catalogServices.getValue().keySet()) { - Response> response = this.consul.getCatalogService(serviceId, - CatalogServiceRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - data.getCatalogServices().put(serviceId, response.getValue()); + for (String serviceId : catalogServices.keySet()) { + List response = this.consul.getCatalogService(serviceId).getBody(); + data.getCatalogServices().put(serviceId, response); } - Response> catalogNodes = this.consul - .getCatalogNodes(CatalogNodesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - data.setCatalogNodes(catalogNodes.getValue()); + List catalogNodes = this.consul.getCatalogNodes().getBody(); + data.setCatalogNodes(catalogNodes); return data; } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulException.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulException.java new file mode 100644 index 000000000..2f7faf644 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulException.java @@ -0,0 +1,32 @@ +/* + * Copyright 2013-present 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.consul; + +public class ConsulException extends RuntimeException { + + public ConsulException() { + } + + public ConsulException(Throwable cause) { + super(cause); + } + + public ConsulException(String message) { + super(message); + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java index 756193321..8ba654c37 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java @@ -19,13 +19,9 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; - -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; +import org.springframework.http.ResponseEntity; /** * @author Spencer Gibb @@ -43,12 +39,12 @@ public ConsulHealthIndicator(ConsulClient consul, ConsulHealthIndicatorPropertie @Override protected void doHealthCheck(Health.Builder builder) { - final Response leaderStatus = this.consul.getStatusLeader(); - builder.up().withDetail("leader", leaderStatus.getValue()); + final String leaderStatus = this.consul.getStatusLeader().getBody(); + builder.up().withDetail("leader", leaderStatus); if (properties.isIncludeServicesQuery()) { - final Response>> services = this.consul - .getCatalogServices(CatalogServicesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - builder.withDetail("services", services.getValue()); + ResponseEntity>> response = this.consul.getCatalogServices(); + final Map> services = response.getBody(); + builder.withDetail("services", services); } } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java index 009f2d9bb..c4fa30e8a 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.style.ToStringCreator; diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java index e2485919b..bf19319ac 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java @@ -16,10 +16,10 @@ package org.springframework.cloud.consul; -import com.ecwid.consul.transport.TLSConfig.KeyStoreInstanceType; import jakarta.validation.constraints.NotNull; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.consul.model.http.KeyStoreInstanceType; import org.springframework.core.style.ToStringCreator; import org.springframework.validation.annotation.Validated; diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/ConsulHeaders.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/ConsulHeaders.java new file mode 100644 index 000000000..a3314d78a --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/ConsulHeaders.java @@ -0,0 +1,88 @@ +/* + * Copyright 2013-present 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.consul.model.http; + +import org.springframework.http.HttpEntity; +import org.springframework.util.StringUtils; + +/** + * Custom Consul Defined Response Headers. + * + * @author Matthew Whitaker + */ +public final class ConsulHeaders { + + private ConsulHeaders() { + } + + /** + * Header name for Consul Index. + */ + public static String INDEX_HEADER = "X-Consul-Index"; + + /** + * Header name for Consul Knownleader. + */ + public static String KNOWN_LEADER_HEADER = "X-Consul-Knownleader"; + + /** + * Header name for Consul Lastcontact. + */ + public static String LAST_CONTACT_HEADER = "X-Consul-Lastcontact"; + + public static Long getConsulIndex(HttpEntity entity) { + String header = entity.getHeaders().getFirst(INDEX_HEADER); + return parseUnsignedLong(header); + } + + public static Boolean getConsulKnownLeader(HttpEntity entity) { + String header = entity.getHeaders().getFirst(KNOWN_LEADER_HEADER); + return parseBoolean(header); + } + + public static Long getConsulLastContact(HttpEntity entity) { + String header = entity.getHeaders().getFirst(LAST_CONTACT_HEADER); + return parseUnsignedLong(header); + } + + private static Long parseUnsignedLong(String value) { + if (StringUtils.hasText(value)) { + try { + return Long.parseUnsignedLong(value); + } + catch (Exception e) { + } + } + + return null; + } + + private static Boolean parseBoolean(String value) { + if (StringUtils.hasText(value)) { + if ("true".equals(value)) { + return true; + } + + if ("false".equals(value)) { + return false; + } + } + + return null; + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/SerfStatusEnum.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/KeyStoreInstanceType.java similarity index 60% rename from spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/SerfStatusEnum.java rename to spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/KeyStoreInstanceType.java index b8853a58c..6c69ac474 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/SerfStatusEnum.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/KeyStoreInstanceType.java @@ -14,43 +14,32 @@ * limitations under the License. */ -package org.springframework.cloud.consul.model; +package org.springframework.cloud.consul.model.http; /** - * Gossip pool (serf) statuses. Created by nicu on 10.03.2015. - * - * @author Nicu Marasoiu + * @author Matthew Whitaker */ -public enum SerfStatusEnum { +public enum KeyStoreInstanceType { /** - * Alive status. + * Java Key Store. */ - StatusAlive(1), - + JKS, /** - * Leaving status. + * TODO: Another Type. */ - StatusLeaving(2), - + JCEKS, /** - * Left status. + * TODO: Another Type. */ - StatusLeft(3), - + PKCS12, /** - * Failed status. + * TODO: Another Type. */ - StatusFailed(4); - - private final int code; - - SerfStatusEnum(int code) { - this.code = code; - } - - public int getCode() { - return this.code; - } + PKCS11, + /** + * TODO: Another Type. + */ + DKS; } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/NewService.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/NewService.java new file mode 100644 index 000000000..c799a7a2f --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/NewService.java @@ -0,0 +1,330 @@ +/* + * Copyright 2013-present 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.consul.model.http.agent; + +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class NewService { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Name") + private String name; + + @JsonProperty("Tags") + private List tags; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Meta") + private Map meta; + + @JsonProperty("Port") + private Integer port; + + @JsonProperty("EnableTagOverride") + private Boolean enableTagOverride; + + @JsonProperty("Check") + private Check check; + + @JsonProperty("Checks") + private List checks; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Map getMeta() { + return meta; + } + + public void setMeta(Map meta) { + this.meta = meta; + } + + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public Boolean getEnableTagOverride() { + return enableTagOverride; + } + + public void setEnableTagOverride(Boolean enableTagOverride) { + this.enableTagOverride = enableTagOverride; + } + + public Check getCheck() { + return check; + } + + public void setCheck(Check check) { + this.check = check; + } + + public List getChecks() { + return checks; + } + + public void setChecks(List checks) { + this.checks = checks; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("name", name) + .append("tags", tags) + .append("address", address) + .append("meta", meta) + .append("port", port) + .append("enableTagOverride", enableTagOverride) + .append("check", check) + .append("checks", checks) + .toString(); + } + + public static class Check { + + @JsonProperty("Args") + private List args; + + @JsonProperty("DockerContainerID") + private String dockerContainerID; + + @JsonProperty("Shell") + private String shell; + + @JsonProperty("Interval") + private String interval; + + @JsonProperty("TTL") + private String ttl; + + @JsonProperty("HTTP") + private String http; + + @JsonProperty("Method") + private String method; + + @JsonProperty("Header") + private Map> header; + + @JsonProperty("TCP") + private String tcp; + + @JsonProperty("Timeout") + private String timeout; + + @JsonProperty("DeregisterCriticalServiceAfter") + private String deregisterCriticalServiceAfter; + + @JsonProperty("TLSSkipVerify") + private Boolean tlsSkipVerify; + + @JsonProperty("Status") + private String status; + + @JsonProperty("GRPC") + private String grpc; + + @JsonProperty("GRPCUseTLS") + private Boolean grpcUseTLS; + + public List getArgs() { + return args; + } + + public void setArgs(List args) { + this.args = args; + } + + public String getDockerContainerID() { + return dockerContainerID; + } + + public void setDockerContainerID(String dockerContainerID) { + this.dockerContainerID = dockerContainerID; + } + + public String getShell() { + return shell; + } + + public void setShell(String shell) { + this.shell = shell; + } + + public String getInterval() { + return interval; + } + + public void setInterval(String interval) { + this.interval = interval; + } + + public String getTtl() { + return ttl; + } + + public void setTtl(String ttl) { + this.ttl = ttl; + } + + public String getHttp() { + return http; + } + + public void setHttp(String http) { + this.http = http; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public Map> getHeader() { + return header; + } + + public void setHeader(Map> header) { + this.header = header; + } + + public String getTcp() { + return tcp; + } + + public void setTcp(String tcp) { + this.tcp = tcp; + } + + public String getTimeout() { + return timeout; + } + + public void setTimeout(String timeout) { + this.timeout = timeout; + } + + public String getDeregisterCriticalServiceAfter() { + return deregisterCriticalServiceAfter; + } + + public void setDeregisterCriticalServiceAfter(String deregisterCriticalServiceAfter) { + this.deregisterCriticalServiceAfter = deregisterCriticalServiceAfter; + } + + public Boolean getTlsSkipVerify() { + return tlsSkipVerify; + } + + public void setTlsSkipVerify(Boolean tlsSkipVerify) { + this.tlsSkipVerify = tlsSkipVerify; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getGrpc() { + return grpc; + } + + public void setGrpc(String grpc) { + this.grpc = grpc; + } + + public Boolean getGrpcUseTLS() { + return grpcUseTLS; + } + + public void setGrpcUseTLS(Boolean grpcUseTLS) { + this.grpcUseTLS = grpcUseTLS; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("args", args) + .append("dockerContainerID", dockerContainerID) + .append("shell", shell) + .append("interval", interval) + .append("ttl", ttl) + .append("http", http) + .append("method", method) + .append("header", header) + .append("tcp", tcp) + .append("timeout", timeout) + .append("deregisterCriticalServiceAfter", deregisterCriticalServiceAfter) + .append("tlsSkipVerify", tlsSkipVerify) + .append("status", status) + .append("grpc", grpc) + .append("grpcUseTLS", grpcUseTLS) + .toString(); + } + + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/Service.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/Service.java new file mode 100644 index 000000000..2aac73242 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/agent/Service.java @@ -0,0 +1,141 @@ +/* + * Copyright 2013-present 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.consul.model.http.agent; + +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class Service { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Service") + private String service; + + @JsonProperty("Tags") + private List tags; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Meta") + private Map meta; + + @JsonProperty("Port") + private Integer port; + + @JsonProperty("EnableTagOverride") + private Boolean enableTagOverride; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getService() { + return service; + } + + public void setService(String service) { + this.service = service; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Map getMeta() { + return meta; + } + + public void setMeta(Map meta) { + this.meta = meta; + } + + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public Boolean getEnableTagOverride() { + return enableTagOverride; + } + + public void setEnableTagOverride(Boolean enableTagOverride) { + this.enableTagOverride = enableTagOverride; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("service", service) + .append("tags", tags) + .append("address", address) + .append("meta", meta) + .append("port", port) + .append("enableTagOverride", enableTagOverride) + .append("createIndex", createIndex) + .append("modifyIndex", modifyIndex) + .toString(); + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/CatalogService.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/CatalogService.java new file mode 100644 index 000000000..1b609a9e8 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/CatalogService.java @@ -0,0 +1,237 @@ +/* + * Copyright 2013-present 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.consul.model.http.catalog; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class CatalogService { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Node") + private String node; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Datacenter") + private String datacenter; + + @JsonProperty("TaggedAddresses") + private Map taggedAddresses; + + @JsonProperty("NodeMeta") + private Map nodeMeta; + + @JsonProperty("ServiceID") + private String serviceId; + + @JsonProperty("ServiceName") + private String serviceName; + + @JsonProperty("ServiceTags") + private List serviceTags; + + @JsonProperty("ServiceAddress") + private String serviceAddress; + + @JsonProperty("ServiceMeta") + private Map serviceMeta; + + @JsonProperty("ServicePort") + private Integer servicePort; + + @JsonProperty("ServiceEnableTagOverride") + private Boolean serviceEnableTagOverride; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNode() { + return node; + } + + public void setNode(String node) { + this.node = node; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getDatacenter() { + return datacenter; + } + + public void setDatacenter(String datacenter) { + this.datacenter = datacenter; + } + + public Map getTaggedAddresses() { + return taggedAddresses; + } + + public void setTaggedAddresses(Map taggedAddresses) { + this.taggedAddresses = taggedAddresses; + } + + public Map getNodeMeta() { + return nodeMeta; + } + + public void setNodeMeta(Map nodeMeta) { + this.nodeMeta = nodeMeta; + } + + public String getServiceId() { + return serviceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public List getServiceTags() { + return serviceTags; + } + + public void setServiceTags(List serviceTags) { + this.serviceTags = serviceTags; + } + + public String getServiceAddress() { + return serviceAddress; + } + + public void setServiceAddress(String serviceAddress) { + this.serviceAddress = serviceAddress; + } + + public Map getServiceMeta() { + return serviceMeta; + } + + public void setServiceMeta(Map serviceMeta) { + this.serviceMeta = serviceMeta; + } + + public Integer getServicePort() { + return servicePort; + } + + public void setServicePort(Integer servicePort) { + this.servicePort = servicePort; + } + + public Boolean getServiceEnableTagOverride() { + return serviceEnableTagOverride; + } + + public void setServiceEnableTagOverride(Boolean serviceEnableTagOverride) { + this.serviceEnableTagOverride = serviceEnableTagOverride; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("node", node) + .append("address", address) + .append("datacenter", datacenter) + .append("taggedAddresses", taggedAddresses) + .append("nodeMeta", nodeMeta) + .append("serviceId", serviceId) + .append("serviceName", serviceName) + .append("serviceTags", serviceTags) + .append("serviceAddress", serviceAddress) + .append("serviceMeta", serviceMeta) + .append("servicePort", servicePort) + .append("serviceEnableTagOverride", serviceEnableTagOverride) + .append("createIndex", createIndex) + .append("modifyIndex", modifyIndex) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + CatalogService that = (CatalogService) o; + return Objects.equals(id, that.id) && Objects.equals(node, that.node) && Objects.equals(address, that.address) + && Objects.equals(datacenter, that.datacenter) && Objects.equals(taggedAddresses, that.taggedAddresses) + && Objects.equals(nodeMeta, that.nodeMeta) && Objects.equals(serviceId, that.serviceId) + && Objects.equals(serviceName, that.serviceName) && Objects.equals(serviceTags, that.serviceTags) + && Objects.equals(serviceAddress, that.serviceAddress) && Objects.equals(serviceMeta, that.serviceMeta) + && Objects.equals(servicePort, that.servicePort) + && Objects.equals(serviceEnableTagOverride, that.serviceEnableTagOverride) + && Objects.equals(createIndex, that.createIndex) && Objects.equals(modifyIndex, that.modifyIndex); + } + + @Override + public int hashCode() { + return Objects.hash(id, node, address, datacenter, taggedAddresses, nodeMeta, serviceId, serviceName, + serviceTags, serviceAddress, serviceMeta, servicePort, serviceEnableTagOverride, createIndex, + modifyIndex); + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/Node.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/Node.java new file mode 100644 index 000000000..31fe2b007 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/catalog/Node.java @@ -0,0 +1,113 @@ +/* + * Copyright 2013-present 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.consul.model.http.catalog; + +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Node { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Node") + private String node; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Datacenter") + private String datacenter; + + @JsonProperty("TaggedAddresses") + private Map taggedAddresses; + + @JsonProperty("Meta") + private Map meta; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNode() { + return node; + } + + public void setNode(String node) { + this.node = node; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getDatacenter() { + return datacenter; + } + + public void setDatacenter(String datacenter) { + this.datacenter = datacenter; + } + + public Map getTaggedAddresses() { + return taggedAddresses; + } + + public void setTaggedAddresses(Map taggedAddresses) { + this.taggedAddresses = taggedAddresses; + } + + public Map getMeta() { + return meta; + } + + public void setMeta(Map meta) { + this.meta = meta; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/event/Event.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/event/Event.java new file mode 100644 index 000000000..637a49463 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/event/Event.java @@ -0,0 +1,153 @@ +/* + * Copyright 2013-present 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.consul.model.http.event; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class Event { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Name") + private String name; + + @JsonProperty("Payload") + private String payload; + + @JsonProperty("NodeFilter") + private String nodeFilter; + + @JsonProperty("ServiceFilter") + private String serviceFilter; + + @JsonProperty("TagFilter") + private String tagFilter; + + @JsonProperty("Version") + private int version; + + @JsonProperty("LTime") + private int lTime; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPayload() { + return payload; + } + + public void setPayload(String payload) { + this.payload = payload; + } + + public String getNodeFilter() { + return nodeFilter; + } + + public void setNodeFilter(String nodeFilter) { + this.nodeFilter = nodeFilter; + } + + public String getServiceFilter() { + return serviceFilter; + } + + public void setServiceFilter(String serviceFilter) { + this.serviceFilter = serviceFilter; + } + + public String getTagFilter() { + return tagFilter; + } + + public void setTagFilter(String tagFilter) { + this.tagFilter = tagFilter; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public int getlTime() { + return lTime; + } + + public void setlTime(int lTime) { + this.lTime = lTime; + } + + /** + * Converted from + * https://github.com/hashicorp/consul/blob/master/api/event.go#L90-L104 This is a + * hack. It simulates the index generation to convert an event ID into a WaitIndex. + * @return a Wait Index value suitable for passing in to + * {@link org.springframework.cloud.consul.ConsulClient.QueryParams} for blocking + * eventList calls. + */ + public long getWaitIndex() { + if (id == null || id.length() != 36) { + return 0; + } + long lower = 0; + long upper = 0; + for (int i = 0; i < 18; i++) { + if (i != 8 && i != 13) { + lower = lower * 16 + Character.digit(id.charAt(i), 16); + } + } + for (int i = 19; i < 36; i++) { + if (i != 23) { + upper = upper * 16 + Character.digit(id.charAt(i), 16); + } + } + return lower ^ upper; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("name", name) + .append("payload", payload) + .append("nodeFilter", nodeFilter) + .append("serviceFilter", serviceFilter) + .append("tagFilter", tagFilter) + .append("version", version) + .append("lTime", lTime) + .toString(); + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeAnnotationFormatterFactory.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeAnnotationFormatterFactory.java new file mode 100644 index 000000000..8df2908c3 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeAnnotationFormatterFactory.java @@ -0,0 +1,49 @@ +/* + * Copyright 2013-present 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.consul.model.http.format; + +import java.util.Set; + +import org.springframework.format.AnnotationFormatterFactory; +import org.springframework.format.Formatter; +import org.springframework.format.Parser; +import org.springframework.format.Printer; + +public class WaitTimeAnnotationFormatterFactory implements AnnotationFormatterFactory { + + private static final Set> FIELD_TYPES = Set.of(Long.class); + + @Override + public Set> getFieldTypes() { + return FIELD_TYPES; + } + + @Override + public Printer getPrinter(WaitTimeFormat annotation, Class fieldType) { + return configureFormatterFrom(annotation, fieldType); + } + + @Override + public Parser getParser(WaitTimeFormat annotation, Class fieldType) { + return configureFormatterFrom(annotation, fieldType); + } + + private Formatter configureFormatterFrom(WaitTimeFormat annotation, Class fieldType) { + return new WaitTimeFormatter(); + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormat.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormat.java new file mode 100644 index 000000000..54d091b42 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormat.java @@ -0,0 +1,30 @@ +/* + * Copyright 2013-present 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.consul.model.http.format; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE }) +public @interface WaitTimeFormat { + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormatter.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormatter.java new file mode 100644 index 000000000..7e7d83af3 --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/format/WaitTimeFormatter.java @@ -0,0 +1,47 @@ +/* + * Copyright 2013-present 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.consul.model.http.format; + +import java.text.ParseException; +import java.util.Locale; + +import org.springframework.format.Formatter; + +public class WaitTimeFormatter implements Formatter { + + @Override + public Long parse(String text, Locale locale) throws ParseException { + try { + if (text.endsWith("s")) { + return Long.parseLong(text.substring(0, text.length() - 1)); + } + else { + return Long.parseLong(text); + } + } + catch (NumberFormatException e) { + throw new ParseException(e.getMessage(), 0); + } + + } + + @Override + public String print(Long object, Locale locale) { + return object + "s"; + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/Check.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/Check.java new file mode 100644 index 000000000..e579e73dc --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/Check.java @@ -0,0 +1,192 @@ +/* + * Copyright 2013-present 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.consul.model.http.health; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class Check { + + @JsonProperty("Node") + private String node; + + @JsonProperty("CheckID") + private String checkId; + + @JsonProperty("Name") + private String name; + + @JsonProperty("Status") + private CheckStatus status; + + @JsonProperty("Notes") + private String notes; + + @JsonProperty("Output") + private String output; + + @JsonProperty("ServiceID") + private String serviceId; + + @JsonProperty("ServiceName") + private String serviceName; + + @JsonProperty("ServiceTags") + private List serviceTags; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getNode() { + return node; + } + + public void setNode(String node) { + this.node = node; + } + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public CheckStatus getStatus() { + return status; + } + + public void setStatus(CheckStatus status) { + this.status = status; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getOutput() { + return output; + } + + public void setOutput(String output) { + this.output = output; + } + + public String getServiceId() { + return serviceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public List getServiceTags() { + return serviceTags; + } + + public void setServiceTags(List serviceTags) { + this.serviceTags = serviceTags; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("node", node) + .append("checkId", checkId) + .append("name", name) + .append("status", status) + .append("notes", notes) + .append("output", output) + .append("serviceId", serviceId) + .append("serviceName", serviceName) + .append("serviceTags", serviceTags) + .append("createIndex", createIndex) + .append("modifyIndex", modifyIndex) + .toString(); + } + + public enum CheckStatus { + + /** + * Check status unknown. + */ + @JsonProperty("unknown") + UNKNOWN, + + /** + * Check status passing. + */ + @JsonProperty("passing") + PASSING, + + /** + * Check status warning. + */ + @JsonProperty("warning") + WARNING, + + /** + * Check status critical. + */ + @JsonProperty("critical") + CRITICAL + + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/HealthService.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/HealthService.java new file mode 100644 index 000000000..8d3218c5c --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/health/HealthService.java @@ -0,0 +1,343 @@ +/* + * Copyright 2013-present 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.consul.model.http.health; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.core.style.ToStringCreator; + +public class HealthService { + + @JsonProperty("Node") + private Node node; + + @JsonProperty("Service") + private Service service; + + @JsonProperty("Checks") + private List checks; + + public Node getNode() { + return node; + } + + public void setNode(Node node) { + this.node = node; + } + + public Service getService() { + return service; + } + + public void setService(Service service) { + this.service = service; + } + + public List getChecks() { + return checks; + } + + public void setChecks(List checks) { + this.checks = checks; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("node", node) + .append("service", service) + .append("checks", checks) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + HealthService that = (HealthService) o; + return Objects.equals(node, that.node) && Objects.equals(service, that.service) + && Objects.equals(checks, that.checks); + } + + @Override + public int hashCode() { + return Objects.hash(node, service, checks); + } + + public static class Node { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Node") + private String node; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Datacenter") + private String datacenter; + + @JsonProperty("TaggedAddresses") + private Map taggedAddresses; + + @JsonProperty("Meta") + private Map meta; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNode() { + return node; + } + + public void setNode(String node) { + this.node = node; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getDatacenter() { + return datacenter; + } + + public void setDatacenter(String datacenter) { + this.datacenter = datacenter; + } + + public Map getTaggedAddresses() { + return taggedAddresses; + } + + public void setTaggedAddresses(Map taggedAddresses) { + this.taggedAddresses = taggedAddresses; + } + + public Map getMeta() { + return meta; + } + + public void setMeta(Map meta) { + this.meta = meta; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("node", node) + .append("address", address) + .append("datacenter", datacenter) + .append("taggedAddresses", taggedAddresses) + .append("meta", meta) + .append("createIndex", createIndex) + .append("modifyIndex", modifyIndex) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Node node1 = (Node) o; + return Objects.equals(id, node1.id) && Objects.equals(node, node1.node) + && Objects.equals(address, node1.address) && Objects.equals(datacenter, node1.datacenter) + && Objects.equals(taggedAddresses, node1.taggedAddresses) && Objects.equals(meta, node1.meta) + && Objects.equals(createIndex, node1.createIndex) && Objects.equals(modifyIndex, node1.modifyIndex); + } + + @Override + public int hashCode() { + return Objects.hash(id, node, address, datacenter, taggedAddresses, meta, createIndex, modifyIndex); + } + + } + + public static class Service { + + @JsonProperty("ID") + private String id; + + @JsonProperty("Service") + private String service; + + @JsonProperty("Tags") + private List tags; + + @JsonProperty("Address") + private String address; + + @JsonProperty("Meta") + private Map meta; + + @JsonProperty("Port") + private Integer port; + + @JsonProperty("EnableTagOverride") + private Boolean enableTagOverride; + + @JsonProperty("CreateIndex") + private Long createIndex; + + @JsonProperty("ModifyIndex") + private Long modifyIndex; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getService() { + return service; + } + + public void setService(String service) { + this.service = service; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Map getMeta() { + return meta; + } + + public void setMeta(Map meta) { + this.meta = meta; + } + + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public Boolean getEnableTagOverride() { + return enableTagOverride; + } + + public void setEnableTagOverride(Boolean enableTagOverride) { + this.enableTagOverride = enableTagOverride; + } + + public Long getCreateIndex() { + return createIndex; + } + + public void setCreateIndex(Long createIndex) { + this.createIndex = createIndex; + } + + public Long getModifyIndex() { + return modifyIndex; + } + + public void setModifyIndex(Long modifyIndex) { + this.modifyIndex = modifyIndex; + } + + @Override + public String toString() { + return new ToStringCreator(this).append("id", id) + .append("service", service) + .append("tags", tags) + .append("address", address) + .append("meta", meta) + .append("port", port) + .append("enableTagOverride", enableTagOverride) + .append("createIndex", createIndex) + .append("modifyIndex", modifyIndex) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) { + return false; + } + Service service1 = (Service) o; + return Objects.equals(id, service1.id) && Objects.equals(service, service1.service) + && Objects.equals(tags, service1.tags) && Objects.equals(address, service1.address) + && Objects.equals(meta, service1.meta) && Objects.equals(port, service1.port) + && Objects.equals(enableTagOverride, service1.enableTagOverride) + && Objects.equals(createIndex, service1.createIndex) + && Objects.equals(modifyIndex, service1.modifyIndex); + } + + @Override + public int hashCode() { + return Objects.hash(id, service, tags, address, meta, port, enableTagOverride, createIndex, modifyIndex); + } + + } + +} diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/kv/GetValue.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/kv/GetValue.java new file mode 100644 index 000000000..24d7f147b --- /dev/null +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/model/http/kv/GetValue.java @@ -0,0 +1,66 @@ +/* + * Copyright 2013-present 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.consul.model.http.kv; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GetValue { + + @JsonProperty("Key") + private String key; + + @JsonProperty("Value") + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getDecodedValue(Charset charset) { + if (this.value == null) { + return null; + } + else { + if (charset == null) { + charset = StandardCharsets.UTF_8; + } + + return new String(Base64.getDecoder().decode(this.value), charset); + } + } + + public String getDecodedValue() { + return this.getDecodedValue(StandardCharsets.UTF_8); + } + +} diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java index a6ed23adc..8a366b6a6 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java @@ -18,19 +18,15 @@ import java.net.URL; -import com.ecwid.consul.transport.DefaultHttpsTransport; -import com.ecwid.consul.transport.HttpTransport; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.ConsulRawClient; -import com.ecwid.consul.v1.catalog.CatalogConsulClient; import org.junit.Test; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.cloud.consul.ConsulAutoConfiguration.ConsulClientSettings; import org.springframework.cloud.consul.test.ConsulTestcontainers; -import org.springframework.test.util.ReflectionTestUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -67,16 +63,13 @@ public void consulDisabled() { @Test public void customPathConfigured() { appContextRunner.withPropertyValues("spring.cloud.consul.path=/consul/proxy/").run(context -> { - assertThat(context).hasNotFailed().hasSingleBean(ConsulClient.class); + assertThat(context).hasNotFailed() + .hasSingleBean(ConsulClient.class) + .hasSingleBean(ConsulClientSettings.class); - ConsulClient consulClient = context.getBean(ConsulClient.class); - CatalogConsulClient client = (CatalogConsulClient) ReflectionTestUtils.getField(consulClient, - "catalogClient"); - ConsulRawClient rawClient = (ConsulRawClient) ReflectionTestUtils.getField(client, "rawClient"); - String agentAddress = (String) ReflectionTestUtils.getField(rawClient, "agentAddress"); - - assertThat(agentAddress).isNotNull(); - assertThat(new URL(agentAddress).getPath()).isEqualTo("/consul/proxy"); + ConsulClientSettings settings = context.getBean(ConsulClientSettings.class); + assertThat(settings).isNotNull(); + assertThat(new URL(settings.baseUrl()).getPath()).isEqualTo("/consul/proxy"); }); } @@ -89,14 +82,18 @@ public void tlsConfigured() { "spring.cloud.consul.tls.certificate-path=src/test/resources/trustStore.jks", "spring.cloud.consul.tls.certificate-password=change_me") .run(context -> { - assertThat(context).hasNotFailed().hasSingleBean(ConsulClient.class); - - ConsulClient consulClient = context.getBean(ConsulClient.class); - CatalogConsulClient client = (CatalogConsulClient) ReflectionTestUtils.getField(consulClient, - "catalogClient"); - ConsulRawClient rawClient = (ConsulRawClient) ReflectionTestUtils.getField(client, "rawClient"); - HttpTransport httpTransport = (HttpTransport) ReflectionTestUtils.getField(rawClient, "httpTransport"); - assertThat(httpTransport).isInstanceOf(DefaultHttpsTransport.class); + assertThat(context).hasNotFailed() + .hasSingleBean(ConsulClient.class) + .hasSingleBean(ConsulClientSettings.class); + + ConsulClientSettings settings = context.getBean(ConsulClientSettings.class); + assertThat(settings).isNotNull(); + assertThat(settings.httpClientSettings()).isNotNull(); + SslBundle sslBundle = settings.httpClientSettings().sslBundle(); + assertThat(sslBundle).isNotNull(); + assertThat(sslBundle.getStores().getKeyStore()).isNotNull(); + assertThat(sslBundle.getStores().getKeyStorePassword()).isEqualTo("letmein"); + assertThat(sslBundle.getStores().getTrustStore()).isNotNull(); }); } diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulClientIntegrationTests.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulClientIntegrationTests.java new file mode 100644 index 000000000..09297668e --- /dev/null +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulClientIntegrationTests.java @@ -0,0 +1,157 @@ +/* + * Copyright 2013-present 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.consul; + +import java.io.IOException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.List; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockserver.client.MockServerClient; +import org.mockserver.model.Header; +import org.mockserver.model.Parameter; +import org.mockserver.verify.VerificationTimes; +import org.testcontainers.containers.MockServerContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.DockerImageName; + +import org.springframework.cloud.consul.model.http.kv.GetValue; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; +import static org.mockserver.model.JsonBody.json; + +@Testcontainers +class ConsulClientIntegrationTests { + + @Container + static MockServerContainer mockServerContainer = new MockServerContainer( + DockerImageName.parse("mockserver/mockserver:5.15.0")); + static MockServerClient mockServerClient; + + private ConsulClient client; + + @BeforeAll + static void beforeAll() { + mockServerClient = new MockServerClient(mockServerContainer.getHost(), mockServerContainer.getServerPort()); + } + + @BeforeEach + void setUp() throws CertificateException, KeyStoreException, IOException, NoSuchAlgorithmException { + mockServerClient.reset(); + ConsulProperties consulProperties = new ConsulProperties(); + consulProperties.setHost(mockServerContainer.getHost()); + consulProperties.setPort(mockServerContainer.getServerPort()); + this.client = ConsulAutoConfiguration.createNewConsulClient(consulProperties); + } + + @Test + void getStatusLeader() { + mockServerClient.when(request().withMethod("GET").withPath("/v1/status/leader")) + .respond(response().withStatusCode(200) + .withHeaders(new Header("Content-Type", "application/json")) + .withBody("\"172.17.0.2:8300\"")); + + String statusLeader = client.getStatusLeader().getBody(); + + verifyRequestSentToConsul("GET", "/v1/status/leader", 1); + + // Verify response from consul + assertThat(statusLeader).isEqualTo("\"172.17.0.2:8300\""); + } + + @Test + void getKVValues_WithWaitTimeAndIndexAndNoAclToken() { + + mockServerClient.when(request().withMethod("GET").withPath("/v1/kv/context")) + .respond(response().withStatusCode(200) + .withHeaders(new Header("Content-Type", "application/json")) + .withBody(json("[\n" + " {\n" + " \"CreateIndex\": 100,\n" + " \"ModifyIndex\": 200,\n" + + " \"LockIndex\": 200,\n" + " \"Key\": \"zip\",\n" + " \"Flags\": 0,\n" + + " \"Value\": \"dGVzdA==\",\n" + + " \"Session\": \"adf4238a-882b-9ddc-4a9d-5b6758e4159e\"\n" + " }\n" + "]\n"))); + + ResponseEntity> response = client.getKVValues("context", null, 5L, 2); + + mockServerClient.verify(request().withMethod("GET") + .withPath("/v1/kv/context") + .withQueryStringParameters(Parameter.param("recurse"), Parameter.param("wait", "5s"), + Parameter.param("index", "2")), + VerificationTimes.exactly(1)); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getHeaders().getContentType().toString()).isEqualTo("application/json"); + assertThat(response.hasBody()).isTrue(); + + List values = response.getBody(); + + assertThat(values).hasSize(1); + GetValue value = values.get(0); + assertThat(value.getKey()).isEqualTo("zip"); + assertThat(value.getValue()).isEqualTo("dGVzdA=="); + assertThat(value.getDecodedValue()).isEqualTo("test"); + } + + @Test + void getKVValues_WithWaitTimeAndIndexAndAclToken() { + + mockServerClient + .when(request().withMethod("GET") + .withHeader(Header.header("X-Consul-Token", "aclToken")) + .withPath("/v1/kv/context")) + .respond(response().withStatusCode(200) + .withHeaders(new Header("Content-Type", "application/json")) + .withBody(json("[\n" + " {\n" + " \"CreateIndex\": 100,\n" + " \"ModifyIndex\": 200,\n" + + " \"LockIndex\": 200,\n" + " \"Key\": \"zip\",\n" + " \"Flags\": 0,\n" + + " \"Value\": \"dGVzdA==\",\n" + + " \"Session\": \"adf4238a-882b-9ddc-4a9d-5b6758e4159e\"\n" + " }\n" + "]\n"))); + + ResponseEntity> response = client.getKVValues("context", "aclToken", 5L, 2); + + mockServerClient.verify(request().withMethod("GET") + .withPath("/v1/kv/context") + .withHeader(Header.header("X-Consul-Token", "aclToken")) + .withQueryStringParameters(Parameter.param("recurse"), Parameter.param("wait", "5s"), + Parameter.param("index", "2")), + VerificationTimes.exactly(1)); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getHeaders().getContentType().toString()).isEqualTo("application/json"); + assertThat(response.hasBody()).isTrue(); + + List values = response.getBody(); + + assertThat(values).hasSize(1); + GetValue value = values.get(0); + assertThat(value.getKey()).isEqualTo("zip"); + assertThat(value.getValue()).isEqualTo("dGVzdA=="); + assertThat(value.getDecodedValue()).isEqualTo("test"); + } + + private void verifyRequestSentToConsul(String method, String path, int times) { + mockServerClient.verify(request().withMethod(method).withPath(path), VerificationTimes.exactly(times)); + } + +} diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java index 5a75dba7b..93147adba 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java @@ -16,36 +16,30 @@ package org.springframework.cloud.consul; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.actuate.health.HealthEndpoint; -import org.springframework.boot.actuate.health.Status; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * Integration test for {@link ConsulHealthIndicator} when its in the DOWN status. + * Integration test for {@link ConsulHealthIndicator} when it's in the DOWN status. * * @author Lomesh Patel (lomeshpatel) */ -@RunWith(SpringRunner.class) @SpringBootTest public class ConsulHealthIndicatorDownTest { - @MockBean + @MockitoBean private ConsulClient consulClient; @Autowired @@ -60,12 +54,11 @@ public void statusIsDownWhenConsulClientFailsToGetLeaderStatus() { @Test public void statusIsDownWhenConsulClientFailsToGetServices() { - Response leaderStatus = new Response<>("OK", 5150L, true, System.currentTimeMillis()); - when(consulClient.getStatusLeader()).thenReturn(leaderStatus); - when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))) - .thenThrow(new RuntimeException("no services")); + String leaderStatus = "OK"; + when(consulClient.getStatusLeader()).thenReturn(ResponseEntity.ok(leaderStatus)); + when(consulClient.getCatalogServices()).thenThrow(new RuntimeException("no services")); assertThat(this.healthEndpoint.health().getStatus()).as("health status was not DOWN").isEqualTo(Status.DOWN); - verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient).getCatalogServices(); } @EnableAutoConfiguration diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java index 454969b48..5b84edfbc 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java @@ -16,24 +16,21 @@ package org.springframework.cloud.consul; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.actuate.health.HealthEndpoint; -import org.springframework.boot.actuate.health.Status; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -48,7 +45,7 @@ @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulHealthIndicatorLightweightUpTest { - @SpyBean + @MockitoSpyBean private ConsulClient consulClient; @Autowired @@ -58,7 +55,7 @@ public class ConsulHealthIndicatorLightweightUpTest { public void statusIsUp() { assertThat(this.healthEndpoint.health().getStatus()).as("health status was not UP").isEqualTo(Status.UP); verify(consulClient).getStatusLeader(); - verify(consulClient, never()).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient, never()).getCatalogServices(); } @EnableAutoConfiguration diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java index 0f0e4d586..2b9c48076 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java @@ -16,24 +16,21 @@ package org.springframework.cloud.consul; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.actuate.health.HealthEndpoint; -import org.springframework.boot.actuate.health.Status; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; /** @@ -46,7 +43,7 @@ @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulHealthIndicatorUpTest { - @SpyBean + @MockitoSpyBean private ConsulClient consulClient; @Autowired @@ -56,7 +53,7 @@ public class ConsulHealthIndicatorUpTest { public void statusIsUp() { assertThat(this.healthEndpoint.health().getStatus()).as("health status was not UP").isEqualTo(Status.UP); verify(consulClient).getStatusLeader(); - verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient).getCatalogServices(); } @EnableAutoConfiguration diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java index 44d0e1f7e..8a9a27f8e 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java @@ -18,12 +18,13 @@ import java.util.HashMap; -import com.ecwid.consul.v1.ConsulClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.consul.ConsulContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -45,11 +46,11 @@ public class ConsulTestcontainers implements ApplicationContextInitializer spring-cloud-dependencies-parent org.springframework.cloud - 4.3.4-SNAPSHOT + 5.0.2-SNAPSHOT spring-cloud-consul-dependencies - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 4662eeef1..3ffd97867 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. @@ -106,7 +106,6 @@ org.awaitility awaitility - 4.3.0 test @@ -119,6 +118,11 @@ spring-cloud-test-support test + + org.springframework.boot + spring-boot-starter-aspectj + test + io.projectreactor reactor-test diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatch.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatch.java index f7df20af5..36d91d9a4 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatch.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatch.java @@ -23,18 +23,18 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; import io.micrometer.core.annotation.Timed; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.client.discovery.event.HeartbeatEvent; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulClient.QueryParams; +import org.springframework.cloud.consul.model.http.ConsulHeaders; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.SmartLifecycle; +import org.springframework.http.ResponseEntity; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -124,18 +124,16 @@ public void catalogServicesWatch() { index = this.catalogServicesIndex.get().longValue(); } - CatalogServicesRequest request = CatalogServicesRequest.newBuilder() - .setQueryParams(new QueryParams(this.properties.getCatalogServicesWatchTimeout(), index)) - .setToken(this.properties.getAclToken()) - .build(); - Response>> response = this.consul.getCatalogServices(request); - Long consulIndex = response.getConsulIndex(); + QueryParams queryParams = new QueryParams(this.properties.getCatalogServicesWatchTimeout(), index); + ResponseEntity>> response = this.consul + .getCatalogServices(properties.getAclToken(), queryParams); + Long consulIndex = ConsulHeaders.getConsulIndex(response); if (consulIndex != null) { this.catalogServicesIndex.set(BigInteger.valueOf(consulIndex)); } if (log.isTraceEnabled()) { - log.trace("Received services update from consul: " + response.getValue() + ", index: " + consulIndex); + log.trace("Received services update from consul: " + response.getBody() + ", index: " + consulIndex); } this.publisher.publishEvent(new HeartbeatEvent(this, consulIndex)); } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java index e370fa707..657fe1831 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul.discovery; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -25,6 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.TaskScheduler; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java index 35a4f2c45..e327e87ab 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java @@ -17,18 +17,17 @@ package org.springframework.cloud.consul.discovery; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Locale; import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; -import com.ecwid.consul.v1.health.HealthServicesRequest; -import com.ecwid.consul.v1.health.model.HealthService; - import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulClient.QueryParams; +import org.springframework.cloud.consul.model.http.health.HealthService; +import org.springframework.http.ResponseEntity; /** * @author Spencer Gibb @@ -54,7 +53,12 @@ public String description() { @Override public List getInstances(final String serviceId) { - return getInstances(serviceId, new QueryParams(this.properties.getConsistencyMode())); + ConsulDiscoveryProperties.ConsistencyMode consistencyModeProp = this.properties.getConsistencyMode(); + ConsulClient.ConsistencyMode consistencyMode = ConsulClient.ConsistencyMode.DEFAULT; + if (consistencyModeProp != null) { + consistencyMode = ConsulClient.ConsistencyMode.valueOf(consistencyModeProp.name().toUpperCase(Locale.ROOT)); + } + return getInstances(serviceId, new QueryParams(consistencyMode)); } public List getInstances(final String serviceId, final QueryParams queryParams) { @@ -66,41 +70,38 @@ public List getInstances(final String serviceId, final QueryPar } private void addInstancesToList(List instances, String serviceId, QueryParams queryParams) { - HealthServicesRequest.Builder requestBuilder = HealthServicesRequest.newBuilder() - .setPassing(properties.isQueryPassing()) - .setQueryParams(queryParams) - .setToken(properties.getAclToken()); String[] queryTags = properties.getQueryTagsForService(serviceId); + List tags = null; if (queryTags != null) { - requestBuilder.setTags(queryTags); + tags = Arrays.asList(queryTags); } - HealthServicesRequest request = requestBuilder.build(); - Response> services = this.client.getHealthServices(serviceId, request); + ResponseEntity> healthServices = client.getHealthServices(serviceId, + properties.isQueryPassing(), properties.getAclToken(), tags, queryParams); - for (HealthService service : services.getValue()) { + for (HealthService service : healthServices.getBody()) { instances.add(new ConsulServiceInstance(service, serviceId)); } } public List getAllInstances() { List instances = new ArrayList<>(); + Map> catalogServices = client + .getCatalogServices(properties.getAclToken(), QueryParams.DEFAULT) + .getBody(); - Response>> services = this.client - .getCatalogServices(CatalogServicesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - for (String serviceId : services.getValue().keySet()) { - addInstancesToList(instances, serviceId, QueryParams.DEFAULT); + for (String serviceId : catalogServices.keySet()) { + addInstancesToList(instances, serviceId, null); } return instances; } @Override public List getServices() { - CatalogServicesRequest request = CatalogServicesRequest.newBuilder() - .setQueryParams(QueryParams.DEFAULT) - .setToken(this.properties.getAclToken()) - .build(); - return new ArrayList<>(this.client.getCatalogServices(request).getValue().keySet()); + Map> catalogServices = client + .getCatalogServices(properties.getAclToken(), QueryParams.DEFAULT) + .getBody(); + return new ArrayList<>(catalogServices.keySet()); } @Override diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java index 393753598..101cc9556 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul.discovery; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -30,6 +28,7 @@ import org.springframework.cloud.commons.util.UtilAutoConfiguration; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index 967483d40..936402185 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.ConsistencyMode; - import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; @@ -687,4 +685,23 @@ public String toString() { } + public enum ConsistencyMode { + + /** + * Default consistency mode. + */ + DEFAULT, + + /** + * Stale consistency mode. + */ + STALE, + + /** + * Consistent1 consistency mode. + */ + CONSISTENT + + } + } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerUtils.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerUtils.java index e7267beca..605d7a4a9 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerUtils.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerUtils.java @@ -20,10 +20,10 @@ import java.net.InetAddress; import java.net.UnknownHostException; -import com.ecwid.consul.v1.health.model.HealthService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.cloud.consul.model.http.health.HealthService; import org.springframework.util.StringUtils; /** diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServiceInstance.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServiceInstance.java index 4633274a1..0b527b41e 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServiceInstance.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServiceInstance.java @@ -21,9 +21,10 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.health.model.HealthService; +import org.jspecify.annotations.Nullable; import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.consul.model.http.health.HealthService; import org.springframework.core.style.ToStringCreator; import static org.springframework.cloud.consul.discovery.ConsulServerUtils.findHost; @@ -39,18 +40,15 @@ public ConsulServiceInstance(HealthService healthService, String serviceId) { this.healthService = healthService; } - public ConsulServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure, + public ConsulServiceInstance(@Nullable String instanceId, String serviceId, String host, int port, boolean secure, Map metadata, List tags) { super(instanceId, serviceId, host, port, secure, metadata); } - public ConsulServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure) { + public ConsulServiceInstance(@Nullable String instanceId, String serviceId, String host, int port, boolean secure) { super(instanceId, serviceId, host, port, secure); } - public ConsulServiceInstance() { - } - private static Map getMetadata(HealthService healthService) { Map metadata = healthService.getService().getMeta(); if (metadata == null) { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ReregistrationPredicate.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ReregistrationPredicate.java index 3308886d9..ecb6c8c4b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ReregistrationPredicate.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ReregistrationPredicate.java @@ -16,7 +16,7 @@ package org.springframework.cloud.consul.discovery; -import com.ecwid.consul.v1.OperationException; +import org.springframework.web.client.HttpStatusCodeException; /** * Predicate on whether to re-register service. @@ -30,12 +30,12 @@ public interface ReregistrationPredicate { * @param e OperationException * @return if the exception is eligible for re-registration */ - boolean isEligible(OperationException e); + boolean isEligible(HttpStatusCodeException e); /** * Default implementation that performs re-registration when the status code is either * 404 or 500. */ - ReregistrationPredicate DEFAULT = e -> (e.getStatusCode() == 404 || e.getStatusCode() == 500); + ReregistrationPredicate DEFAULT = e -> (e.getStatusCode().value() == 404 || e.getStatusCode().is5xxServerError()); } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java index be4c83882..c1945d9cc 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java @@ -22,18 +22,17 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Supplier; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.OperationException; -import com.ecwid.consul.v1.agent.model.NewService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.NewService; +import org.springframework.cloud.consul.model.http.health.Check.CheckStatus; import org.springframework.cloud.consul.serviceregistry.ApplicationStatusProvider; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler; - -import static com.ecwid.consul.v1.health.model.Check.CheckStatus; +import org.springframework.web.client.HttpStatusCodeException; /** * Created by nicu on 11.03.2015. @@ -155,7 +154,7 @@ private void possiblyReregisterIfFails(Runnable consulClientCall) { try { consulClientCall.run(); } - catch (OperationException e) { + catch (HttpStatusCodeException e) { if (this.ttlScheduler.heartbeatProperties.isReregisterServiceOnFailure() && this.ttlScheduler.reregistrationPredicate.isEligible(e)) { log.warn(e.getMessage()); @@ -164,8 +163,8 @@ private void possiblyReregisterIfFails(Runnable consulClientCall) { if (log.isInfoEnabled()) { log.info("Re-register " + registeredService); } - this.ttlScheduler.client.agentServiceRegister(registeredService, - this.ttlScheduler.discoveryProperties.getAclToken()); + this.ttlScheduler.client.agentServiceRegister( + this.ttlScheduler.discoveryProperties.getAclToken(), registeredService); } else { log.warn("The service to re-register is not found."); diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java index 394bd2033..e2025b3ee 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java @@ -16,13 +16,13 @@ package org.springframework.cloud.consul.discovery.configclient; -import com.ecwid.consul.v1.ConsulClient; import jakarta.annotation.PostConstruct; 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.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java index 7a61a91b4..f6b5d586b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java @@ -18,11 +18,9 @@ import java.util.Collections; -import com.ecwid.consul.v1.ConsulClient; - -import org.springframework.boot.BootstrapContext; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.commons.util.InetUtils; @@ -31,6 +29,7 @@ import org.springframework.cloud.config.client.ConfigServerConfigDataLocationResolver; import org.springframework.cloud.config.client.ConfigServerInstanceProvider; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.cloud.consul.discovery.ConditionalOnConsulDiscoveryEnabled; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; @@ -60,8 +59,7 @@ public void initialize(BootstrapRegistry registry) { return null; } ConsulProperties consulProperties = context.get(ConsulProperties.class); - return ConsulAutoConfiguration.createConsulClient(consulProperties, - ConsulAutoConfiguration.createConsulRawClientBuilder()); + return ConsulAutoConfiguration.createNewConsulClient(consulProperties); }); registry.registerIfAbsent(ConsulDiscoveryClient.class, context -> { if (!isDiscoveryEnabled(context)) { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClient.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClient.java index 377495053..006fd3028 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClient.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClient.java @@ -16,17 +16,8 @@ package org.springframework.cloud.consul.discovery.reactive; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; -import com.ecwid.consul.v1.health.HealthServicesRequest; -import com.ecwid.consul.v1.health.model.HealthService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; @@ -34,8 +25,9 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; -import org.springframework.cloud.consul.discovery.ConsulServiceInstance; /** * Consul version of {@link ReactiveDiscoveryClient}. @@ -51,9 +43,13 @@ public class ConsulReactiveDiscoveryClient implements ReactiveDiscoveryClient { private final ConsulDiscoveryProperties properties; + // TODO: implement ReactiveConsulClient to remove the need for subscribeOn() + private final ConsulDiscoveryClient blockingClient; + public ConsulReactiveDiscoveryClient(ConsulClient client, ConsulDiscoveryProperties properties) { this.client = client; this.properties = properties; + blockingClient = new ConsulDiscoveryClient(client, properties); } @Override @@ -64,10 +60,7 @@ public String description() { @Override public Flux getInstances(String serviceId) { return Flux.defer(() -> { - List instances = new ArrayList<>(); - for (HealthService healthService : getHealthServices(serviceId)) { - instances.add(new ConsulServiceInstance(healthService, serviceId)); - } + List instances = blockingClient.getInstances(serviceId); return Flux.fromIterable(instances); }).onErrorResume(exception -> { logger.error("Error getting instances from Consul.", exception); @@ -75,31 +68,11 @@ public Flux getInstances(String serviceId) { }).subscribeOn(Schedulers.boundedElastic()); } - private List getHealthServices(String serviceId) { - HealthServicesRequest.Builder requestBuilder = HealthServicesRequest.newBuilder() - .setPassing(properties.isQueryPassing()) - .setQueryParams(QueryParams.DEFAULT) - .setToken(properties.getAclToken()); - String[] queryTags = properties.getQueryTagsForService(serviceId); - if (queryTags != null) { - requestBuilder.setTags(queryTags); - } - HealthServicesRequest request = requestBuilder.build(); - - Response> services = client.getHealthServices(serviceId, request); - - return services == null ? Collections.emptyList() : services.getValue(); - } - @Override public Flux getServices() { return Flux.defer(() -> { - CatalogServicesRequest request = CatalogServicesRequest.newBuilder() - .setToken(properties.getAclToken()) - .setQueryParams(QueryParams.DEFAULT) - .build(); - Response>> services = client.getCatalogServices(request); - return services == null ? Flux.empty() : Flux.fromIterable(services.getValue().keySet()); + List services = blockingClient.getServices(); + return services == null ? Flux.empty() : Flux.fromIterable(services); }).onErrorResume(exception -> { logger.error("Error getting services from Consul.", exception); return Flux.empty(); diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java index ac9d11873..edaf8dcb6 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul.discovery.reactive; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -34,6 +32,7 @@ import org.springframework.cloud.commons.util.UtilAutoConfiguration; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConditionalOnConsulDiscoveryEnabled; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.context.annotation.Bean; @@ -67,7 +66,7 @@ public ConsulReactiveDiscoveryClient consulReactiveDiscoveryClient(ConsulClient } @Bean - @ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator") + @ConditionalOnClass(name = "org.springframework.boot.health.contributor.ReactiveHealthIndicator") @ConditionalOnDiscoveryHealthIndicatorEnabled public ReactiveDiscoveryClientHealthIndicator consulReactiveDiscoveryClientHealthIndicator( ConsulReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java index 4b4ecf03e..f51bbf270 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java @@ -18,16 +18,15 @@ import java.util.Optional; -import com.ecwid.consul.v1.health.model.Check.CheckStatus; - -import org.springframework.boot.actuate.health.HealthComponent; -import org.springframework.boot.actuate.health.HealthEndpoint; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.actuate.endpoint.HealthDescriptor; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.contributor.Status; import org.springframework.cloud.consul.discovery.HeartbeatProperties; +import org.springframework.cloud.consul.model.http.health.Check.CheckStatus; -import static org.springframework.boot.actuate.health.Status.DOWN; -import static org.springframework.boot.actuate.health.Status.OUT_OF_SERVICE; -import static org.springframework.boot.actuate.health.Status.UP; +import static org.springframework.boot.health.contributor.Status.DOWN; +import static org.springframework.boot.health.contributor.Status.OUT_OF_SERVICE; +import static org.springframework.boot.health.contributor.Status.UP; /** * Leverages Spring Boot Actuator health endpoint to determine the current health of the @@ -65,7 +64,7 @@ public CheckStatus currentStatus() { String healthGroup = heartbeatProperties.getActuatorHealthGroup(); String[] path = healthGroup == null ? new String[0] : new String[] { healthGroup }; return Optional.ofNullable(healthEndpoint.healthForPath(path)) - .map(HealthComponent::getStatus) + .map(HealthDescriptor::getStatus) .map(this::healthStatusToCheckStatus) .orElse(CheckStatus.UNKNOWN); } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ApplicationStatusProvider.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ApplicationStatusProvider.java index 8761335f8..fa8db91b2 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ApplicationStatusProvider.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ApplicationStatusProvider.java @@ -16,7 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.health.model.Check.CheckStatus; +import org.springframework.cloud.consul.model.http.health.Check.CheckStatus; /** * Provides the current health of the application represented in Consul's diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java index d0799414c..909cb1101 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java @@ -22,14 +22,13 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.agent.model.NewService; - import org.springframework.cloud.client.discovery.ManagementServerPortUtils; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.cloud.commons.util.IdUtils; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.HeartbeatProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.util.Assert; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java index c5d9e38a3..65cb7bc3c 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java @@ -19,10 +19,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.boot.web.server.context.WebServerInitializedEvent; import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.context.ApplicationContext; import org.springframework.retry.annotation.Retryable; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; @@ -40,8 +41,8 @@ public class ConsulAutoServiceRegistration extends AbstractAutoServiceRegistrati public ConsulAutoServiceRegistration(ConsulServiceRegistry serviceRegistry, AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties, - ConsulAutoRegistration registration) { - super(serviceRegistry, autoServiceRegistrationProperties); + ConsulAutoRegistration registration, ApplicationContext applicationContext) { + super(applicationContext, serviceRegistry, autoServiceRegistrationProperties); this.properties = properties; this.registration = registration; } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java index c95deab77..bf6187203 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java @@ -56,9 +56,9 @@ public class ConsulAutoServiceRegistrationAutoConfiguration { @ConditionalOnMissingBean public ConsulAutoServiceRegistration consulAutoServiceRegistration(ConsulServiceRegistry registry, AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties, - ConsulAutoRegistration consulRegistration) { + ConsulAutoRegistration consulRegistration, ApplicationContext applicationContext) { return new ConsulAutoServiceRegistration(registry, autoServiceRegistrationProperties, properties, - consulRegistration); + consulRegistration, applicationContext); } @Bean diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java index 3e5cd2559..dd53ca781 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java @@ -16,8 +16,8 @@ package org.springframework.cloud.consul.serviceregistry; -import org.springframework.boot.web.context.ConfigurableWebServerApplicationContext; -import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.boot.web.server.context.ConfigurableWebServerApplicationContext; +import org.springframework.boot.web.server.context.WebServerInitializedEvent; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; import org.springframework.context.event.SmartApplicationListener; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistration.java index 0a7a02986..8cc25e02f 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistration.java @@ -19,11 +19,10 @@ import java.net.URI; import java.util.Map; -import com.ecwid.consul.v1.agent.model.NewService; - -import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; /** * @author Spencer Gibb @@ -72,7 +71,7 @@ public boolean isSecure() { @Override public URI getUri() { - return DefaultServiceInstance.getUri(this); + return ServiceInstance.createUri(this); } @Override diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java index be7b6b284..68c12b49b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java @@ -18,24 +18,22 @@ import java.util.List; -import com.ecwid.consul.ConsulException; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.NewService; -import com.ecwid.consul.v1.health.HealthChecksForServiceRequest; -import com.ecwid.consul.v1.health.model.Check; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.HeartbeatProperties; import org.springframework.cloud.consul.discovery.TtlScheduler; +import org.springframework.cloud.consul.model.http.agent.NewService; +import org.springframework.cloud.consul.model.http.health.Check; +import org.springframework.core.log.LogMessage; +import org.springframework.http.ResponseEntity; import org.springframework.util.ReflectionUtils; -import static org.springframework.boot.actuate.health.Status.OUT_OF_SERVICE; -import static org.springframework.boot.actuate.health.Status.UP; +import static org.springframework.boot.health.contributor.Status.OUT_OF_SERVICE; +import static org.springframework.boot.health.contributor.Status.UP; /** * @author Spencer Gibb @@ -64,14 +62,15 @@ public ConsulServiceRegistry(ConsulClient client, ConsulDiscoveryProperties prop public void register(ConsulRegistration reg) { log.info("Registering service with consul: " + reg.getService()); try { - this.client.agentServiceRegister(reg.getService(), this.properties.getAclToken()); + ResponseEntity response = this.client.agentServiceRegister(this.properties.getAclToken(), + reg.getService()); NewService service = reg.getService(); if (this.heartbeatProperties.isEnabled() && this.ttlScheduler != null && service.getCheck() != null && service.getCheck().getTtl() != null) { this.ttlScheduler.add(reg.getService()); } } - catch (ConsulException e) { + catch (RuntimeException e) { if (this.properties.isFailFast()) { log.error("Error registering service with consul: " + reg.getService(), e); ReflectionUtils.rethrowRuntimeException(e); @@ -99,10 +98,16 @@ public void close() { @Override public void setStatus(ConsulRegistration registration, String status) { if (status.equalsIgnoreCase(OUT_OF_SERVICE.getCode())) { - this.client.agentServiceSetMaintenance(registration.getInstanceId(), true); + ResponseEntity response = this.client.agentServiceSetMaintenance(registration.getInstanceId(), true, + null, this.properties.getAclToken()); + log.debug(LogMessage.format("Set status for service with consul: %s, status %s, response %s", + registration.getInstanceId(), status, response)); } else if (status.equalsIgnoreCase(UP.getCode())) { - this.client.agentServiceSetMaintenance(registration.getInstanceId(), false); + ResponseEntity response = this.client.agentServiceSetMaintenance(registration.getInstanceId(), false, + null, this.properties.getAclToken()); + log.debug(LogMessage.format("Set status for service with consul: %s, status %s, response %s", + registration.getInstanceId(), status, response)); } else { throw new IllegalArgumentException("Unknown status: " + status); @@ -113,9 +118,8 @@ else if (status.equalsIgnoreCase(UP.getCode())) { @Override public Object getStatus(ConsulRegistration registration) { String serviceId = registration.getServiceId(); - Response> response = this.client.getHealthChecksForService(serviceId, - HealthChecksForServiceRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - List checks = response.getValue(); + ResponseEntity> response = this.client.getHealthChecksForService(serviceId); + List checks = response.getBody(); for (Check check : checks) { if (check.getServiceId().equals(registration.getInstanceId())) { diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java index d07094c96..402e69a7e 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.AllNestedConditions; @@ -26,6 +24,7 @@ import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.HeartbeatProperties; import org.springframework.cloud.consul.discovery.TtlScheduler; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java index 2e4f82064..531d7d4d6 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java @@ -16,18 +16,17 @@ package org.springframework.cloud.consul.support; -import com.ecwid.consul.v1.ConsulClient; - import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.actuate.health.HealthEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; import org.springframework.cloud.consul.ConditionalOnConsulEnabled; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.HeartbeatProperties; diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories index f4ad92eaa..aafb38b56 100644 --- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.consul.discovery.configclient.ConsulDiscoveryClientConfigServiceBootstrapConfiguration -org.springframework.boot.BootstrapRegistryInitializer=\ +org.springframework.boot.bootstrap.BootstrapRegistryInitializer=\ org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerBootstrapper diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java index dc595f3aa..0dec0c277 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java @@ -18,8 +18,7 @@ import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,7 +29,6 @@ import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -38,7 +36,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulDiscoveryClientAclTests.MyTestConfig.class, properties = { "spring.application.name=testConsulDiscoveryAcl", "spring.cloud.consul.discovery.preferIpAddress=true", diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java index 3501c05b0..6066dfd12 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java @@ -20,8 +20,7 @@ import java.util.Map; import org.apache.http.conn.util.InetAddressUtils; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -31,7 +30,6 @@ import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -40,7 +38,6 @@ * @author Spencer Gibb * @author Tim Ysewyn */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulDiscoveryClientCustomizedTests.MyTestConfig.class, properties = { "spring.application.name=testConsulDiscovery2", "spring.cloud.consul.discovery.instanceId=testConsulDiscovery2Id", diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java index 034c8e255..c88df2c7b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java @@ -18,8 +18,7 @@ import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,7 +28,6 @@ import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -37,7 +35,6 @@ /** * @author Glen Lockhart */ -@RunWith(SpringRunner.class) @SpringBootTest( properties = { "spring.application.name=testConsulDiscoveryHttps", "spring.cloud.consul.discovery.prefer-ip-address=true", "spring.cloud.consul.discovery.scheme=https" }, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java index ceff581cc..f0df8c27b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java @@ -18,8 +18,6 @@ import java.util.List; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.agent.model.NewService; import org.junit.jupiter.api.Test; import org.testcontainers.consul.ConsulContainer; import org.testcontainers.junit.jupiter.Container; @@ -32,7 +30,9 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; @@ -73,7 +73,7 @@ public void contextLoads() { NewService newService = new NewService(); newService.setId("myTestService2-NoPort"); newService.setName("myTestService2-NoPort"); - client.agentServiceRegister(newService); + client.agentServiceRegister(null, newService); List instances = discoveryClient.getInstances("myTestService2-NoPort"); assertThat(instances.size()).isEqualTo(1); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientProbeTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientProbeTests.java index b32bbcfbc..4061396ac 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientProbeTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientProbeTests.java @@ -16,14 +16,16 @@ package org.springframework.cloud.consul.discovery; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.OperationException; -import com.ecwid.consul.v1.Response; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; + +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.HttpClientErrorException; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; @@ -32,7 +34,7 @@ /** * Unit tests for {@link ConsulDiscoveryClient} probe API. */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ConsulDiscoveryClientProbeTests { @Mock @@ -46,16 +48,16 @@ public class ConsulDiscoveryClientProbeTests { @Test public void probeSucceeds() { - when(consulClient.getStatusLeader()) - .thenReturn(new Response<>("5150", 5150L, false, System.currentTimeMillis())); + when(consulClient.getStatusLeader()).thenReturn(ResponseEntity.ok("5150")); discoveryClient.probe(); verify(consulClient).getStatusLeader(); } @Test public void probeFails() { - when(consulClient.getStatusLeader()).thenThrow(new OperationException(5150, "5150", "No leader")); - assertThatThrownBy(() -> discoveryClient.probe()).isInstanceOf(OperationException.class) + when(consulClient.getStatusLeader()) + .thenThrow(new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "No leader")); + assertThatThrownBy(() -> discoveryClient.probe()).isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("No leader"); verify(consulClient).getStatusLeader(); } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientQueryTagsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientQueryTagsTests.java index 1b94eb750..fb0baa955 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientQueryTagsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientQueryTagsTests.java @@ -19,8 +19,6 @@ import java.util.Arrays; import java.util.List; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.agent.model.NewService; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -197,18 +197,18 @@ protected static class TestConfig { @PostConstruct void init() { - consulClient.agentServiceRegister(ConsulDiscoveryClientQueryTagsTests.QA_WEST_SERVICE); - consulClient.agentServiceRegister(ConsulDiscoveryClientQueryTagsTests.QA_EAST_SERVICE); - consulClient.agentServiceRegister(ConsulDiscoveryClientQueryTagsTests.PROD_WEST_SERVICE); - consulClient.agentServiceRegister(ConsulDiscoveryClientQueryTagsTests.PROD_EAST_SERVICE); + consulClient.agentServiceRegister(null, ConsulDiscoveryClientQueryTagsTests.QA_WEST_SERVICE); + consulClient.agentServiceRegister(null, ConsulDiscoveryClientQueryTagsTests.QA_EAST_SERVICE); + consulClient.agentServiceRegister(null, ConsulDiscoveryClientQueryTagsTests.PROD_WEST_SERVICE); + consulClient.agentServiceRegister(null, ConsulDiscoveryClientQueryTagsTests.PROD_EAST_SERVICE); } @PreDestroy void destroy() { - consulClient.agentServiceDeregister(ConsulDiscoveryClientQueryTagsTests.QA_WEST_SERVICE.getId()); - consulClient.agentServiceDeregister(ConsulDiscoveryClientQueryTagsTests.QA_EAST_SERVICE.getId()); - consulClient.agentServiceDeregister(ConsulDiscoveryClientQueryTagsTests.PROD_WEST_SERVICE.getId()); - consulClient.agentServiceDeregister(ConsulDiscoveryClientQueryTagsTests.PROD_EAST_SERVICE.getId()); + consulClient.agentServiceDeregister(null, ConsulDiscoveryClientQueryTagsTests.QA_WEST_SERVICE.getId()); + consulClient.agentServiceDeregister(null, ConsulDiscoveryClientQueryTagsTests.QA_EAST_SERVICE.getId()); + consulClient.agentServiceDeregister(null, ConsulDiscoveryClientQueryTagsTests.PROD_WEST_SERVICE.getId()); + consulClient.agentServiceDeregister(null, ConsulDiscoveryClientQueryTagsTests.PROD_EAST_SERVICE.getId()); } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java index 14e83e5d3..2c53e326a 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java @@ -18,21 +18,19 @@ import java.util.List; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; 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.EnableDiscoveryClient; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulClient.QueryParams; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -41,7 +39,6 @@ * @author Spencer Gibb * @author Joe Athman */ -@RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.application.name=testConsulDiscovery", "spring.cloud.consul.discovery.prefer-ip-address=true", "spring.cloud.consul.discovery.metadata[foo]=bar" }, classes = ConsulDiscoveryClientTests.MyTestConfig.class, webEnvironment = RANDOM_PORT) @@ -68,9 +65,9 @@ public void getInstancesForServiceWorks() { @Test public void getInstancesForServiceRespectsQueryParams() { - Response> catalogDatacenters = this.consulClient.getCatalogDatacenters(); + ResponseEntity> catalogDatacenters = this.consulClient.getCatalogDatacenters(null); - List dataCenterList = catalogDatacenters.getValue(); + List dataCenterList = catalogDatacenters.getBody(); assertThat(dataCenterList.isEmpty()).as("no data centers found").isFalse(); List instances = this.discoveryClient.getInstances("testConsulDiscovery", new QueryParams(dataCenterList.get(0))); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulHeartbeatTaskTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulHeartbeatTaskTests.java index 5f4f924fd..f9b260243 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulHeartbeatTaskTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulHeartbeatTaskTests.java @@ -16,22 +16,25 @@ package org.springframework.cloud.consul.discovery; +import java.nio.charset.StandardCharsets; import java.util.Collections; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.OperationException; -import com.ecwid.consul.v1.agent.model.NewService; -import com.ecwid.consul.v1.health.model.Check; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.support.StaticListableBeanFactory; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtilsProperties; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.TtlScheduler.ConsulHeartbeatTask; +import org.springframework.cloud.consul.model.http.agent.NewService; +import org.springframework.cloud.consul.model.http.health.Check; import org.springframework.cloud.consul.serviceregistry.ApplicationStatusProvider; +import org.springframework.http.HttpStatus; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -60,7 +63,7 @@ public class ConsulHeartbeatTaskTests { private ApplicationStatusProvider applicationStatusProvider; - @Before + @BeforeEach public void setUp() { this.heartbeatProperties = new HeartbeatProperties(); this.discoveryProperties = new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties())); @@ -85,12 +88,14 @@ public void enableReRegistrationForAgentCheckPass() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - given(consulClient.agentCheckPass("service:" + serviceId)).willThrow(new OperationException(500, - "Internal Server Error", "CheckID \"service:service-A\" does not have associated TTL")); + given(consulClient.agentCheckPass("service:" + serviceId, null, null)) + .willThrow(new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8)); consulHeartbeatTask.run(); ArgumentCaptor serviceCaptor = ArgumentCaptor.forClass(NewService.class); ArgumentCaptor tokenCaptor = ArgumentCaptor.forClass(String.class); - verify(consulClient, atLeastOnce()).agentServiceRegister(serviceCaptor.capture(), tokenCaptor.capture()); + verify(consulClient, atLeastOnce()).agentServiceRegister(tokenCaptor.capture(), serviceCaptor.capture()); assertThat(serviceCaptor.getValue()).isSameAs(service); } @@ -105,12 +110,14 @@ public void enableReRegistrationForAgentCheckWarn() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - given(consulClient.agentCheckWarn("service:" + serviceId)).willThrow(new OperationException(500, - "Internal Server Error", "CheckID \"service:service-A\" does not have associated TTL")); + given(consulClient.agentCheckWarn("service:" + serviceId, null, null)) + .willThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8)); consulHeartbeatTask.run(); ArgumentCaptor serviceCaptor = ArgumentCaptor.forClass(NewService.class); ArgumentCaptor tokenCaptor = ArgumentCaptor.forClass(String.class); - verify(consulClient, atLeastOnce()).agentServiceRegister(serviceCaptor.capture(), tokenCaptor.capture()); + verify(consulClient, atLeastOnce()).agentServiceRegister(tokenCaptor.capture(), serviceCaptor.capture()); assertThat(serviceCaptor.getValue()).isSameAs(service); } @@ -125,12 +132,14 @@ public void enableReRegistrationForAgentCheckFail() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - given(consulClient.agentCheckFail("service:" + serviceId)).willThrow(new OperationException(500, - "Internal Server Error", "CheckID \"service:service-A\" does not have associated TTL")); + given(consulClient.agentCheckFail("service:" + serviceId, null, null)) + .willThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8)); consulHeartbeatTask.run(); ArgumentCaptor serviceCaptor = ArgumentCaptor.forClass(NewService.class); ArgumentCaptor tokenCaptor = ArgumentCaptor.forClass(String.class); - verify(consulClient, atLeastOnce()).agentServiceRegister(serviceCaptor.capture(), tokenCaptor.capture()); + verify(consulClient, atLeastOnce()).agentServiceRegister(tokenCaptor.capture(), serviceCaptor.capture()); assertThat(serviceCaptor.getValue()).isSameAs(service); } @@ -144,9 +153,11 @@ public void eligibleForReRegistrationWith404() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - OperationException operationException = new OperationException(404, "Internal Server Error", - "CheckID \"service:service-A\" does not have associated TTL"); - given(consulClient.agentCheckPass("service:" + serviceId)).willThrow(operationException); + HttpClientErrorException operationException = new HttpClientErrorException(HttpStatus.NOT_FOUND, + "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8); + given(consulClient.agentCheckPass("service:" + serviceId, null, null)).willThrow(operationException); consulHeartbeatTask.run(); } @@ -160,28 +171,31 @@ public void notEligibleForReRegistration() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - OperationException operationException = new OperationException(400, "Internal Server Error", - "CheckID \"service:service-A\" does not have associated TTL"); - given(consulClient.agentCheckPass("service:" + serviceId)).willThrow(operationException); + HttpClientErrorException operationException = new HttpClientErrorException(HttpStatus.BAD_REQUEST, + "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8); + given(consulClient.agentCheckPass("service:" + serviceId, null, null)).willThrow(operationException); assertThatThrownBy(consulHeartbeatTask::run).isSameAs(operationException); } @Test public void enableReRegistrationWithCustomPredicate() { TtlScheduler ttlScheduler = new TtlScheduler(heartbeatProperties, discoveryProperties, consulClient, - e -> e.getStatusContent().endsWith("does not have associated TTL"), applicationStatusProviders); + e -> e.getMessage().endsWith("does not have associated TTL"), applicationStatusProviders); ConsulHeartbeatTask consulHeartbeatTask = new ConsulHeartbeatTask(serviceId, ttlScheduler, () -> Check.CheckStatus.PASSING); heartbeatProperties.setReregisterServiceOnFailure(true); NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - given(consulClient.agentCheckPass("service:" + serviceId)).willThrow(new OperationException(400, - "Internal Server Error", "CheckID \"service:service-A\" does not have associated TTL")); + given(consulClient.agentCheckPass("service:" + serviceId, null, null)) + .willThrow(new HttpClientErrorException("CheckID \"service:service-A\" does not have associated TTL", + HttpStatus.BAD_REQUEST, "Bad Request", null, null, null)); consulHeartbeatTask.run(); ArgumentCaptor serviceCaptor = ArgumentCaptor.forClass(NewService.class); ArgumentCaptor tokenCaptor = ArgumentCaptor.forClass(String.class); - verify(consulClient, atLeastOnce()).agentServiceRegister(serviceCaptor.capture(), tokenCaptor.capture()); + verify(consulClient, atLeastOnce()).agentServiceRegister(tokenCaptor.capture(), serviceCaptor.capture()); assertThat(serviceCaptor.getValue()).isSameAs(service); } @@ -195,9 +209,11 @@ public void disableReRegistration() { NewService service = new NewService(); service.setId(serviceId); ttlScheduler.add(service); - OperationException operationException = new OperationException(500, "Internal Server Error", - "CheckID \"service:service-A\" does not have associated TTL"); - given(consulClient.agentCheckPass("service:" + serviceId)).willThrow(operationException); + HttpServerErrorException operationException = new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, + "Internal Server Error", + "CheckID \"service:service-A\" does not have associated TTL".getBytes(StandardCharsets.UTF_8), + StandardCharsets.UTF_8); + given(consulClient.agentCheckPass("service:" + serviceId, null, null)).willThrow(operationException); assertThatThrownBy(consulHeartbeatTask::run).isSameAs(operationException); } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java index c85c76048..1bc997b96 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLoadbalancerClientTests.java @@ -16,8 +16,7 @@ package org.springframework.cloud.consul.discovery; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; @@ -28,7 +27,6 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -36,7 +34,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.application.name=testConsulLoadBalancer", "spring.cloud.consul.discovery.prefer-ip-address=true", "spring.cloud.consul.discovery.metadata.foo=bar" }, webEnvironment = RANDOM_PORT) diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerUtilsTest.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerUtilsTest.java index 6dbc6e0ba..5903cfa45 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerUtilsTest.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerUtilsTest.java @@ -16,7 +16,7 @@ package org.springframework.cloud.consul.discovery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java index 0895f8ebe..b96f3c179 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java @@ -19,7 +19,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java index ace2441b0..ff6d6ebfd 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java @@ -19,7 +19,6 @@ import java.time.Duration; import java.util.Collections; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -27,16 +26,17 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.support.StaticListableBeanFactory; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.health.Check; import org.springframework.cloud.consul.serviceregistry.ApplicationStatusProvider; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.CRITICAL; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.PASSING; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.WARNING; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.CRITICAL; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.PASSING; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.WARNING; /** * Unit tests for {@link TtlScheduler}. @@ -97,7 +97,7 @@ void agentCheckFailGetsCalledWhenApplicationStatusIsCritical() { verify(client).agentCheckFail("service:" + serviceId, null, null); } - private String addServiceToSchedulerWhenApplicationStatusIs(CheckStatus checkStatus) { + private String addServiceToSchedulerWhenApplicationStatusIs(Check.CheckStatus checkStatus) { String serviceId = "svc-" + checkStatus.name(); when(applicationStatusProvider.currentStatus()).thenReturn(checkStatus); ttlScheduler.add(serviceId); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfigurationTests.java index c15a9631a..a9bbf38f5 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfigurationTests.java @@ -16,8 +16,8 @@ package org.springframework.cloud.consul.discovery.configclient; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; @@ -36,7 +36,7 @@ public class ConsulConfigServerAutoConfigurationTests { private ConfigurableApplicationContext context; - @After + @AfterEach public void close() { if (this.context != null) { this.context.close(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java index 9b7baf15c..edb7d1952 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperIT.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Set; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.agent.model.NewService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.AfterEach; @@ -42,7 +40,9 @@ import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; @@ -73,14 +73,13 @@ void before() { ConsulProperties consulProperties = new ConsulProperties(); consulProperties.setHost(consul.getHost()); consulProperties.setPort(consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT)); - ConsulClient client = ConsulAutoConfiguration.createConsulClient(consulProperties, - ConsulAutoConfiguration.createConsulRawClientBuilder()); + ConsulClient client = ConsulAutoConfiguration.createNewConsulClient(consulProperties); NewService newService = new NewService(); newService.setId("consul-configserver"); newService.setName("consul-configserver"); newService.setAddress(mockServer.getHost()); newService.setPort(mockServer.getServerPort()); - client.agentServiceRegister(newService); + client.agentServiceRegister(null, newService); } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java index e450dc0e0..8aebb5cfd 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperNoConfigClientTests.java @@ -16,19 +16,27 @@ package org.springframework.cloud.consul.discovery.configclient; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.test.ClassPathExclusions; -import org.springframework.cloud.test.ModifiedClassPathRunner; +import org.springframework.cloud.test.ModifiedClassPathExtension; -@RunWith(ModifiedClassPathRunner.class) +@ExtendWith(ModifiedClassPathExtension.class) @ClassPathExclusions({ "spring-cloud-config-client-*.jar", "spring-cloud-config-server-*.jar" }) public class ConsulConfigServerBootstrapperNoConfigClientTests { + @BeforeEach + public void init() { + // FIXME: why do I need to do this? (fails in maven build without it. + TomcatURLStreamHandlerFactory.disable(); + } + @Test public void enabledAddsInstanceProviderFn() { new SpringApplicationBuilder(TestConfig.class) diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java index d9a525ade..bb8c1987b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapperTests.java @@ -19,14 +19,13 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; -import com.ecwid.consul.transport.TransportException; import org.apache.commons.logging.Log; import org.junit.jupiter.api.Test; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.bind.BindContext; import org.springframework.boot.context.properties.bind.BindHandler; @@ -109,8 +108,7 @@ public void enabledAddsInstanceProviderFn() { .get(ConfigServerInstanceProvider.Function.class); assertThatThrownBy(() -> providerFn.apply("id", event.getBootstrapContext().get(Binder.class), event.getBootstrapContext().get(BindHandler.class), mock(Log.class))) - .isInstanceOf(TransportException.class) - .hasMessageContaining("org.apache.http.conn.HttpHostConnectException: Connect to localhost:8500") + .hasMessageContaining("Connection refused") .as("Should have tried to reach out to Consul to get config server instance") .isNotNull(); })) diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index d97e90d3d..462d90d71 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -17,10 +17,10 @@ package org.springframework.cloud.consul.discovery.configclient; import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -28,7 +28,7 @@ import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.cloud.test.ClassPathExclusions; -import org.springframework.cloud.test.ModifiedClassPathRunner; +import org.springframework.cloud.test.ModifiedClassPathExtension; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.AbstractApplicationContext; @@ -40,19 +40,19 @@ /** * @author Dave Syer */ -@RunWith(ModifiedClassPathRunner.class) -@ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" }) +@ExtendWith(ModifiedClassPathExtension.class) +@ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aspectj-*.jar" }) public class DiscoveryClientConfigServiceAutoConfigurationTests { private ConfigurableApplicationContext context; - @Before + @BeforeEach public void init() { // FIXME: why do I need to do this? (fails in maven build without it. TomcatURLStreamHandlerFactory.disable(); } - @After + @AfterEach public void close() { if (this.context != null) { if (this.context.getParent() != null) { @@ -73,7 +73,7 @@ public void onWhenRequested() throws Exception { "spring.cloud.consul.discovery.test.enabled:true", "spring.application.name=discoveryclientconfigservicetest", "spring.jmx.enabled=false", "spring.cloud.consul.discovery.port:7001", "spring.cloud.consul.discovery.hostname:foo", - "spring.cloud.config.discovery.service-id:configserver"); + "spring.cloud.config.discovery.service-id:configserver", "spring.cloud.bootstrap.enabled=true"); assertThat(this.context.getBeanNamesForType(ConsulConfigServerAutoConfiguration.class).length).isEqualTo(1); ConsulDiscoveryClient client = this.context.getParent().getBean(ConsulDiscoveryClient.class); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java index 5fd382e77..305593d8d 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java @@ -18,12 +18,11 @@ import java.util.Arrays; -import com.ecwid.consul.v1.health.model.HealthService; - import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.ConsulServiceInstance; +import org.springframework.cloud.consul.model.http.health.HealthService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfigurationTests.java index 9c1b2221e..78148eb91 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfigurationTests.java @@ -91,8 +91,8 @@ public void worksWithoutWebflux() { } @Test - public void worksWithoutActuator() { - contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")).run(context -> { + public void worksWithoutHealth() { + contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.health")).run(context -> { assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class); assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); }); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientTests.java index 8660aea15..9b96307f5 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientTests.java @@ -19,11 +19,6 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.catalog.CatalogServicesRequest; -import com.ecwid.consul.v1.health.HealthServicesRequest; -import com.ecwid.consul.v1.health.model.HealthService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -34,7 +29,11 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.commons.util.InetUtils; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.ConsulClient.QueryParams; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.health.HealthService; +import org.springframework.http.ResponseEntity; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -74,19 +73,19 @@ public void verifyDefaults() { @Test public void shouldReturnEmptyFluxOfServicesWhenConsulFails() { Flux services = client.getServices(); - when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))) + when(consulClient.getCatalogServices(any(), any())) .thenThrow(new RuntimeException("Possible runtime exception")); StepVerifier.create(services).expectNextCount(0).expectComplete().verify(); - verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient).getCatalogServices(any(), any()); } @Test public void shouldReturnFluxOfServices() { Flux services = client.getServices(); - when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))).thenReturn(consulServicesResponse()); + when(consulClient.getCatalogServices(any(), any())).thenReturn(consulServicesResponse()); StepVerifier.create(services).expectNext("my-service").expectComplete().verify(); verify(properties).getAclToken(); - verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient).getCatalogServices(any(), any()); } @Test @@ -101,65 +100,73 @@ public void aclTokenToStringMasked() { @Test public void shouldReturnFluxOfServicesWithAclToken() { when(properties.getAclToken()).thenReturn("myAclToken"); - when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))).thenReturn(consulServicesResponse()); + when(consulClient.getCatalogServices(any(), any())).thenReturn(consulServicesResponse()); Flux services = client.getServices(); StepVerifier.create(services).expectNext("my-service").expectComplete().verify(); verify(properties, times(1)).getAclToken(); - verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient).getCatalogServices(any(), any()); } @Test public void shouldReturnEmptyFluxForNonExistingService() { configureCommonProperties(); - when(consulClient.getHealthServices(eq("nonexistent-service"), any(HealthServicesRequest.class))) + when(consulClient.getHealthServices(eq("nonexistent-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class))) .thenReturn(emptyConsulInstancesResponse()); Flux instances = client.getInstances("nonexistent-service"); StepVerifier.create(instances).expectNextCount(0).expectComplete().verify(); verify(properties).getAclToken(); - verify(consulClient).getHealthServices(eq("nonexistent-service"), any()); + verify(consulClient).getHealthServices(eq("nonexistent-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class)); } @Test public void shouldReturnEmptyFluxWhenConsulFails() { configureCommonProperties(); - when(consulClient.getHealthServices(eq("existing-service"), any(HealthServicesRequest.class))) + when(consulClient.getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class))) .thenThrow(new RuntimeException("Possible runtime exception")); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(0).expectComplete().verify(); - verify(consulClient).getHealthServices(eq("existing-service"), any()); + verify(consulClient).getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class)); } @Test public void shouldReturnFluxOfServiceInstances() { configureCommonProperties(); - Response> response = consulInstancesResponse(); - when(consulClient.getHealthServices(eq("existing-service"), any(HealthServicesRequest.class))) + ResponseEntity> response = consulInstancesResponse(); + when(consulClient.getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class))) .thenReturn(response); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); verify(properties).getAclToken(); verify(properties).getQueryTagsForService("existing-service"); verify(properties).isQueryPassing(); - verify(consulClient).getHealthServices(eq("existing-service"), any()); + verify(consulClient).getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class)); } @Test public void shouldReturnFluxOfServiceInstancesWithAclToken() { configureCommonProperties(); when(properties.getAclToken()).thenReturn("aclToken"); - Response> response = consulInstancesResponse(); - when(consulClient.getHealthServices(eq("existing-service"), any(HealthServicesRequest.class))) + ResponseEntity> response = consulInstancesResponse(); + when(consulClient.getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class))) .thenReturn(response); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); verify(properties, times(1)).getAclToken(); verify(properties).getQueryTagsForService("existing-service"); verify(properties).isQueryPassing(); - verify(consulClient).getHealthServices(eq("existing-service"), any()); + verify(consulClient).getHealthServices(eq("existing-service"), any(boolean.class), any(), any(List.class), + any(QueryParams.class)); } - private Response>> consulServicesResponse() { - return new Response<>(singletonMap("my-service", singletonList("")), 0L, true, System.currentTimeMillis()); + private ResponseEntity>> consulServicesResponse() { + return ResponseEntity.ok(singletonMap("my-service", singletonList(""))); } private void configureCommonProperties() { @@ -167,11 +174,11 @@ private void configureCommonProperties() { when(properties.isQueryPassing()).thenReturn(false); } - private Response> emptyConsulInstancesResponse() { - return new Response<>(emptyList(), 0L, true, System.currentTimeMillis()); + private ResponseEntity> emptyConsulInstancesResponse() { + return ResponseEntity.ok(emptyList()); } - private Response> consulInstancesResponse() { + private ResponseEntity> consulInstancesResponse() { HealthService healthService = mock(HealthService.class); HealthService.Service service = mock(HealthService.Service.class); @@ -180,7 +187,8 @@ private Response> consulInstancesResponse() { when(service.getPort()).thenReturn(443); lenient().when(service.getTags()).thenReturn(singletonList("secure=true")); - return new Response<>(singletonList(healthService), 0L, true, System.currentTimeMillis()); + return ResponseEntity.ok(singletonList(healthService)); // , 0L, true, + // System.currentTimeMillis()); } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProviderTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProviderTests.java index aa1c14ca4..2c3091a65 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProviderTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProviderTests.java @@ -18,7 +18,6 @@ import java.util.stream.Stream; -import com.ecwid.consul.v1.health.model.Check; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,20 +28,21 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.actuate.health.HealthComponent; -import org.springframework.boot.actuate.health.HealthEndpoint; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.health.actuate.endpoint.IndicatedHealthDescriptor; +import org.springframework.boot.health.contributor.Status; import org.springframework.cloud.consul.discovery.HeartbeatProperties; +import org.springframework.cloud.consul.model.http.health.Check; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import static org.springframework.boot.actuate.health.Status.DOWN; -import static org.springframework.boot.actuate.health.Status.OUT_OF_SERVICE; -import static org.springframework.boot.actuate.health.Status.UNKNOWN; -import static org.springframework.boot.actuate.health.Status.UP; +import static org.springframework.boot.health.contributor.Status.DOWN; +import static org.springframework.boot.health.contributor.Status.OUT_OF_SERVICE; +import static org.springframework.boot.health.contributor.Status.UNKNOWN; +import static org.springframework.boot.health.contributor.Status.UP; /** * Unit tests for {@link ActuatorHealthApplicationStatusProvider}. @@ -58,9 +58,6 @@ class ActuatorHealthApplicationStatusProviderTests { @Mock private HeartbeatProperties heartbeatProperties; - @Mock - private HealthComponent healthComponent; - @InjectMocks private ActuatorHealthApplicationStatusProvider applicationStatusProvider; @@ -73,21 +70,21 @@ static Stream currentCheckStatusBasedOnHealthStatusArgs() { @ParameterizedTest(name = "{index} ==> health status ''{0}'' should map to check status ''{1}''") @MethodSource("currentCheckStatusBasedOnHealthStatusArgs") void currentCheckStatusBasedOnHealthStatus(Status healthStatus, Check.CheckStatus expectedCheckStatus) { - when(healthComponent.getStatus()).thenReturn(healthStatus); - when(healthEndpoint.healthForPath(new String[0])).thenReturn(healthComponent); + IndicatedHealthDescriptor descriptor = mock(IndicatedHealthDescriptor.class); + when(descriptor.getStatus()).thenReturn(healthStatus); + when(healthEndpoint.healthForPath(new String[0])).thenReturn(descriptor); assertThat(applicationStatusProvider.currentStatus()).isEqualTo(expectedCheckStatus); verify(healthEndpoint).healthForPath(new String[0]); - verify(healthComponent).getStatus(); } @Test void currentStatusUsesHealthGroupIfSpecified() { when(heartbeatProperties.getActuatorHealthGroup()).thenReturn("5150"); - when(healthComponent.getStatus()).thenReturn(OUT_OF_SERVICE); - when(healthEndpoint.healthForPath(new String[] { "5150" })).thenReturn(healthComponent); + IndicatedHealthDescriptor descriptor = mock(IndicatedHealthDescriptor.class); + when(descriptor.getStatus()).thenReturn(Status.OUT_OF_SERVICE); + when(healthEndpoint.healthForPath(new String[] { "5150" })).thenReturn(descriptor); assertThat(applicationStatusProvider.currentStatus()).isEqualTo(Check.CheckStatus.CRITICAL); verify(healthEndpoint).healthForPath(new String[] { "5150" }); - verify(healthComponent).getStatus(); } @Test @@ -95,7 +92,6 @@ void currentStatusHandlesNullHealthStatusGracefully() { when(healthEndpoint.healthForPath(new String[0])).thenReturn(null); assertThat(applicationStatusProvider.currentStatus()).isEqualTo(Check.CheckStatus.UNKNOWN); verify(healthEndpoint).healthForPath(new String[0]); - verifyNoInteractions(healthComponent); } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java index b35e6f7e8..9f084d769 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java @@ -16,9 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -26,18 +24,17 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.support.ConsulHeartbeatAutoConfiguration; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Niko Tung */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.TestConfig.class, properties = { "spring.application.name=myConsulServiceRegistryHealthCheckTtlDeregisterCriticalServiceAfter-N", "spring.cloud.consul.discovery.health-check-critical-timeout=1m", diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java index 06a2ecbad..99dcabea9 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java @@ -16,9 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -27,10 +25,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -38,7 +36,6 @@ /** * @author Lomesh Patel */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoRegistrationHealthCheckHeadersTests.TestConfig.class, properties = { "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", "spring.cloud.consul.discovery.health-check-headers.X-Config-Token=ACCESSTOKEN" }, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java index 6942ca147..0fcceaddf 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java @@ -16,9 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -27,10 +25,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -38,7 +36,6 @@ /** * @author Patrick Hi */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.TestConfig.class, properties = { "spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify", "spring.cloud.consul.discovery.health-check-tls-skip-verify=true" }, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java index 7d9cca6bf..c7cb000cc 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java @@ -16,9 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -27,10 +25,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -38,7 +36,6 @@ /** * @author varnson */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.TestConfig.class, properties = { "spring.application.name=myTestService-IncludeHostnameInInstanceId", "spring.cloud.consul.discovery.include-hostname-in-instance-id=true", diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java index 4914cd886..cb48a2b1b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,11 +26,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -42,7 +39,6 @@ /** * @author Jon Freedman */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationDisabledTests.TestConfig.class, properties = { "spring.application.name=myTestNotDeRegisteredService", "spring.cloud.consul.discovery.instanceId=myTestNotDeRegisteredService-D", @@ -74,8 +70,7 @@ public void contextLoads() { } private void checkService(final boolean expected) { - final Response> response = this.consul.getAgentServices(); - final Map services = response.getValue(); + final Map services = this.consul.getAgentServices().getBody(); final Service service = services.get("myTestNotDeRegisteredService-D"); if (expected) { assertThat(service).as("service was not registered").isNotNull(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java index 9ada3c3d4..7e06655ce 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,10 +26,11 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -42,7 +39,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedAgentAddressTests.TestConfig.class, properties = { "spring.application.name=myTestService-AA", "spring.cloud.consul.discovery.instanceId=myTestService1-AA", @@ -57,8 +53,7 @@ public class ConsulAutoServiceRegistrationCustomizedAgentAddressTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + Map services = this.consul.getAgentServices().getBody(); Service service = services.get("myTestService1-AA"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java index 9036fa1dc..8b4b2acef 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java @@ -16,11 +16,9 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,11 +27,11 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.cloud.test.TestSocketUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT; @@ -41,7 +39,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.TestConfig.class, properties = { "spring.application.name=myTestService-DiscoveryPort" }, webEnvironment = DEFINED_PORT) @ContextConfiguration(initializers = ConsulTestcontainers.class) @@ -53,14 +50,14 @@ public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests { @Autowired private ConsulDiscoveryProperties properties; - @BeforeClass + @BeforeAll public static void initClass() { Integer port = TestSocketUtils.findAvailableTcpPort(); System.setProperty("spring.cloud.consul.discovery.port", port.toString()); System.setProperty("server.port", port.toString()); } - @AfterClass + @AfterAll public static void teardownClass() { System.clearProperty("spring.cloud.consul.discovery.port"); System.clearProperty("server.port"); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java index 613691604..e3d5b6b60 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -32,10 +28,12 @@ import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -43,7 +41,6 @@ /** * @author Jin Zhang */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.TestConfig.class, properties = { "spring.application.name=myTestService-WithGroup", "spring.cloud.consul.discovery.instanceId=myTestService1-WithGroup", @@ -60,8 +57,8 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceGroupTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService1-WithGroup"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java index 0d74e8a7f..3372785ae 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,10 +26,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -41,7 +39,6 @@ /** * @author Sixian Liu */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.TestConfig.class, properties = { "spring.application.name=myTestService-WithZone", "spring.cloud.consul.discovery.instanceId=myTestService1-WithZone", @@ -56,8 +53,8 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceZoneTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService1-WithZone"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java index 4a5ca7121..d9c4ffa23 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties; @@ -31,11 +27,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -46,7 +44,6 @@ * @author Alex Antonov (aantonov) * @author Lomesh Patel (lomeshpatel) */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.TestConfig.class, properties = { "spring.application.name=myTestService-GG", "spring.cloud.consul.discovery.instanceId=myTestService1-GG", @@ -69,8 +66,8 @@ public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests { @Test public void contextLoads() { - final Response> response = this.consul.getAgentServices(); - final Map services = response.getValue(); + final ResponseEntity> response = this.consul.getAgentServices(); + final Map services = response.getBody(); final Service service = services.get("myTestService1-GG"); assertThat(service).as("service was null").isNotNull(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java index 442ac9c3a..c4d154634 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java @@ -20,14 +20,7 @@ import java.util.List; import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import com.ecwid.consul.v1.health.HealthChecksForServiceRequest; -import com.ecwid.consul.v1.health.model.Check; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -35,11 +28,14 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; +import org.springframework.cloud.consul.model.http.health.Check; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -48,7 +44,6 @@ * @author Spencer Gibb * @author Venil Noronha */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedPropsTests.TestPropsConfig.class, properties = { "spring.application.name=myTestService-B", "spring.cloud.consul.discovery.instanceId=myTestService1-B", "spring.cloud.consul.discovery.port=4452", "spring.cloud.consul.discovery.hostname=myhost", @@ -70,8 +65,8 @@ public class ConsulAutoServiceRegistrationCustomizedPropsTests { @Test public void propertiesAreCorrect() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService1-B"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort()).as("service port is discovery port").isEqualTo(4452); @@ -91,9 +86,8 @@ public void propertiesAreCorrect() { assertThat(service.getMeta()).as("property metadata contains the wrong entries") .containsExactlyInAnyOrderEntriesOf(entries); - Response> checkResponse = this.consul.getHealthChecksForService("myTestService-B", - HealthChecksForServiceRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - List checks = checkResponse.getValue(); + ResponseEntity> checkResponse = this.consul.getHealthChecksForService("myTestService-B"); + List checks = checkResponse.getBody(); assertThat(checks).as("checks was wrong size").hasSize(0); } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java index e4dad69aa..aaead4d61 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,10 +26,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -41,7 +39,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedServiceNameTests.TestConfig.class, properties = { "spring.application.name=myTestService-CC", "spring.cloud.consul.discovery.instanceId=myTestService1-CC", @@ -55,8 +52,8 @@ public class ConsulAutoServiceRegistrationCustomizedServiceNameTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService1-CC"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java index 9d306c199..1bccb73f1 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java @@ -18,20 +18,18 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -39,7 +37,6 @@ /** * @author Piotr Wielgolaski */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedServletContextTests.TestConfig.class, properties = { "spring.application.name=myTestService-WithServletContext", "spring.cloud.consul.discovery.instanceId=myTestService1-WithServletContext", @@ -53,8 +50,8 @@ public class ConsulAutoServiceRegistrationCustomizedServletContextTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService1-WithServletContext"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java index fa48701d9..137fc2013 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedTests.java @@ -16,8 +16,7 @@ package org.springframework.cloud.consul.serviceregistry; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; @@ -29,9 +28,9 @@ import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -39,7 +38,6 @@ /** * @author Marcin Biegan */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationCustomizedTests.MyTestConfig.class, properties = { "spring.application.name=testCustomAutoServiceRegistration" }, webEnvironment = RANDOM_PORT) @ContextConfiguration(initializers = ConsulTestcontainers.class) @@ -71,9 +69,10 @@ public static class MyTestConfig { @Bean public CustomAutoRegistration consulAutoServiceRegistration(ConsulServiceRegistry serviceRegistry, AutoServiceRegistrationProperties autoServiceRegistrationProperties, - ConsulDiscoveryProperties properties, ConsulAutoRegistration registration) { + ConsulDiscoveryProperties properties, ConsulAutoRegistration registration, + ApplicationContext applicationContext) { return new CustomAutoRegistration(serviceRegistry, autoServiceRegistrationProperties, properties, - registration); + registration, applicationContext); } } @@ -83,8 +82,9 @@ public static class CustomAutoRegistration extends ConsulAutoServiceRegistration @Autowired public CustomAutoRegistration(ConsulServiceRegistry serviceRegistry, AutoServiceRegistrationProperties autoServiceRegistrationProperties, - ConsulDiscoveryProperties properties, ConsulAutoRegistration registration) { - super(serviceRegistry, autoServiceRegistrationProperties, properties, registration); + ConsulDiscoveryProperties properties, ConsulAutoRegistration registration, + ApplicationContext applicationContext) { + super(serviceRegistry, autoServiceRegistrationProperties, properties, registration, applicationContext); } @Override diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java index e3405f4a5..c35815251 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultCheckTests.java @@ -16,17 +16,15 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.ConsulClient; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationCustomizedPropsTests.TestPropsConfig; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -35,7 +33,6 @@ * @author Spencer Gibb * @deprecated remove in Edgware */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = TestPropsConfig.class, properties = { "spring.application.name=myTestServiceDefaultChecks", "spring.cloud.consul.discovery.instanceId=myTestServiceDefaultChecks", @@ -64,6 +61,7 @@ public void contextLoads() { // accept // it is going to have to suffice + // FIXME: // final Response> checksForService = // consul.getHealthChecksForService("myTestServiceDefaultChecks", // QueryParams.DEFAULT); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java index 4eecf664d..4921d3cb1 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,10 +26,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -41,7 +39,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationDefaultPortTests.TestConfig.class, properties = { "spring.application.name=myTestService2-DD", "spring.cloud.consul.discovery.instanceId=myTestService2-DD" }, @@ -54,8 +51,8 @@ public class ConsulAutoServiceRegistrationDefaultPortTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("myTestService2-DD"); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java index d58e2d476..3284e7a82 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java @@ -18,13 +18,12 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; @@ -63,15 +62,14 @@ private void testAutoRegistrationDisabled(String testName, String disablePropert .withInitializer(new ConsulTestcontainers()) .run(context -> { - assertThat(context).doesNotHaveBean(ConsulAutoServiceRegistration.class); - assertThat(context).doesNotHaveBean(ConsulAutoServiceRegistrationListener.class); - assertThat(context).doesNotHaveBean(ConsulAutoRegistration.class); - assertThat(context).doesNotHaveBean(ConsulRegistrationCustomizer.class); + assertThat(context).doesNotHaveBean(ConsulAutoServiceRegistration.class) + .doesNotHaveBean(ConsulAutoServiceRegistrationListener.class) + .doesNotHaveBean(ConsulAutoRegistration.class) + .doesNotHaveBean(ConsulRegistrationCustomizer.class); ConsulClient consul = context.getBean(ConsulClient.class); - Response> response = consul.getAgentServices(); - Map services = response.getValue(); + Map services = consul.getAgentServices().getBody(); Service service = services.get(testName); assertThat(service).as("service was registered").isNull(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java index d9cfb0df7..5b9f0585f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java @@ -16,12 +16,10 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.ConsulException; -import com.ecwid.consul.v1.ConsulClient; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -29,13 +27,12 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import static org.hamcrest.Matchers.isA; - /** * @author Spencer Gibb * @author Venil Noronha @@ -44,18 +41,16 @@ @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulAutoServiceRegistrationFailFastTests { - @Rule - public ExpectedException exception = ExpectedException.none(); - - @Ignore + @Disabled @Test public void testFailFastEnabled() { - this.exception.expectCause(isA(ConsulException.class)); - new SpringApplicationBuilder(TestConfig.class) - .properties("spring.application.name=testregistrationfails-fast", - "spring.jmx.default-domain=testautoregfailfast", "server.port=0", - "spring.cloud.consul.discovery.failFast=true") - .run(); + Assertions.assertThatThrownBy(() -> { + new SpringApplicationBuilder(TestConfig.class) + .properties("spring.application.name=testregistrationfails-fast", + "spring.jmx.default-domain=testautoregfailfast", "server.port=0", + "spring.cloud.consul.discovery.failFast=true") + .run(); + }).isInstanceOf(IllegalStateException.class); } @SpringBootConfiguration @@ -66,7 +61,7 @@ protected static class TestConfig { @Bean public ConsulClient consulClient() { - return new ConsulClient("localhost", 4321); + return Mockito.mock(ConsulClient.class); } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java index a294fc483..7cf1bc252 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java @@ -20,9 +20,7 @@ import java.util.List; import java.util.stream.Collectors; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,11 +28,11 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -42,7 +40,6 @@ /** * @author Alexey Savchuk (devpreview) */ -@RunWith(SpringRunner.class) @SpringBootTest( classes = { ConsulAutoServiceRegistrationManagementCustomizerTests.TestConfig.class, ConsulAutoServiceRegistrationManagementCustomizerTests.ManagementConfig.class }, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java index 9c7bf59eb..76537100a 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,11 +26,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +41,6 @@ /** * @author Dmitry Zhikharev (jihor) */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationManagementDisabledServiceTests.TestConfig.class, properties = { "spring.application.name=myTestService-NM", "spring.cloud.consul.discovery.instanceId=myTestService1-NM", @@ -61,8 +58,8 @@ public class ConsulAutoServiceRegistrationManagementDisabledServiceTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service mgmtService = services.get("myTestService-NM-0-management"); assertThat(mgmtService).as("Management service was not null").isNull(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java index 2dec95f9a..845be8096 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -30,11 +26,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -44,7 +42,6 @@ * @author Aleksandr Tarasov (aatarasov) * @author Lomesh Patel (lomeshpatel) */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationManagementServiceTests.TestConfig.class, properties = { "spring.application.name=myTestService-EE", "spring.cloud.consul.discovery.registerHealthCheck=false", "management.server.port=4452" }, @@ -60,8 +57,8 @@ public class ConsulAutoServiceRegistrationManagementServiceTests { @Test public void contextLoads() { - final Response> response = this.consul.getAgentServices(); - final Map services = response.getValue(); + final ResponseEntity> response = this.consul.getAgentServices(); + final Map services = response.getBody(); final Service service = services.get("myTestService-EE-0"); assertThat(service).as("service was null").isNotNull(); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java index e0a4b3611..636c098e4 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java @@ -18,20 +18,18 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; @@ -39,7 +37,6 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulAutoServiceRegistrationNonWebTests.TestConfig.class, properties = { "spring.application.name=consulNonWebTest", "server.port=32111" }, webEnvironment = NONE) @ContextConfiguration(initializers = ConsulTestcontainers.class) @@ -55,8 +52,8 @@ public class ConsulAutoServiceRegistrationNonWebTests { public void contextLoads() { assertThat(this.autoServiceRegistration).as("ConsulAutoServiceRegistration was created").isNotNull(); - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get("consulNonWebTest"); assertThat(service).as("service was registered").isNull(); // no port to listen, // hence no diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java index f60131644..1427993b6 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java @@ -16,28 +16,24 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.ConsulException; -import com.ecwid.consul.v1.ConsulClient; -import org.hamcrest.Matchers; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.test.system.OutputCaptureRule; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import static org.hamcrest.Matchers.isA; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * @author Spencer Gibb @@ -45,25 +41,22 @@ */ @DirtiesContext @ContextConfiguration(initializers = ConsulTestcontainers.class) +@ExtendWith(OutputCaptureExtension.class) public class ConsulAutoServiceRegistrationRetryTests { - @Rule - public ExpectedException exception = ExpectedException.none(); - - @Rule - public OutputCaptureRule output = new OutputCaptureRule(); - - @Ignore + // @Disabled @Test - public void testRetry() { - this.exception.expectCause(isA(ConsulException.class)); - try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) - .properties("spring.application.name=testregistrationretry", "spring.jmx.default-domain=testautoregretry", - "spring.cloud.consul.retry.max-attempts=2", "logging.level.org.springframework.retry=DEBUG", - "server.port=0") - .run()) { - this.output.expect(Matchers.containsString("Retry: count=")); - } + public void testRetry(CapturedOutput output) { + assertThatThrownBy(() -> { + try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) + .properties("spring.application.name=testregistrationretry", + "spring.jmx.default-domain=testautoregretry", "spring.cloud.consul.retry.max-attempts=2", + "logging.level.org.springframework.retry=DEBUG", "server.port=0") + .run()) { + // try with resources + } + }).cause().hasMessageContaining("Connection refused"); + assertThat(output).contains("Retry: count="); } @SpringBootConfiguration @@ -72,11 +65,6 @@ public void testRetry() { ConsulAutoServiceRegistrationAutoConfiguration.class }) protected static class TestConfig { - @Bean - public ConsulClient consulClient() { - return new ConsulClient("localhost", 4321); - } - } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java index 2ff179943..86c510c0c 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTests.java @@ -18,11 +18,7 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; @@ -31,13 +27,16 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.consul.ConsulAutoConfiguration; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static org.springframework.cloud.consul.serviceregistry.ConsulAutoRegistration.normalizeForDns; @@ -45,7 +44,6 @@ * @author Spencer Gibb * @author Venil Noronha */ -@RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.application.name=myTestService1-FF::something" }, webEnvironment = RANDOM_PORT) @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulAutoServiceRegistrationTests { @@ -61,8 +59,8 @@ public class ConsulAutoServiceRegistrationTests { @Test public void contextLoads() { - Response> response = this.consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = this.consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get(this.registration.getInstanceId()); assertThat(service).as("service was null").isNotNull(); assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0); @@ -82,19 +80,19 @@ public void normalizeForDnsWorks() { assertThat(normalizeForDns("ab::c1")).isEqualTo("ab-c1"); } - @Test(expected = IllegalArgumentException.class) + @Test public void normalizedFailsIfFirstCharIsNumber() { - normalizeForDns("9abc"); + assertThatThrownBy(() -> normalizeForDns("9abc")).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void normalizedFailsIfFirstCharIsNotAlpha() { - normalizeForDns(":abc"); + assertThatThrownBy(() -> normalizeForDns(":abc")).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void normalizedFailsIfLastCharIsNotAlphaNumeric() { - normalizeForDns("abc:"); + assertThatThrownBy(() -> normalizeForDns("abc:")).isInstanceOf(IllegalArgumentException.class); } @SpringBootConfiguration diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckTests.java index 19a9a3190..82eeaabac 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckTests.java @@ -20,25 +20,23 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.health.HealthChecksForServiceRequest; -import com.ecwid.consul.v1.health.model.Check; -import com.ecwid.consul.v1.health.model.Check.CheckStatus; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.TtlScheduler; +import org.springframework.cloud.consul.model.http.health.Check; +import org.springframework.cloud.consul.model.http.health.Check.CheckStatus; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Bean; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.CRITICAL; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.PASSING; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.CRITICAL; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.PASSING; /** * Integration test that verifies the TTL checks basic functionality. @@ -103,12 +101,11 @@ private void assertThatConsulTtlCheckIsInStatus(String serviceName, CheckStatus } private Check getCheckForService(String serviceName) { - Response> checkResponse = this.consul.getHealthChecksForService(serviceName, - HealthChecksForServiceRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - if (checkResponse.getValue() == null || checkResponse.getValue().isEmpty()) { + ResponseEntity> checkResponse = this.consul.getHealthChecksForService(serviceName); + if (checkResponse.getBody() == null || checkResponse.getBody().isEmpty()) { return null; } - return checkResponse.getValue().get(0); + return checkResponse.getBody().get(0); } @ConsulAutoServiceRegistrationIntegrationTestConfig @@ -116,7 +113,7 @@ static class TestConfig { @Bean ApplicationStatusProvider alwaysPassingApplicationStatusProvider() { - return () -> CheckStatus.PASSING; + return () -> PASSING; } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckWithActuatorHealthTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckWithActuatorHealthTests.java index 93a8d4a0d..9c6545829 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckWithActuatorHealthTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckWithActuatorHealthTests.java @@ -19,26 +19,24 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.QueryParams; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.health.HealthChecksForServiceRequest; -import com.ecwid.consul.v1.health.model.Check; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthIndicator; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.HealthIndicator; +import org.springframework.boot.health.contributor.Status; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.consul.ConsulClient; +import org.springframework.cloud.consul.model.http.health.Check; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Bean; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.ContextConfiguration; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.CRITICAL; -import static com.ecwid.consul.v1.health.model.Check.CheckStatus.PASSING; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.CRITICAL; +import static org.springframework.cloud.consul.model.http.health.Check.CheckStatus.PASSING; /** * Integration test that verifies the TTL checks when the @@ -94,12 +92,11 @@ private void assertThatConsulTtlCheckIsInStatus(Check.CheckStatus expectedStatus } private Check getCheckForService(String serviceName) { - Response> checkResponse = this.consul.getHealthChecksForService(serviceName, - HealthChecksForServiceRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); - if (checkResponse.getValue() == null || checkResponse.getValue().isEmpty()) { + ResponseEntity> checkResponse = this.consul.getHealthChecksForService(serviceName); + if (checkResponse.getBody() == null || checkResponse.getBody().isEmpty()) { return null; } - return checkResponse.getValue().get(0); + return checkResponse.getBody().get(0); } @ConsulAutoServiceRegistrationIntegrationTestConfig diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulHeartbeatAutoConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulHeartbeatAutoConfigurationTests.java index 333fabf28..cb8e1e69e 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulHeartbeatAutoConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulHeartbeatAutoConfigurationTests.java @@ -16,14 +16,14 @@ package org.springframework.cloud.consul.serviceregistry; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.Test; -import org.springframework.boot.actuate.health.HealthEndpoint; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.health.actuate.endpoint.HealthEndpoint; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.HeartbeatProperties; import org.springframework.cloud.consul.discovery.TtlScheduler; diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java index b87bea11c..700338685 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java @@ -19,9 +19,7 @@ import java.lang.reflect.Field; import java.util.Map; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -32,18 +30,17 @@ import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.consul.discovery.TtlScheduler; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.support.ConsulHeartbeatAutoConfiguration; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** * @author Alexey Savchuk */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulServiceRegistryCheckTtlTests.TestConfig.class, properties = { "spring.application.name=myConsulServiceRegistryCheckTtlTestService-S", "spring.cloud.consul.discovery.heartbeat.enabled=true" }, diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryDisabledTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryDisabledTests.java index 9217a7463..84db92045 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryDisabledTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryDisabledTests.java @@ -18,16 +18,16 @@ import java.util.Map; -import com.ecwid.consul.v1.ConsulClient; -import com.ecwid.consul.v1.Response; -import com.ecwid.consul.v1.agent.model.Service; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.discovery.HeartbeatProperties; +import org.springframework.cloud.consul.model.http.agent.Service; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.context.annotation.Configuration; +import org.springframework.http.ResponseEntity; import static org.assertj.core.api.Assertions.assertThat; @@ -56,8 +56,8 @@ private void testAutoRegistrationDisabled(String testName, String disablePropert ConsulClient consul = context.getBean(ConsulClient.class); - Response> response = consul.getAgentServices(); - Map services = response.getValue(); + ResponseEntity> response = consul.getAgentServices(); + Map services = response.getBody(); Service service = services.get(testName); assertThat(service).as("service was registered").isNull(); }); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java index 4d7f56022..656638335 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java @@ -19,9 +19,7 @@ import java.util.Collections; import java.util.List; -import com.ecwid.consul.v1.agent.model.NewService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; @@ -32,9 +30,9 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.cloud.consul.model.http.agent.NewService; import org.springframework.cloud.consul.test.ConsulTestcontainers; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -42,8 +40,8 @@ /** * @author Spencer Gibb */ -@RunWith(SpringRunner.class) -@SpringBootTest(properties = "spring.cloud.consul.discovery.query-passing=true", webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = { "spring.cloud.consul.discovery.query-passing=true", "debug=true" }, + webEnvironment = RANDOM_PORT) @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulServiceRegistryTests { diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index fb0013ae3..a2b88b92e 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 7d487af86..9adce832e 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 62dd47513..86d881d51 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index ad5e8945e..5e8e60ea4 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. @@ -46,6 +46,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-resttestclient + test + org.testcontainers consul diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataOrderingIntegrationTests.java b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataOrderingIntegrationTests.java index ebdfc2765..b18b38b80 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataOrderingIntegrationTests.java +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataOrderingIntegrationTests.java @@ -19,15 +19,15 @@ import java.util.Map; import java.util.UUID; -import com.ecwid.consul.v1.ConsulClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.cloud.consul.ConsulClient; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.cloud.consul.config.ConsulConfigProperties; import org.springframework.cloud.consul.test.ConsulTestcontainers; diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 43f012bd9..f0824613b 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 7734d0265..586bf10b8 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index b40e2351f..ebbd11011 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 07b7f1258..f6aaccee1 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index ac32c918b..65d5de336 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 4.3.3-SNAPSHOT + 5.0.2-SNAPSHOT .. spring-cloud-starter-consul