datacenters = new HashMap<>();
-
- /**
- * Tag to query for in service list if one is not listed in serverListQueryTags.
- * Multiple tags can be specified with a comma separated value.
- */
- private String defaultQueryTag;
-
- /**
- * Add the 'passing` parameter to /v1/health/service/serviceName. This pushes health
- * check passing to the server.
- */
- private boolean queryPassing = false;
-
- /** Register as a service in consul. */
- private boolean register = true;
-
- /** Disable automatic de-registration of service in consul. */
- private boolean deregister = true;
-
- /** Register health check in consul. Useful during development of a service. */
- private boolean registerHealthCheck = true;
-
- /**
- * Throw exceptions during service registration if true, otherwise, log warnings
- * (defaults to true).
- */
- private boolean failFast = true;
-
- /**
- * Skips certificate verification during service checks if true, otherwise runs
- * certificate verification.
- */
- private Boolean healthCheckTlsSkipVerify;
-
- /**
- * Order of the discovery client used by `CompositeDiscoveryClient` for sorting
- * available clients.
- */
- private int order = 0;
-
- @SuppressWarnings("unused")
- private ConsulDiscoveryProperties() {
- this(new InetUtils(new InetUtilsProperties()));
- }
-
- public ConsulDiscoveryProperties(InetUtils inetUtils) {
- this.managementTags.add(MANAGEMENT);
- this.hostInfo = inetUtils.findFirstNonLoopbackHostInfo();
- this.ipAddress = this.hostInfo.getIpAddress();
- this.hostname = this.hostInfo.getHostname();
- }
-
- /**
- * Gets the tag to use when looking up the instances for a particular service. If the
- * service has an entry in {@link #serverListQueryTags} that will be used. Otherwise
- * the content of {@link #defaultQueryTag} will be used.
- * @param serviceId the service whose instances are being looked up
- * @return the tag to filter the service instances by or null if no tags are
- * configured for the service and the default query tag is not configured
- */
- public String getQueryTagForService(String serviceId) {
- String tag = this.serverListQueryTags.get(serviceId);
- return tag != null ? tag : this.defaultQueryTag;
- }
-
- /**
- * Gets the array of tags to use when looking up the instances for a particular
- * service. If the service has an entry in {@link #serverListQueryTags} that will be
- * used. Otherwise the content of {@link #defaultQueryTag} will be used. This differs
- * from {@link #getQueryTagForService(String)} in that it assumes the configured tag
- * property value may represent multiple tags when separated by commas. When the tag
- * property is set to a single tag then this method behaves identical to its
- * aforementioned counterpart except that it returns a single element array with the
- * single tag value.
- *
- * The expected format of the tag property value is {@code tag1,tag2,..,tagN}.
- * Whitespace will be trimmed off each entry.
- * @param serviceId the service whose instances are being looked up
- * @return the array of tags to filter the service instances by - it will be null if
- * no tags are configured for the service and the default query tag is not configured
- * or if a single tag is configured and it is the empty string
- */
- @Nullable
- public String[] getQueryTagsForService(String serviceId) {
- String queryTagStr = getQueryTagForService(serviceId);
- if (queryTagStr == null || queryTagStr.isEmpty()) {
- return null;
- }
- return StringUtils.tokenizeToStringArray(queryTagStr, ",");
- }
-
- public String getHostname() {
- return this.preferIpAddress ? this.ipAddress : this.hostname;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- this.hostInfo.override = true;
- }
-
- private HostInfo getHostInfo() {
- return this.hostInfo;
- }
-
- private void setHostInfo(HostInfo hostInfo) {
- this.hostInfo = hostInfo;
- }
-
- public String getAclToken() {
- return this.aclToken;
- }
-
- public void setAclToken(String aclToken) {
- this.aclToken = aclToken;
- }
-
- public List getTags() {
- return this.tags;
- }
-
- public void setTags(List tags) {
- this.tags = tags;
- }
-
- public boolean isEnableTagOverride() {
- return enableTagOverride;
- }
-
- public void setEnableTagOverride(boolean enableTagOverride) {
- this.enableTagOverride = enableTagOverride;
- }
-
- public Map getMetadata() {
- return metadata;
- }
-
- public void setMetadata(Map metadata) {
- this.metadata = metadata;
- }
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public List getManagementTags() {
- return this.managementTags;
- }
-
- public void setManagementTags(List managementTags) {
- this.managementTags = managementTags;
- }
-
- public String getHealthCheckPath() {
- return this.healthCheckPath;
- }
-
- public void setHealthCheckPath(String healthCheckPath) {
- this.healthCheckPath = healthCheckPath;
- }
-
- public String getHealthCheckUrl() {
- return this.healthCheckUrl;
- }
-
- public void setHealthCheckUrl(String healthCheckUrl) {
- this.healthCheckUrl = healthCheckUrl;
- }
-
- public Map> getHealthCheckHeaders() {
- return this.healthCheckHeaders;
- }
-
- public void setHealthCheckHeaders(Map> healthCheckHeaders) {
- this.healthCheckHeaders = healthCheckHeaders;
- }
-
- public String getHealthCheckInterval() {
- return this.healthCheckInterval;
- }
-
- public void setHealthCheckInterval(String healthCheckInterval) {
- this.healthCheckInterval = healthCheckInterval;
- }
-
- public String getHealthCheckTimeout() {
- return this.healthCheckTimeout;
- }
-
- public void setHealthCheckTimeout(String healthCheckTimeout) {
- this.healthCheckTimeout = healthCheckTimeout;
- }
-
- public String getHealthCheckCriticalTimeout() {
- return this.healthCheckCriticalTimeout;
- }
-
- public void setHealthCheckCriticalTimeout(String healthCheckCriticalTimeout) {
- this.healthCheckCriticalTimeout = healthCheckCriticalTimeout;
- }
-
- public String getIpAddress() {
- return this.ipAddress;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- this.hostInfo.override = true;
- }
-
- public Integer getPort() {
- return this.port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
- }
-
- public Integer getManagementPort() {
- return this.managementPort;
- }
-
- public void setManagementPort(Integer managementPort) {
- this.managementPort = managementPort;
- }
-
- public Lifecycle getLifecycle() {
- return this.lifecycle;
- }
-
- public void setLifecycle(Lifecycle lifecycle) {
- this.lifecycle = lifecycle;
- }
-
- public boolean isPreferIpAddress() {
- return this.preferIpAddress;
- }
-
- public void setPreferIpAddress(boolean preferIpAddress) {
- this.preferIpAddress = preferIpAddress;
- }
-
- public boolean isPreferAgentAddress() {
- return this.preferAgentAddress;
- }
-
- public void setPreferAgentAddress(boolean preferAgentAddress) {
- this.preferAgentAddress = preferAgentAddress;
- }
-
- public int getCatalogServicesWatchDelay() {
- return this.catalogServicesWatchDelay;
- }
-
- public void setCatalogServicesWatchDelay(int catalogServicesWatchDelay) {
- this.catalogServicesWatchDelay = catalogServicesWatchDelay;
- }
-
- public int getCatalogServicesWatchTimeout() {
- return this.catalogServicesWatchTimeout;
- }
-
- public void setCatalogServicesWatchTimeout(int catalogServicesWatchTimeout) {
- this.catalogServicesWatchTimeout = catalogServicesWatchTimeout;
- }
-
- public String getServiceName() {
- return this.serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public String getInstanceId() {
- return this.instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- public String getInstanceZone() {
- return this.instanceZone;
- }
-
- public void setInstanceZone(String instanceZone) {
- this.instanceZone = instanceZone;
- }
-
- public String getInstanceGroup() {
- return this.instanceGroup;
- }
-
- public void setInstanceGroup(String instanceGroup) {
- this.instanceGroup = instanceGroup;
- }
-
- public boolean isIncludeHostnameInInstanceId() {
- return includeHostnameInInstanceId;
- }
-
- public void setIncludeHostnameInInstanceId(boolean includeHostnameInInstanceId) {
- this.includeHostnameInInstanceId = includeHostnameInInstanceId;
- }
-
- public ConsistencyMode getConsistencyMode() {
- return consistencyMode;
- }
-
- public void setConsistencyMode(ConsistencyMode consistencyMode) {
- this.consistencyMode = consistencyMode;
- }
-
- public String getDefaultZoneMetadataName() {
- return this.defaultZoneMetadataName;
- }
-
- public void setDefaultZoneMetadataName(String defaultZoneMetadataName) {
- this.defaultZoneMetadataName = defaultZoneMetadataName;
- }
-
- public String getScheme() {
- return this.scheme;
- }
-
- public void setScheme(String scheme) {
- this.scheme = scheme;
- }
-
- public String getManagementSuffix() {
- return this.managementSuffix;
- }
-
- public void setManagementSuffix(String managementSuffix) {
- this.managementSuffix = managementSuffix;
- }
-
- public Map getServerListQueryTags() {
- return this.serverListQueryTags;
- }
-
- public void setServerListQueryTags(Map serverListQueryTags) {
- this.serverListQueryTags = serverListQueryTags;
- }
-
- public Map getDatacenters() {
- return this.datacenters;
- }
-
- public void setDatacenters(Map datacenters) {
- this.datacenters = datacenters;
- }
-
- public String getDefaultQueryTag() {
- return this.defaultQueryTag;
- }
-
- public void setDefaultQueryTag(String defaultQueryTag) {
- this.defaultQueryTag = defaultQueryTag;
- }
-
- public boolean isQueryPassing() {
- return this.queryPassing;
- }
-
- public void setQueryPassing(boolean queryPassing) {
- this.queryPassing = queryPassing;
- }
-
- public boolean isRegister() {
- return this.register;
- }
-
- public void setRegister(boolean register) {
- this.register = register;
- }
-
- public boolean isDeregister() {
- return this.deregister;
- }
-
- public void setDeregister(boolean deregister) {
- this.deregister = deregister;
- }
-
- public boolean isRegisterHealthCheck() {
- return this.registerHealthCheck;
- }
-
- public void setRegisterHealthCheck(boolean registerHealthCheck) {
- this.registerHealthCheck = registerHealthCheck;
- }
-
- public boolean isFailFast() {
- return this.failFast;
- }
-
- public void setFailFast(boolean failFast) {
- this.failFast = failFast;
- }
-
- public Boolean getHealthCheckTlsSkipVerify() {
- return this.healthCheckTlsSkipVerify;
- }
-
- public void setHealthCheckTlsSkipVerify(Boolean healthCheckTlsSkipVerify) {
- this.healthCheckTlsSkipVerify = healthCheckTlsSkipVerify;
- }
-
- public int getOrder() {
- return this.order;
- }
-
- public void setOrder(int order) {
- this.order = order;
- }
-
- public Map getManagementMetadata() {
- return this.managementMetadata;
- }
-
- public void setManagementMetadata(Map managementMetadata) {
- this.managementMetadata = managementMetadata;
- }
-
- public Boolean getEnableTagOverride() {
- return this.enableTagOverride;
- }
-
- public void setEnableTagOverride(Boolean enableTagOverride) {
- this.enableTagOverride = enableTagOverride;
- }
-
- public Boolean getManagementEnableTagOverride() {
- return this.managementEnableTagOverride;
- }
-
- public void setManagementEnableTagOverride(Boolean managementEnableTagOverride) {
- this.managementEnableTagOverride = managementEnableTagOverride;
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("aclToken", this.aclToken)
- .append("catalogServicesWatchDelay", this.catalogServicesWatchDelay)
- .append("catalogServicesWatchTimeout", this.catalogServicesWatchTimeout)
- .append("consistencyMode", this.consistencyMode).append("datacenters", this.datacenters)
- .append("defaultQueryTag", this.defaultQueryTag)
- .append("defaultZoneMetadataName", this.defaultZoneMetadataName).append("deregister", this.deregister)
- .append("enabled", this.enabled).append("enableTagOverride", this.enableTagOverride)
- .append("failFast", this.failFast).append("hostInfo", this.hostInfo)
- .append("healthCheckCriticalTimeout", this.healthCheckCriticalTimeout)
- .append("healthCheckHeaders", this.healthCheckHeaders)
- .append("healthCheckInterval", this.healthCheckInterval).append("healthCheckPath", this.healthCheckPath)
- .append("healthCheckTimeout", this.healthCheckTimeout)
- .append("healthCheckTlsSkipVerify", this.healthCheckTlsSkipVerify)
- .append("healthCheckUrl", this.healthCheckUrl).append("hostname", this.hostname)
- .append("includeHostnameInInstanceId", this.includeHostnameInInstanceId)
- .append("instanceId", this.instanceId).append("instanceGroup", this.instanceGroup)
- .append("instanceZone", this.instanceZone).append("ipAddress", this.ipAddress)
- .append("lifecycle", this.lifecycle).append("metadata", this.metadata)
- .append("managementEnableTagOverride", this.managementEnableTagOverride)
- .append("managementMetadata", this.managementMetadata).append("managementPort", this.managementPort)
- .append("managementSuffix", this.managementSuffix).append("managementTags", this.managementTags)
- .append("order", this.order).append("port", this.port)
- .append("preferAgentAddress", this.preferAgentAddress).append("preferIpAddress", this.preferIpAddress)
- .append("queryPassing", this.queryPassing).append("register", this.register)
- .append("registerHealthCheck", this.registerHealthCheck).append("scheme", this.scheme)
- .append("serviceName", this.serviceName).append("serverListQueryTags", this.serverListQueryTags)
- .append("tags", this.tags).toString();
- }
-
- /**
- * Properties releated to the lifecycle.
- */
- public static class Lifecycle {
-
- private boolean enabled = true;
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- @Override
- public String toString() {
- return "Lifecycle{" + "enabled=" + this.enabled + '}';
- }
-
- }
-
-}
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
deleted file mode 100644
index a9ed9cb5..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerUtils.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.net.Inet6Address;
-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.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- * @author Semenkov Alexey
- */
-public final class ConsulServerUtils {
-
- private static final Log log = LogFactory.getLog(ConsulServerUtils.class);
-
- private ConsulServerUtils() {
- throw new IllegalStateException("Can't instantiate a utility class");
- }
-
- public static String findHost(HealthService healthService) {
- HealthService.Service service = healthService.getService();
- HealthService.Node node = healthService.getNode();
-
- if (StringUtils.hasText(service.getAddress())) {
- return fixIPv6Address(service.getAddress());
- }
- else if (StringUtils.hasText(node.getAddress())) {
- return fixIPv6Address(node.getAddress());
- }
- return node.getNode();
- }
-
- public static String fixIPv6Address(String address) {
- try {
- InetAddress inetAdr = InetAddress.getByName(address);
- if (inetAdr instanceof Inet6Address) {
- return "[" + inetAdr.getHostAddress() + "]";
- }
- return address;
- }
- catch (UnknownHostException e) {
- log.debug("Not InetAddress: " + address + " , resolved as is.");
- return address;
- }
- }
-
-}
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
deleted file mode 100644
index 94dbddd5..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServiceInstance.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.ecwid.consul.v1.health.model.HealthService;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.core.style.ToStringCreator;
-
-import static org.springframework.cloud.consul.discovery.ConsulServerUtils.findHost;
-
-public class ConsulServiceInstance extends DefaultServiceInstance {
-
- private HealthService healthService;
-
- public ConsulServiceInstance(HealthService healthService, String serviceId) {
- this(healthService.getService().getId(), serviceId, findHost(healthService),
- getPort(healthService.getService()), getSecure(healthService), getMetadata(healthService),
- healthService.getService().getTags());
- this.healthService = healthService;
- }
-
- public ConsulServiceInstance(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) {
- super(instanceId, serviceId, host, port, secure);
- }
-
- public ConsulServiceInstance() {
- }
-
- private static Map getMetadata(HealthService healthService) {
- Map metadata = healthService.getService().getMeta();
- if (metadata == null) {
- metadata = new LinkedHashMap<>();
- }
- return metadata;
- }
-
- private static int getPort(HealthService.Service service) {
- Integer port = service.getPort();
- // Services without registered port receive '0' from consul 1.9 and null from
- // consul 1.10
- if (port == null) {
- return 0;
- }
- return port;
- }
-
- private static boolean getSecure(HealthService healthService) {
- boolean secure = false;
- Map metadata = getMetadata(healthService);
- // getMetadata() above returns an empty Map if meta is null
- if (metadata.containsKey("secure")) {
- secure = Boolean.parseBoolean(metadata.get("secure"));
- }
- return secure;
- }
-
- public HealthService getHealthService() {
- return this.healthService;
- }
-
- public void setHealthService(HealthService healthService) {
- this.healthService = healthService;
- }
-
- public List getTags() {
- if (healthService != null) {
- return healthService.getService().getTags();
- }
- return Collections.emptyList();
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("instanceId", getInstanceId()).append("serviceId", getServiceId())
- .append("host", getHost()).append("port", getPort()).append("secure", isSecure())
- .append("metadata", getMetadata()).append("uri", getUri()).append("healthService", healthService)
- .toString();
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
deleted file mode 100644
index c501e56b..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-
-import jakarta.validation.constraints.DecimalMax;
-import jakarta.validation.constraints.DecimalMin;
-import org.apache.commons.logging.Log;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.convert.DurationUnit;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.validation.annotation.Validated;
-
-/**
- * Properties related to heartbeat verification.
- *
- * @author Spencer Gibb
- * @author Chris Bono
- */
-@ConfigurationProperties(prefix = "spring.cloud.consul.discovery.heartbeat")
-@Validated
-public class HeartbeatProperties {
-
- private static final Log log = org.apache.commons.logging.LogFactory.getLog(HeartbeatProperties.class);
-
- // TODO: change enabled to default to true when I stop seeing messages like
- // [WARN] agent: Check 'service:testConsulApp:xtest:8080' missed TTL, is now critical
- boolean enabled = false;
-
- @DurationUnit(ChronoUnit.SECONDS)
- private Duration ttl = Duration.ofSeconds(30);
-
- @DecimalMin("0.1")
- @DecimalMax("0.9")
- private double intervalRatio = 2.0 / 3.0;
-
- private boolean reregisterServiceOnFailure = false;
-
- /**
- * Whether or not to take the current system health (as reported via the Actuator
- * Health endpoint) into account when reporting the application status to the Consul
- * TTL check. Actuator Health endpoint also has to be available to the application.
- */
- private boolean useActuatorHealth = true;
-
- /**
- * The actuator health group to use (null for the root group) when determining system
- * health via Actuator.
- */
- private String actuatorHealthGroup;
-
- /**
- * @return the computed heartbeat interval
- */
- protected Duration computeHeartbeatInterval() {
- // heartbeat rate at ratio * ttl, but no later than ttl -1s and, (under lesser
- // priority), no sooner than 1s from now
- double interval = this.ttl.getSeconds() * this.intervalRatio;
- double max = Math.max(interval, 1);
- long ttlMinus1 = this.ttl.getSeconds() - 1;
- double min = Math.min(ttlMinus1, max);
- Duration heartbeatInterval = Duration.ofMillis(Math.round(1000 * min));
- log.debug("Computed heartbeatInterval: " + heartbeatInterval);
- return heartbeatInterval;
- }
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public Duration getTtl() {
- return this.ttl;
- }
-
- public void setTtl(Duration ttl) {
- this.ttl = ttl;
- }
-
- public @DecimalMin("0.1") @DecimalMax("0.9") double getIntervalRatio() {
- return this.intervalRatio;
- }
-
- public void setIntervalRatio(@DecimalMin("0.1") @DecimalMax("0.9") double intervalRatio) {
- this.intervalRatio = intervalRatio;
- }
-
- public boolean isReregisterServiceOnFailure() {
- return this.reregisterServiceOnFailure;
- }
-
- public void setReregisterServiceOnFailure(boolean reregisterServiceOnFailure) {
- this.reregisterServiceOnFailure = reregisterServiceOnFailure;
- }
-
- public boolean isUseActuatorHealth() {
- return useActuatorHealth;
- }
-
- public void setUseActuatorHealth(boolean useActuatorHealth) {
- this.useActuatorHealth = useActuatorHealth;
- }
-
- public String getActuatorHealthGroup() {
- return actuatorHealthGroup;
- }
-
- public void setActuatorHealthGroup(String actuatorHealthGroup) {
- this.actuatorHealthGroup = actuatorHealthGroup;
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("enabled", this.enabled).append("ttl", this.ttl)
- .append("intervalRatio", this.intervalRatio).append("useActuatorHealth", this.useActuatorHealth)
- .append("healthGroup", this.actuatorHealthGroup).toString();
- }
-
-}
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
deleted file mode 100644
index 2a9d8088..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ReregistrationPredicate.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import com.ecwid.consul.v1.OperationException;
-
-/**
- * Predicate on whether to re-register service.
- *
- * @author Toshiaki Maki
- */
-public interface ReregistrationPredicate {
-
- /**
- * test if the exception is eligible for re-registration.
- * @param e OperationException
- * @return if the exception is eligible for re-registration
- */
- boolean isEligible(OperationException 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);
-
-}
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
deleted file mode 100644
index 5c052024..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-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.serviceregistry.ApplicationStatusProvider;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
-
-import static com.ecwid.consul.v1.health.model.Check.CheckStatus;
-
-/**
- * Created by nicu on 11.03.2015.
- *
- * @author Stéphane LEROY
- * @author Chris Bono
- */
-public class TtlScheduler {
-
- private static final Log log = LogFactory.getLog(TtlScheduler.class);
-
- private final Map serviceHeartbeats = new ConcurrentHashMap<>();
-
- private final TaskScheduler scheduler = new ConcurrentTaskScheduler(Executors.newSingleThreadScheduledExecutor());
-
- private final HeartbeatProperties heartbeatProperties;
-
- private final ConsulDiscoveryProperties discoveryProperties;
-
- private final ConsulClient client;
-
- private final ReregistrationPredicate reregistrationPredicate;
-
- private final Map registeredServices = new ConcurrentHashMap<>();
-
- private ApplicationStatusProvider applicationStatusProvider;
-
- public TtlScheduler(HeartbeatProperties heartbeatProperties, ConsulDiscoveryProperties discoveryProperties,
- ConsulClient client, ReregistrationPredicate reregistrationPredicate,
- ObjectProvider applicationStatusProviderFactory) {
- this.heartbeatProperties = heartbeatProperties;
- this.discoveryProperties = discoveryProperties;
- this.client = client;
- this.reregistrationPredicate = reregistrationPredicate;
- this.applicationStatusProvider = applicationStatusProviderFactory
- .getIfAvailable(() -> () -> CheckStatus.PASSING);
- }
-
- public void add(final NewService service) {
- add(service.getId());
- this.registeredServices.put(service.getId(), service);
- }
-
- /**
- * Add a service to the checks loop.
- * @param instanceId instance id
- */
- public void add(String instanceId) {
- ScheduledFuture task = this.scheduler.scheduleAtFixedRate(
- new ConsulHeartbeatTask(instanceId, this, () -> applicationStatusProvider.currentStatus()),
- this.heartbeatProperties.computeHeartbeatInterval().toMillis());
- ScheduledFuture previousTask = this.serviceHeartbeats.put(instanceId, task);
- if (previousTask != null) {
- previousTask.cancel(true);
- }
- }
-
- public void remove(String instanceId) {
- ScheduledFuture task = this.serviceHeartbeats.get(instanceId);
- if (task != null) {
- task.cancel(true);
- }
- this.serviceHeartbeats.remove(instanceId);
- this.registeredServices.remove(instanceId);
- }
-
- static class ConsulHeartbeatTask implements Runnable {
-
- private final String serviceId;
-
- private final String checkId;
-
- private final TtlScheduler ttlScheduler;
-
- private final Supplier statusSupplier;
-
- ConsulHeartbeatTask(String serviceId, TtlScheduler ttlScheduler, Supplier statusSupplier) {
- this.serviceId = serviceId;
- if (!this.serviceId.startsWith("service:")) {
- this.checkId = "service:" + this.serviceId;
- }
- else {
- this.checkId = this.serviceId;
- }
- this.statusSupplier = statusSupplier;
- this.ttlScheduler = ttlScheduler;
- }
-
- @Override
- public void run() {
- ConsulClient client = this.ttlScheduler.client;
- CheckStatus status = statusSupplier.get();
- switch (status) {
- case PASSING:
- possiblyReregisterIfFails(() -> client.agentCheckPass(checkId, null,
- this.ttlScheduler.discoveryProperties.getAclToken()));
- logHeartbeatSent(status);
- break;
- case WARNING:
- possiblyReregisterIfFails(() -> client.agentCheckWarn(checkId, null,
- this.ttlScheduler.discoveryProperties.getAclToken()));
- logHeartbeatSent(status);
- break;
- case CRITICAL:
- possiblyReregisterIfFails(() -> client.agentCheckFail(checkId, null,
- this.ttlScheduler.discoveryProperties.getAclToken()));
- logHeartbeatSent(status);
- break;
- default:
- log.debug(String.format("Not sending consul heartbeat for %s (%s)", checkId, status));
- }
- }
-
- private void logHeartbeatSent(CheckStatus status) {
- log.debug(String.format("Sent consul heartbeat for %s (%s)", checkId, status));
- }
-
- private void possiblyReregisterIfFails(Runnable consulClientCall) {
- try {
- consulClientCall.run();
- }
- catch (OperationException e) {
- if (this.ttlScheduler.heartbeatProperties.isReregisterServiceOnFailure()
- && this.ttlScheduler.reregistrationPredicate.isEligible(e)) {
- log.warn(e.getMessage());
- NewService registeredService = this.ttlScheduler.registeredServices.get(this.serviceId);
- if (registeredService != null) {
- if (log.isInfoEnabled()) {
- log.info("Re-register " + registeredService);
- }
- this.ttlScheduler.client.agentServiceRegister(registeredService,
- this.ttlScheduler.discoveryProperties.getAclToken());
- }
- else {
- log.warn("The service to re-register is not found.");
- }
- }
- else {
- throw e;
- }
- }
- }
-
- }
-
-}
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
deleted file mode 100644
index 6a7bd206..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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.discovery.ConsulDiscoveryProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-/**
- * Extra configuration for config server if it happens to be registered with Consul.
- *
- * @author Dave Syer
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass({ ConsulDiscoveryProperties.class, ConsulClient.class, ConfigServerProperties.class })
-public class ConsulConfigServerAutoConfiguration {
-
- /**
- * The metadata key for the path for config server.
- */
- public static final String CONFIG_PATH_KEY = "configPath";
-
- @Autowired(required = false)
- private ConsulDiscoveryProperties properties;
-
- @Autowired(required = false)
- private ConfigServerProperties server;
-
- @PostConstruct
- public void init() {
- if (this.properties == null || this.server == null) {
- return;
- }
- String prefix = this.server.getPrefix();
- if (StringUtils.hasText(prefix)) {
- this.properties.getMetadata().put(CONFIG_PATH_KEY, prefix);
- }
- }
-
-}
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
deleted file mode 100644
index 4773cc51..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerBootstrapper.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery.configclient;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.ecwid.consul.v1.ConsulClient;
-import org.apache.commons.logging.Log;
-
-import org.springframework.boot.BootstrapContext;
-import org.springframework.boot.BootstrapRegistry;
-import org.springframework.boot.BootstrapRegistryInitializer;
-import org.springframework.boot.context.properties.bind.BindHandler;
-import org.springframework.boot.context.properties.bind.Bindable;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.cloud.config.client.ConfigClientProperties;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
-import org.springframework.cloud.consul.ConsulProperties;
-import org.springframework.cloud.consul.discovery.ConditionalOnConsulDiscoveryEnabled;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.util.ClassUtils;
-
-public class ConsulConfigServerBootstrapper implements BootstrapRegistryInitializer {
-
- @Override
- public void initialize(BootstrapRegistry registry) {
- if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null) ||
- // don't run if bootstrap enabled, how to check the property?
- ClassUtils.isPresent("org.springframework.cloud.bootstrap.marker.Marker", null)) {
- return;
- }
- // create consul client
- registry.registerIfAbsent(ConsulProperties.class, context -> {
- Binder binder = context.get(Binder.class);
- if (!isDiscoveryEnabled(binder)) {
- return null;
- }
- return binder.bind(ConsulProperties.PREFIX, Bindable.of(ConsulProperties.class), getBindHandler(context))
- .orElseGet(ConsulProperties::new);
- });
- registry.registerIfAbsent(ConsulClient.class, context -> {
- if (!isDiscoveryEnabled(context.get(Binder.class))) {
- return null;
- }
- ConsulProperties consulProperties = context.get(ConsulProperties.class);
- return ConsulAutoConfiguration.createConsulClient(consulProperties,
- ConsulAutoConfiguration.createConsulRawClientBuilder());
- });
- registry.registerIfAbsent(ConsulDiscoveryClient.class, context -> {
- Binder binder = context.get(Binder.class);
- if (!isDiscoveryEnabled(binder)) {
- return null;
- }
- ConsulClient consulClient = context.get(ConsulClient.class);
- ConsulDiscoveryProperties properties = binder
- .bind(ConsulDiscoveryProperties.PREFIX, Bindable.of(ConsulDiscoveryProperties.class),
- getBindHandler(context))
- .orElseGet(() -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties())));
- return new ConsulDiscoveryClient(consulClient, properties);
- });
- // promote discovery client if created
- registry.addCloseListener(event -> {
- if (!isDiscoveryEnabled(event.getBootstrapContext().get(Binder.class))) {
- return;
- }
- ConsulDiscoveryClient discoveryClient = event.getBootstrapContext().get(ConsulDiscoveryClient.class);
- if (discoveryClient != null) {
- event.getApplicationContext().getBeanFactory().registerSingleton("consulDiscoveryClient",
- discoveryClient);
- }
- });
-
- // We need to pass the lambda here so we do not create a new instance of
- // ConfigServerInstanceProvider.Function
- // which would result in a ClassNotFoundException when Spring Cloud Config is not
- // on the classpath
- registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, ConsulFunction::create);
- }
-
- private BindHandler getBindHandler(org.springframework.boot.BootstrapContext context) {
- return context.getOrElse(BindHandler.class, null);
- }
-
- private static boolean isDiscoveryEnabled(Binder binder) {
- return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false)
- && binder.bind(ConditionalOnConsulDiscoveryEnabled.PROPERTY, Boolean.class).orElse(true)
- && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true);
- }
-
- /*
- * This Function is executed when loading config data. Because of this we cannot rely
- * on the BootstrapContext because Boot has not finished loading all the configuration
- * data so if we ask the BootstrapContext for configuration data it will not have it.
- * The apply method in this function is passed the Binder and BindHandler from the
- * config data context which has the configuration properties that have been loaded so
- * far in the config data process.
- *
- * We will create many of the same beans in this function as we do above in the
- * initializer above. We do both to maintain compatibility since we are promoting
- * those beans to the main application context.
- */
- static final class ConsulFunction implements ConfigServerInstanceProvider.Function {
-
- private final BootstrapContext context;
-
- private ConsulFunction(BootstrapContext context) {
- this.context = context;
- }
-
- public static ConsulFunction create(BootstrapContext context) {
- return new ConsulFunction(context);
- }
-
- @Override
- public List apply(String serviceId) {
- return apply(serviceId, null, null, null);
- }
-
- @Override
- public List apply(String serviceId, Binder binder, BindHandler bindHandler, Log log) {
- if (binder == null || !isDiscoveryEnabled(binder)) {
- return Collections.emptyList();
- }
-
- ConsulProperties consulProperties = binder
- .bind(ConsulProperties.PREFIX, Bindable.of(ConsulProperties.class), bindHandler)
- .orElseGet(ConsulProperties::new);
- ConsulClient consulClient = ConsulAutoConfiguration.createConsulClient(consulProperties,
- ConsulAutoConfiguration.createConsulRawClientBuilder());
- ConsulDiscoveryProperties properties = binder
- .bind(ConsulDiscoveryProperties.PREFIX, Bindable.of(ConsulDiscoveryProperties.class), bindHandler)
- .orElseGet(() -> new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties())));
- ConsulDiscoveryClient discoveryClient = new ConsulDiscoveryClient(consulClient, properties);
-
- return discoveryClient.getInstances(serviceId);
- }
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java
deleted file mode 100644
index 633ec97d..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery.configclient;
-
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration;
-import org.springframework.cloud.consul.discovery.reactive.ConsulReactiveDiscoveryClientConfiguration;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Helper for config client that wants to lookup the config server via discovery.
- *
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@ConditionalOnProperty("spring.cloud.config.discovery.enabled")
-@Configuration(proxyBeanMethods = false)
-@ImportAutoConfiguration({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class,
- ConsulReactiveDiscoveryClientConfiguration.class })
-public class ConsulDiscoveryClientConfigServiceBootstrapConfiguration {
-
-}
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
deleted file mode 100644
index 2fb42938..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClient.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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;
-import reactor.core.scheduler.Schedulers;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.cloud.consul.discovery.ConsulServiceInstance;
-
-/**
- * Consul version of {@link ReactiveDiscoveryClient}.
- *
- * @author Tim Ysewyn
- * @author Chris Bono
- */
-public class ConsulReactiveDiscoveryClient implements ReactiveDiscoveryClient {
-
- private static final Logger logger = LoggerFactory.getLogger(ConsulReactiveDiscoveryClient.class);
-
- private final ConsulClient client;
-
- private final ConsulDiscoveryProperties properties;
-
- public ConsulReactiveDiscoveryClient(ConsulClient client, ConsulDiscoveryProperties properties) {
- this.client = client;
- this.properties = properties;
- }
-
- @Override
- public String description() {
- return "Spring Cloud Consul Reactive Discovery Client";
- }
-
- @Override
- public Flux getInstances(String serviceId) {
- return Flux.defer(() -> {
- List instances = new ArrayList<>();
- for (HealthService healthService : getHealthServices(serviceId)) {
- instances.add(new ConsulServiceInstance(healthService, serviceId));
- }
- return Flux.fromIterable(instances);
- }).onErrorResume(exception -> {
- logger.error("Error getting instances from Consul.", exception);
- return Flux.empty();
- }).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());
- }).onErrorResume(exception -> {
- logger.error("Error getting services from Consul.", exception);
- return Flux.empty();
- }).subscribeOn(Schedulers.boundedElastic());
- }
-
- @Override
- public int getOrder() {
- return properties.getOrder();
- }
-
-}
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
deleted file mode 100644
index 10867ebd..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
-import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
-import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
-import org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
-import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
-import org.springframework.cloud.consul.ConditionalOnConsulEnabled;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
-import org.springframework.cloud.consul.discovery.ConditionalOnConsulDiscoveryEnabled;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Tim Ysewyn
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnReactiveDiscoveryEnabled
-@ConditionalOnConsulEnabled
-@ConditionalOnConsulDiscoveryEnabled
-@EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class)
-@AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class)
-@AutoConfigureAfter({ UtilAutoConfiguration.class, ReactiveCompositeDiscoveryClientAutoConfiguration.class,
- ConsulAutoConfiguration.class })
-public class ConsulReactiveDiscoveryClientConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) {
- return new ConsulDiscoveryProperties(inetUtils);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ConsulReactiveDiscoveryClient consulReactiveDiscoveryClient(ConsulClient client,
- ConsulDiscoveryProperties discoveryProperties) {
- return new ConsulReactiveDiscoveryClient(client, discoveryProperties);
- }
-
- @Bean
- @ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
- @ConditionalOnDiscoveryHealthIndicatorEnabled
- public ReactiveDiscoveryClientHealthIndicator consulReactiveDiscoveryClientHealthIndicator(
- ConsulReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) {
- return new ReactiveDiscoveryClientHealthIndicator(client, 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
deleted file mode 100644
index 1f22ecb6..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-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.cloud.consul.discovery.HeartbeatProperties;
-
-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;
-
-/**
- * Leverages Spring Boot Actuator health endpoint to determine the current health of the
- * application.
- *
- * @author Chris Bono
- */
-public class ActuatorHealthApplicationStatusProvider implements ApplicationStatusProvider {
-
- private HealthEndpoint healthEndpoint;
-
- private HeartbeatProperties heartbeatProperties;
-
- public ActuatorHealthApplicationStatusProvider(HealthEndpoint healthEndpoint,
- HeartbeatProperties heartbeatProperties) {
- this.healthEndpoint = healthEndpoint;
- this.heartbeatProperties = heartbeatProperties;
- }
-
- /**
- * Gets the current actuator health status and converts to Consul check status using
- * the following mapping:
- *
- * - {@link Status#UP} -> {@link CheckStatus#PASSING}
- * - {@link Status#DOWN} or {@link Status#OUT_OF_SERVICE} ->
- * {@link CheckStatus#CRITICAL}
- * - Otherwise {@link CheckStatus#UNKNOWN}
- *
- * .
- * @return the check status based on the actuator health status (see above for
- * mapping)
- */
- @Override
- 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(this::healthStatusToCheckStatus).orElse(CheckStatus.UNKNOWN);
- }
-
- private CheckStatus healthStatusToCheckStatus(Status healthStatus) {
- if (healthStatus == UP) {
- return CheckStatus.PASSING;
- }
- if (healthStatus == DOWN || healthStatus == OUT_OF_SERVICE) {
- return CheckStatus.CRITICAL;
- }
- return 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
deleted file mode 100644
index d722482d..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ApplicationStatusProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-import com.ecwid.consul.v1.health.model.Check.CheckStatus;
-
-/**
- * Provides the current health of the application represented in Consul's
- * {@link CheckStatus} so that it can then be sent to Consul TTL checks.
- *
- * @author Chris Bono
- */
-@FunctionalInterface
-public interface ApplicationStatusProvider {
-
- /**
- * @return the current health of the application
- */
- CheckStatus currentStatus();
-
-}
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
deleted file mode 100644
index 95661bae..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistration.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright 2013-2017 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.serviceregistry;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-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.context.ApplicationContext;
-import org.springframework.core.env.Environment;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- */
-public class ConsulAutoRegistration extends ConsulRegistration {
-
- /**
- * Instance ID separator.
- */
- public static final char SEPARATOR = '-';
-
- private final AutoServiceRegistrationProperties autoServiceRegistrationProperties;
-
- private final ApplicationContext context;
-
- private final HeartbeatProperties heartbeatProperties;
-
- private final List managementRegistrationCustomizers;
-
- @Deprecated
- public ConsulAutoRegistration(NewService service,
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ApplicationContext context, HeartbeatProperties heartbeatProperties) {
- this(service, autoServiceRegistrationProperties, properties, context, heartbeatProperties,
- Collections.emptyList());
- }
-
- public ConsulAutoRegistration(NewService service,
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ApplicationContext context, HeartbeatProperties heartbeatProperties,
- List managementRegistrationCustomizers) {
- super(service, properties);
- this.autoServiceRegistrationProperties = autoServiceRegistrationProperties;
- this.context = context;
- this.heartbeatProperties = heartbeatProperties;
- this.managementRegistrationCustomizers = managementRegistrationCustomizers;
- }
-
- public static ConsulAutoRegistration registration(
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ApplicationContext context, List registrationCustomizers,
- List managementRegistrationCustomizers,
- HeartbeatProperties heartbeatProperties) {
-
- NewService service = new NewService();
- String appName = getAppName(properties, context.getEnvironment());
- service.setId(getInstanceId(properties, context));
- if (!properties.isPreferAgentAddress()) {
- service.setAddress(properties.getHostname());
- }
- service.setName(normalizeForDns(appName));
- service.setTags(new ArrayList<>(properties.getTags()));
- service.setEnableTagOverride(properties.getEnableTagOverride());
- service.setMeta(getMetadata(properties));
-
- if (properties.getPort() != null) {
- service.setPort(properties.getPort());
- // we know the port and can set the check
- setCheck(service, autoServiceRegistrationProperties, properties, context, heartbeatProperties);
- }
-
- ConsulAutoRegistration registration = new ConsulAutoRegistration(service, autoServiceRegistrationProperties,
- properties, context, heartbeatProperties, managementRegistrationCustomizers);
- customize(registrationCustomizers, registration);
- return registration;
- }
-
- public static void customize(List registrationCustomizers,
- ConsulAutoRegistration registration) {
- if (registrationCustomizers != null) {
- for (ConsulRegistrationCustomizer customizer : registrationCustomizers) {
- customizer.customize(registration);
- }
- }
- }
-
- public static void setCheck(NewService service, AutoServiceRegistrationProperties autoServiceRegistrationProperties,
- ConsulDiscoveryProperties properties, ApplicationContext context, HeartbeatProperties heartbeatProperties) {
- if (properties.isRegisterHealthCheck() && service.getCheck() == null) {
- Integer checkPort;
- if (shouldRegisterManagement(autoServiceRegistrationProperties, properties, context)) {
- checkPort = getManagementPort(properties, context);
- }
- else {
- checkPort = service.getPort();
- }
- Assert.notNull(checkPort, "checkPort may not be null");
- service.setCheck(createCheck(checkPort, heartbeatProperties, properties));
- }
- }
-
- public static ConsulAutoRegistration managementRegistration(
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ApplicationContext context, List managementRegistrationCustomizers,
- HeartbeatProperties heartbeatProperties) {
- NewService management = new NewService();
- management.setId(getManagementServiceId(properties, context));
- management.setAddress(properties.getHostname());
- management.setName(getManagementServiceName(properties, context.getEnvironment()));
- management.setPort(getManagementPort(properties, context));
- management.setTags(properties.getManagementTags());
- management.setEnableTagOverride(properties.getManagementEnableTagOverride());
- management.setMeta(properties.getManagementMetadata());
- if (properties.isRegisterHealthCheck()) {
- management.setCheck(createCheck(getManagementPort(properties, context), heartbeatProperties, properties));
- }
- ConsulAutoRegistration registration = new ConsulAutoRegistration(management, autoServiceRegistrationProperties,
- properties, context, heartbeatProperties, managementRegistrationCustomizers);
- managementCustomize(managementRegistrationCustomizers, registration);
- return registration;
- }
-
- public static void managementCustomize(List registrationCustomizers,
- ConsulAutoRegistration registration) {
- if (registrationCustomizers != null) {
- for (ConsulManagementRegistrationCustomizer customizer : registrationCustomizers) {
- customizer.customize(registration);
- }
- }
- }
-
- public static String getInstanceId(ConsulDiscoveryProperties properties, ApplicationContext context) {
- if (!StringUtils.hasText(properties.getInstanceId())) {
- return normalizeForDns(
- IdUtils.getDefaultInstanceId(context.getEnvironment(), properties.isIncludeHostnameInInstanceId()));
- }
- return normalizeForDns(properties.getInstanceId());
- }
-
- public static String normalizeForDns(String s) {
- if (s == null || !Character.isLetter(s.charAt(0)) || !Character.isLetterOrDigit(s.charAt(s.length() - 1))) {
- throw new IllegalArgumentException(
- "Consul service ids must not be empty, must start " + "with a letter, end with a letter or digit, "
- + "and have as interior characters only letters, " + "digits, and hyphen: " + s);
- }
-
- StringBuilder normalized = new StringBuilder();
- Character prev = null;
- for (char curr : s.toCharArray()) {
- Character toAppend = null;
- if (Character.isLetterOrDigit(curr)) {
- toAppend = curr;
- }
- else if (prev == null || !(prev == SEPARATOR)) {
- toAppend = SEPARATOR;
- }
- if (toAppend != null) {
- normalized.append(toAppend);
- prev = toAppend;
- }
- }
-
- return normalized.toString();
- }
-
- private static Map getMetadata(ConsulDiscoveryProperties properties) {
- LinkedHashMap metadata = new LinkedHashMap<>();
- if (!CollectionUtils.isEmpty(properties.getMetadata())) {
- metadata.putAll(properties.getMetadata());
- }
-
- // add metadata from other properties. See createTags above.
- if (!ObjectUtils.isEmpty(properties.getInstanceZone())) {
- metadata.put(properties.getDefaultZoneMetadataName(), properties.getInstanceZone());
- }
- if (!ObjectUtils.isEmpty(properties.getInstanceGroup())) {
- metadata.put("group", properties.getInstanceGroup());
- }
-
- // store the secure flag in the tags so that clients will be able to figure
- // out whether to use http or https automatically
- metadata.put("secure", Boolean.toString(properties.getScheme().equalsIgnoreCase("https")));
-
- return metadata;
- }
-
- public static NewService.Check createCheck(Integer port, HeartbeatProperties ttlConfig,
- ConsulDiscoveryProperties properties) {
- NewService.Check check = new NewService.Check();
- if (StringUtils.hasText(properties.getHealthCheckCriticalTimeout())) {
- check.setDeregisterCriticalServiceAfter(properties.getHealthCheckCriticalTimeout());
- }
- if (ttlConfig.isEnabled()) {
- // FIXME 3.0.0
- // https://github.com/spring-cloud/spring-cloud-consul/issues/614
- check.setTtl(ttlConfig.getTtl().getSeconds() + "s");
- return check;
- }
-
- Assert.notNull(port, "createCheck port must not be null");
- Assert.isTrue(port > 0, "createCheck port must be greater than 0");
-
- if (properties.getHealthCheckUrl() != null) {
- check.setHttp(properties.getHealthCheckUrl());
- }
- else {
- check.setHttp(String.format("%s://%s:%s%s", properties.getScheme(), properties.getHostname(), port,
- properties.getHealthCheckPath()));
- }
- check.setHeader(properties.getHealthCheckHeaders());
- check.setInterval(properties.getHealthCheckInterval());
- check.setTimeout(properties.getHealthCheckTimeout());
- check.setTlsSkipVerify(properties.getHealthCheckTlsSkipVerify());
- return check;
- }
-
- /**
- * @param properties consul discovery properties
- * @param env Spring environment
- * @return the app name, currently the spring.application.name property
- */
- public static String getAppName(ConsulDiscoveryProperties properties, Environment env) {
- final String appName = properties.getServiceName();
- if (StringUtils.hasText(appName)) {
- return appName;
- }
- return env.getProperty("spring.application.name", "application");
- }
-
- /**
- * @param autoServiceRegistrationProperties registration properties
- * @param properties discovery properties
- * @param context Spring application context
- * @return if the management service should be registered with the
- * {@link ServiceRegistry}
- */
- public static boolean shouldRegisterManagement(AutoServiceRegistrationProperties autoServiceRegistrationProperties,
- ConsulDiscoveryProperties properties, ApplicationContext context) {
- return autoServiceRegistrationProperties.isRegisterManagement()
- && getManagementPort(properties, context) != null && ManagementServerPortUtils.isDifferent(context);
- }
-
- /**
- * @param properties discovery properties
- * @param context Spring application context
- * @return the serviceId of the Management Service
- */
- public static String getManagementServiceId(ConsulDiscoveryProperties properties, ApplicationContext context) {
- final String instanceId = properties.getInstanceId();
- if (StringUtils.hasText(instanceId)) {
- return normalizeForDns(instanceId + SEPARATOR + properties.getManagementSuffix());
- }
- return normalizeForDns(IdUtils.getDefaultInstanceId(context.getEnvironment(), false)) + SEPARATOR
- + properties.getManagementSuffix();
- }
-
- /**
- * @param properties discovery properties
- * @param env Spring environment
- * @return the service name of the Management Service
- */
- public static String getManagementServiceName(ConsulDiscoveryProperties properties, Environment env) {
- final String appName = properties.getServiceName();
- if (StringUtils.hasText(appName)) {
- return normalizeForDns(appName + SEPARATOR + properties.getManagementSuffix());
- }
- return normalizeForDns(getAppName(properties, env)) + SEPARATOR + properties.getManagementSuffix();
- }
-
- /**
- * @param properties discovery properties
- * @param context Spring application context
- * @return the port of the Management Service
- */
- public static Integer getManagementPort(ConsulDiscoveryProperties properties, ApplicationContext context) {
- // If an alternate external port is specified, use it instead
- if (properties.getManagementPort() != null) {
- return properties.getManagementPort();
- }
- return ManagementServerPortUtils.getPort(context);
- }
-
- public void initializePort(int knownPort) {
- if (getService().getPort() == null) {
- // not set by properties
- getService().setPort(knownPort);
- }
- // we might not have a port until now, so this is the earliest we
- // can create a check
-
- setCheck(getService(), this.autoServiceRegistrationProperties, getProperties(), this.context,
- this.heartbeatProperties);
- }
-
- public ConsulAutoRegistration managementRegistration() {
- return managementRegistration(this.autoServiceRegistrationProperties, getProperties(), this.context,
- this.managementRegistrationCustomizers, this.heartbeatProperties);
- }
-
-}
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
deleted file mode 100644
index b4deef5c..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.boot.web.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.retry.annotation.Retryable;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * @author Spencer Gibb
- */
-public class ConsulAutoServiceRegistration extends AbstractAutoServiceRegistration {
-
- private static Log log = LogFactory.getLog(ConsulAutoServiceRegistration.class);
-
- private ConsulDiscoveryProperties properties;
-
- private ConsulAutoRegistration registration;
-
- public ConsulAutoServiceRegistration(ConsulServiceRegistry serviceRegistry,
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ConsulAutoRegistration registration) {
- super(serviceRegistry, autoServiceRegistrationProperties);
- this.properties = properties;
- this.registration = registration;
- }
-
- void setPortIfNeeded(int port) {
- getPort().compareAndSet(0, port);
- }
-
- @Override
- protected ConsulAutoRegistration getRegistration() {
- if (this.registration.getService().getPort() == null && this.getPort().get() > 0) {
- this.registration.initializePort(this.getPort().get());
- }
- Assert.notNull(this.registration.getService().getPort(), "service.port has not been set");
- return this.registration;
- }
-
- @Override
- protected ConsulAutoRegistration getManagementRegistration() {
- return this.registration.managementRegistration();
- }
-
- @Override
- @Retryable(interceptor = "consulRetryInterceptor")
- public void start() {
- super.start();
- }
-
- @Override
- protected void register() {
- if (!this.properties.isRegister()) {
- log.debug("Registration disabled.");
- return;
- }
-
- super.register();
- }
-
- @Override
- protected void registerManagement() {
- if (!this.properties.isRegister()) {
- return;
- }
- super.registerManagement();
-
- }
-
- @Override
- protected Object getConfiguration() {
- return this.properties;
- }
-
- @Override
- protected void deregister() {
- if (!this.properties.isRegister() || !this.properties.isDeregister()) {
- return;
- }
- super.deregister();
- }
-
- @Override
- protected void deregisterManagement() {
- if (!this.properties.isRegister() || !this.properties.isDeregister()) {
- return;
- }
- super.deregisterManagement();
- }
-
- @Override
- protected boolean isEnabled() {
- return this.properties.getLifecycle().isEnabled();
- }
-
- @Override
- @SuppressWarnings("deprecation")
- protected String getAppName() {
- String appName = this.properties.getServiceName();
- return ObjectUtils.isEmpty(appName) ? super.getAppName() : appName;
- }
-
- @Override
- public void onApplicationEvent(WebServerInitializedEvent event) {
- // do nothing so we can listen for this event in a different class
- // this ensures start() can be retried if spring-retry is available
- }
-
-}
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
deleted file mode 100644
index 80e5bf81..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-import java.util.List;
-
-import jakarta.servlet.ServletContext;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
-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.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
-import org.springframework.cloud.consul.ConditionalOnConsulEnabled;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.cloud.consul.discovery.HeartbeatProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-@ConditionalOnMissingBean(type = "org.springframework.cloud.consul.discovery.ConsulLifecycle")
-@ConditionalOnConsulEnabled
-@Conditional(ConsulAutoServiceRegistrationAutoConfiguration.OnConsulRegistrationEnabledCondition.class)
-@AutoConfigureAfter({ AutoServiceRegistrationConfiguration.class, ConsulServiceRegistryAutoConfiguration.class })
-public class ConsulAutoServiceRegistrationAutoConfiguration {
-
- @Autowired
- AutoServiceRegistrationProperties autoServiceRegistrationProperties;
-
- @Bean
- @ConditionalOnMissingBean
- public ConsulAutoServiceRegistration consulAutoServiceRegistration(ConsulServiceRegistry registry,
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ConsulAutoRegistration consulRegistration) {
- return new ConsulAutoServiceRegistration(registry, autoServiceRegistrationProperties, properties,
- consulRegistration);
- }
-
- @Bean
- public ConsulAutoServiceRegistrationListener consulAutoServiceRegistrationListener(
- ConsulAutoServiceRegistration registration) {
- return new ConsulAutoServiceRegistrationListener(registration);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ConsulAutoRegistration consulRegistration(
- AutoServiceRegistrationProperties autoServiceRegistrationProperties, ConsulDiscoveryProperties properties,
- ApplicationContext applicationContext,
- ObjectProvider> registrationCustomizers,
- ObjectProvider> managementRegistrationCustomizers,
- HeartbeatProperties heartbeatProperties) {
- return ConsulAutoRegistration.registration(autoServiceRegistrationProperties, properties, applicationContext,
- registrationCustomizers.getIfAvailable(), managementRegistrationCustomizers.getIfAvailable(),
- heartbeatProperties);
- }
-
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnClass(ServletContext.class)
- protected static class ConsulServletConfiguration {
-
- @Bean
- public ConsulRegistrationCustomizer servletConsulCustomizer(ObjectProvider servletContext) {
- return new ConsulServletRegistrationCustomizer(servletContext);
- }
-
- }
-
- protected static class OnConsulRegistrationEnabledCondition extends AllNestedConditions {
-
- OnConsulRegistrationEnabledCondition() {
- super(ConfigurationPhase.REGISTER_BEAN);
- }
-
- @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
- static class AutoRegistrationEnabledClass {
-
- }
-
- @ConditionalOnProperty(value = "spring.cloud.consul.service-registry.auto-registration.enabled",
- matchIfMissing = true)
- static class ConsulAutoRegistrationEnabledClass {
-
- }
-
- @ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true)
- static class ServiceRegistryEnabledClass {
-
- }
-
- @ConditionalOnProperty(value = "spring.cloud.consul.service-registry.enabled", matchIfMissing = true)
- static class ConsulServiceRegistryEnabledClass {
-
- }
-
- }
-
-}
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
deleted file mode 100644
index 183498a1..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-import org.springframework.boot.web.context.ConfigurableWebServerApplicationContext;
-import org.springframework.boot.web.context.WebServerInitializedEvent;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.event.SmartApplicationListener;
-
-/**
- * Auto registers service upon web server initialization.
- *
- * @author Spencer Gibb
- */
-public class ConsulAutoServiceRegistrationListener implements SmartApplicationListener {
-
- private final ConsulAutoServiceRegistration autoServiceRegistration;
-
- public ConsulAutoServiceRegistrationListener(ConsulAutoServiceRegistration autoServiceRegistration) {
- this.autoServiceRegistration = autoServiceRegistration;
- }
-
- @Override
- public boolean supportsEventType(Class eventType) {
- return WebServerInitializedEvent.class.isAssignableFrom(eventType);
- }
-
- @Override
- public boolean supportsSourceType(Class sourceType) {
- return true;
- }
-
- @Override
- public void onApplicationEvent(ApplicationEvent applicationEvent) {
- if (applicationEvent instanceof WebServerInitializedEvent) {
- WebServerInitializedEvent event = (WebServerInitializedEvent) applicationEvent;
-
- ApplicationContext context = event.getApplicationContext();
- if (context instanceof ConfigurableWebServerApplicationContext) {
- if ("management".equals(((ConfigurableWebServerApplicationContext) context).getServerNamespace())) {
- return;
- }
- }
- this.autoServiceRegistration.setPortIfNeeded(event.getWebServer().getPort());
- this.autoServiceRegistration.start();
- }
- }
-
- @Override
- public int getOrder() {
- return 0;
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulManagementRegistrationCustomizer.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulManagementRegistrationCustomizer.java
deleted file mode 100644
index 363a1278..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulManagementRegistrationCustomizer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-/**
- * @author Alexey Savchuk (devpreview)
- */
-public interface ConsulManagementRegistrationCustomizer {
-
- /**
- * Customizes a registration.
- * @param managementRegistration registration to customize
- */
- void customize(ConsulRegistration managementRegistration);
-
-}
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
deleted file mode 100644
index 42daae32..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-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.serviceregistry.Registration;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-
-/**
- * @author Spencer Gibb
- */
-public class ConsulRegistration implements Registration {
-
- private final NewService service;
-
- private ConsulDiscoveryProperties properties;
-
- public ConsulRegistration(NewService service, ConsulDiscoveryProperties properties) {
- this.service = service;
- this.properties = properties;
- }
-
- public NewService getService() {
- return this.service;
- }
-
- protected ConsulDiscoveryProperties getProperties() {
- return this.properties;
- }
-
- public String getInstanceId() {
- return getService().getId();
- }
-
- public String getServiceId() {
- return getService().getName();
- }
-
- @Override
- public String getHost() {
- return getService().getAddress();
- }
-
- @Override
- public int getPort() {
- return getService().getPort();
- }
-
- @Override
- public boolean isSecure() {
- return this.properties.getScheme().equalsIgnoreCase("https");
- }
-
- @Override
- public URI getUri() {
- return DefaultServiceInstance.getUri(this);
- }
-
- @Override
- public Map getMetadata() {
- return getService().getMeta();
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistrationCustomizer.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistrationCustomizer.java
deleted file mode 100644
index d7b20e64..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulRegistrationCustomizer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-/**
- * @author Piotr Wielgolaski
- */
-public interface ConsulRegistrationCustomizer {
-
- void customize(ConsulRegistration registration);
-
-}
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
deleted file mode 100644
index 78184a30..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-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.discovery.ConsulDiscoveryProperties;
-import org.springframework.cloud.consul.discovery.HeartbeatProperties;
-import org.springframework.cloud.consul.discovery.TtlScheduler;
-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;
-
-/**
- * @author Spencer Gibb
- */
-public class ConsulServiceRegistry implements ServiceRegistry {
-
- private static Log log = LogFactory.getLog(ConsulServiceRegistry.class);
-
- private final ConsulClient client;
-
- private final ConsulDiscoveryProperties properties;
-
- private final TtlScheduler ttlScheduler;
-
- private final HeartbeatProperties heartbeatProperties;
-
- public ConsulServiceRegistry(ConsulClient client, ConsulDiscoveryProperties properties, TtlScheduler ttlScheduler,
- HeartbeatProperties heartbeatProperties) {
- this.client = client;
- this.properties = properties;
- this.ttlScheduler = ttlScheduler;
- this.heartbeatProperties = heartbeatProperties;
- }
-
- @Override
- public void register(ConsulRegistration reg) {
- log.info("Registering service with consul: " + reg.getService());
- try {
- this.client.agentServiceRegister(reg.getService(), this.properties.getAclToken());
- 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) {
- if (this.properties.isFailFast()) {
- log.error("Error registering service with consul: " + reg.getService(), e);
- ReflectionUtils.rethrowRuntimeException(e);
- }
- log.warn("Failfast is false. Error registering service with consul: " + reg.getService(), e);
- }
- }
-
- @Override
- public void deregister(ConsulRegistration reg) {
- if (this.ttlScheduler != null) {
- this.ttlScheduler.remove(reg.getInstanceId());
- }
- if (log.isInfoEnabled()) {
- log.info("Deregistering service with consul: " + reg.getInstanceId());
- }
- this.client.agentServiceDeregister(reg.getInstanceId(), this.properties.getAclToken());
- }
-
- @Override
- public void close() {
-
- }
-
- @Override
- public void setStatus(ConsulRegistration registration, String status) {
- if (status.equalsIgnoreCase(OUT_OF_SERVICE.getCode())) {
- this.client.agentServiceSetMaintenance(registration.getInstanceId(), true);
- }
- else if (status.equalsIgnoreCase(UP.getCode())) {
- this.client.agentServiceSetMaintenance(registration.getInstanceId(), false);
- }
- else {
- throw new IllegalArgumentException("Unknown status: " + status);
- }
-
- }
-
- @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();
-
- for (Check check : checks) {
- if (check.getServiceId().equals(registration.getInstanceId())) {
- if (check.getName().equalsIgnoreCase("Service Maintenance Mode")) {
- return OUT_OF_SERVICE.getCode();
- }
- }
- }
-
- return UP.getCode();
- }
-
-}
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
deleted file mode 100644
index 30ee6c46..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.consul.ConditionalOnConsulEnabled;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.cloud.consul.discovery.HeartbeatProperties;
-import org.springframework.cloud.consul.discovery.TtlScheduler;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnConsulEnabled
-@Conditional(ConsulServiceRegistryAutoConfiguration.OnConsulRegistrationEnabledCondition.class)
-@AutoConfigureBefore(ServiceRegistryAutoConfiguration.class)
-public class ConsulServiceRegistryAutoConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public ConsulServiceRegistry consulServiceRegistry(ConsulClient consulClient, ConsulDiscoveryProperties properties,
- HeartbeatProperties heartbeatProperties, @Autowired(required = false) TtlScheduler ttlScheduler) {
- return new ConsulServiceRegistry(consulClient, properties, ttlScheduler, heartbeatProperties);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public HeartbeatProperties heartbeatProperties() {
- return new HeartbeatProperties();
- }
-
- @Bean
- @ConditionalOnMissingBean
- // TODO: Split appropriate values to service-registry for Edgware
- public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) {
- return new ConsulDiscoveryProperties(inetUtils);
- }
-
- protected static class OnConsulRegistrationEnabledCondition extends AllNestedConditions {
-
- OnConsulRegistrationEnabledCondition() {
- super(ConfigurationPhase.REGISTER_BEAN);
- }
-
- @ConditionalOnProperty(value = "spring.cloud.service-registry.enabled", matchIfMissing = true)
- static class ServiceRegistryEnabledClass {
-
- }
-
- @ConditionalOnProperty(value = "spring.cloud.consul.service-registry.enabled", matchIfMissing = true)
- static class ConsulServiceRegistryEnabledClass {
-
- }
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java
deleted file mode 100644
index 00f2499e..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.serviceregistry;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.servlet.ServletContext;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Piotr Wielgolaski
- */
-public class ConsulServletRegistrationCustomizer implements ConsulRegistrationCustomizer {
-
- private ObjectProvider servletContext;
-
- public ConsulServletRegistrationCustomizer(ObjectProvider servletContext) {
- this.servletContext = servletContext;
- }
-
- @Override
- public void customize(ConsulRegistration registration) {
- if (this.servletContext == null) {
- return;
- }
- ServletContext sc = this.servletContext.getIfAvailable();
- if (sc != null && StringUtils.hasText(sc.getContextPath())
- && StringUtils.hasText(sc.getContextPath().replaceAll("/", ""))) {
- List tags = registration.getService().getTags();
- if (tags == null) {
- tags = new ArrayList<>();
- }
- tags.add("contextPath=" + sc.getContextPath());
- registration.getService().setTags(tags);
- }
- }
-
-}
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
deleted file mode 100644
index 3a8dcf24..00000000
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.consul.ConditionalOnConsulEnabled;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
-import org.springframework.cloud.consul.discovery.HeartbeatProperties;
-import org.springframework.cloud.consul.discovery.ReregistrationPredicate;
-import org.springframework.cloud.consul.discovery.TtlScheduler;
-import org.springframework.cloud.consul.serviceregistry.ActuatorHealthApplicationStatusProvider;
-import org.springframework.cloud.consul.serviceregistry.ApplicationStatusProvider;
-import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Auto configuration for the heartbeat.
- *
- * @author Tim Ysewyn
- * @author Chris Bono
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnConsulEnabled
-@ConditionalOnProperty("spring.cloud.consul.discovery.heartbeat.enabled")
-@ConditionalOnDiscoveryEnabled
-@AutoConfigureBefore({ ConsulServiceRegistryAutoConfiguration.class })
-@AutoConfigureAfter({ ConsulDiscoveryClientConfiguration.class })
-public class ConsulHeartbeatAutoConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public HeartbeatProperties heartbeatProperties() {
- return new HeartbeatProperties();
- }
-
- @Bean
- @ConditionalOnMissingBean
- public TtlScheduler ttlScheduler(HeartbeatProperties heartbeatProperties,
- ConsulDiscoveryProperties discoveryProperties, ConsulClient consulClient,
- ReregistrationPredicate reRegistrationPredicate,
- ObjectProvider applicationStatusProvider) {
- return new TtlScheduler(heartbeatProperties, discoveryProperties, consulClient, reRegistrationPredicate,
- applicationStatusProvider);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ReregistrationPredicate reRegistrationPredicate() {
- return ReregistrationPredicate.DEFAULT;
- }
-
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnClass(HealthEndpoint.class)
- @ConditionalOnProperty(value = "spring.cloud.consul.discovery.heartbeat.use-actuator-health", havingValue = "true",
- matchIfMissing = true)
- static class ActuatorBasedApplicationStatusProviderConfig {
-
- @Bean
- @ConditionalOnBean(HealthEndpoint.class)
- @ConditionalOnMissingBean
- public ApplicationStatusProvider actuatorHealthStatusProvider(HealthEndpoint healthEndpoint,
- HeartbeatProperties heartbeatProperties) {
- return new ActuatorHealthApplicationStatusProvider(healthEndpoint, heartbeatProperties);
- }
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-consul-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 11c71df1..00000000
--- a/spring-cloud-consul-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "properties": [
- {
- "name": "spring.cloud.consul.ribbon.enabled",
- "type": "java.lang.Boolean",
- "description": "Enables Consul and Ribbon integration.",
- "defaultValue": "true"
- },
- {
- "name": "spring.cloud.service-registry.enabled",
- "type": "java.lang.Boolean",
- "description": "Enables Service Registry functionality.",
- "defaultValue": "true"
- },
- {
- "name": "spring.cloud.consul.service-registry.enabled",
- "type": "java.lang.Boolean",
- "description": "Enables Consul Service Registry functionality.",
- "defaultValue": "true"
- },
- {
- "name": "spring.cloud.service-registry.auto-registration.enabled",
- "type": "java.lang.Boolean",
- "description": "Enables Service Registry Auto-registration.",
- "defaultValue": "true"
- },
- {
- "name": "spring.cloud.consul.service-registry.auto-registration.enabled",
- "type": "java.lang.Boolean",
- "description": "Enables Consul Service Registry Auto-registration.",
- "defaultValue": "true"
- },
- {
- "name": "spring.cloud.consul.discovery.heartbeat.use-actuator-health",
- "type": "java.lang.Boolean",
- "description": "Whether or not to take the current system health (as reported via the Actuator Health endpoint) into account when reporting the application status to the Consul TTL check. Actuator Health endpoint also has to be available to the application.",
- "defaultValue": "true"
- }
- ]
-}
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
deleted file mode 100644
index f4ad92ea..00000000
--- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.consul.discovery.configclient.ConsulDiscoveryClientConfigServiceBootstrapConfiguration
-
-org.springframework.boot.BootstrapRegistryInitializer=\
-org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerBootstrapper
diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 971efdef..00000000
--- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,7 +0,0 @@
-org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerAutoConfiguration
-org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration
-org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration
-org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration
-org.springframework.cloud.consul.discovery.reactive.ConsulReactiveDiscoveryClientConfiguration
-org.springframework.cloud.consul.discovery.ConsulCatalogWatchAutoConfiguration
-org.springframework.cloud.consul.support.ConsulHeartbeatAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchTests.java
deleted file mode 100644
index 5b5d1a21..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-public class ConsulCatalogWatchTests {
-
- @Test
- public void isRunningReportsCorrectly() {
- ConsulDiscoveryProperties properties = new ConsulDiscoveryProperties(new InetUtils(new InetUtilsProperties()));
- ConsulCatalogWatch watch = new ConsulCatalogWatch(properties, null) {
- @Override
- public void catalogServicesWatch() {
- // do nothing
- }
- };
- assertThat(watch.isRunning()).isFalse();
- watch.start();
- assertThat(watch.isRunning()).isTrue();
- watch.stop();
- assertThat(watch.isRunning()).isFalse();
- }
-
-}
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
deleted file mode 100644
index a967a93d..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-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.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;
-
-/**
- * @author Spencer Gibb
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ConsulDiscoveryClientAclTests.MyTestConfig.class,
- properties = { "spring.application.name=testConsulDiscoveryAcl",
- "spring.cloud.consul.discovery.preferIpAddress=true",
- "consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304" },
- webEnvironment = RANDOM_PORT)
-@ContextConfiguration(initializers = ConsulTestcontainers.class)
-public class ConsulDiscoveryClientAclTests {
-
- @Autowired
- private ConsulDiscoveryClient discoveryClient;
-
- @Test
- public void getInstancesForThisServiceWorks() {
- List instances = this.discoveryClient.getInstances("testConsulDiscoveryAcl");
- assertThat(instances).as("instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
- }
-
- @Test
- public void getInstancesForSecondServiceWorks() throws Exception {
-
- new SpringApplicationBuilder(MyTestConfig.class).initializers(new ConsulTestcontainers()).run(
- "--spring.application.name=testSecondServiceAcl", "--server.port=0",
- "--spring.cloud.consul.discovery.preferIpAddress=true",
- "--consul.token=2d2e6b3b-1c82-40ab-8171-54609d8ad304");
-
- List instances = this.discoveryClient.getInstances("testSecondServiceAcl");
- assertThat(instances).as("second service instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("second service instances was empty").isFalse();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @EnableDiscoveryClient
- public static class MyTestConfig {
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java
deleted file mode 100644
index b76ab0de..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2019-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import static org.junit.Assert.fail;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-public class ConsulDiscoveryClientConfigurationTests {
-
- private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
- @AfterEach
- public void after() {
- if (this.context != null && this.context.isActive()) {
- this.context.close();
- }
- }
-
- @Test
- public void consulConfigNotLoadedWhenCloudDiscoveryClientDisabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=false").applyTo(this.context);
- setupContext();
- assertBeanNotPresent(ConsulDiscoveryProperties.class);
- assertBeanNotPresent(ConsulDiscoveryClient.class);
- assertBeanNotPresent(HeartbeatProperties.class);
- }
-
- @Test
- public void consulConfigIsLoadedWhenCloudDiscoveryClientEnabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=true").applyTo(this.context);
- setupContext();
- assertBeanIsPresent(ConsulDiscoveryProperties.class);
- assertBeanIsPresent(ConsulDiscoveryClient.class);
- }
-
- @Test
- public void consulConfigNotLoadedWhenConsulDiscoveryClientDisabled() {
- TestPropertyValues.of("spring.cloud.consul.discovery.enabled=false").applyTo(this.context);
- setupContext();
- assertBeanNotPresent(ConsulDiscoveryProperties.class);
- assertBeanNotPresent(ConsulDiscoveryClient.class);
- assertBeanNotPresent(HeartbeatProperties.class);
- }
-
- @Test
- public void consulConfigIsLoadedWhenConsulDiscoveryClientEnabled() {
- TestPropertyValues.of("spring.cloud.consul.discovery.enabled=true").applyTo(this.context);
- setupContext();
- assertBeanIsPresent(ConsulDiscoveryProperties.class);
- assertBeanIsPresent(ConsulDiscoveryClient.class);
- }
-
- @Test
- public void consulConfigNotLoadedWhenCloudDiscoveryDisabled_ConsulDiscoveryClientDisabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=false", "spring.cloud.consul.discovery.enabled=false")
- .applyTo(this.context);
- setupContext();
- assertBeanNotPresent(ConsulDiscoveryProperties.class);
- assertBeanNotPresent(ConsulDiscoveryClient.class);
- assertBeanNotPresent(HeartbeatProperties.class);
- }
-
- @Test
- public void consulConfigIsLoadedWhenCloudDiscoveryEnabled_ConsulDiscoveryClientEnabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=true", "spring.cloud.consul.discovery.enabled=true")
- .applyTo(this.context);
- setupContext();
- assertBeanIsPresent(ConsulDiscoveryProperties.class);
- assertBeanIsPresent(ConsulDiscoveryClient.class);
- }
-
- @Test
- public void consulConfigNotLoadedWhenCloudDiscoveryEnabled_ConsulDiscoveryClientDisabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=true", "spring.cloud.consul.discovery.enabled=false")
- .applyTo(this.context);
- setupContext();
- assertBeanNotPresent(ConsulDiscoveryProperties.class);
- assertBeanNotPresent(ConsulDiscoveryClient.class);
- assertBeanNotPresent(HeartbeatProperties.class);
- }
-
- @Test
- public void consulConfigNotLoadedWhenCloudDiscoveryDisabled_ConsulDiscoveryClientEnabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=false", "spring.cloud.consul.discovery.enabled=true")
- .applyTo(this.context);
- setupContext();
- assertBeanNotPresent(ConsulDiscoveryProperties.class);
- assertBeanNotPresent(ConsulDiscoveryClient.class);
- assertBeanNotPresent(HeartbeatProperties.class);
- }
-
- private void setupContext(Class... config) {
- ConfigurationPropertySources.attach(this.context.getEnvironment());
- this.context.register(UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
- ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class);
- for (Class value : config) {
- this.context.register(value);
- }
- this.context.refresh();
- }
-
- private void assertBeanNotPresent(Class beanClass) {
- try {
- context.getBean(beanClass);
- fail("Bean of type " + beanClass + " should not have been created.");
- }
- catch (NoSuchBeanDefinitionException exception) {
- // expected exception
- }
- }
-
- private void assertBeanIsPresent(Class beanClass) {
- try {
- context.getBean(beanClass);
- }
- catch (NoSuchBeanDefinitionException exception) {
- fail("Bean of type " + beanClass + " should have been created.");
- }
- }
-
-}
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
deleted file mode 100644
index 10bbb8af..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.http.conn.util.InetAddressUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-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.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;
-
-/**
- * @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",
- "spring.cloud.consul.discovery.hostname=testConsulDiscovery2Host",
- "spring.cloud.consul.discovery.registerHealthCheck=false",
- "spring.cloud.consul.discovery.tags=plaintag", "spring.cloud.consul.discovery.metadata[foo]=bar",
- "spring.cloud.consul.discovery.metadata[foo2]=bar2" },
- webEnvironment = RANDOM_PORT)
-@ContextConfiguration(initializers = ConsulTestcontainers.class)
-public class ConsulDiscoveryClientCustomizedTests {
-
- @Autowired
- private ConsulDiscoveryClient discoveryClient;
-
- @Test
- public void getInstancesForServiceWorks() {
- List instances = this.discoveryClient.getInstances("consul");
- assertThat(instances).as("instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
- }
-
- private void assertNotIpAddress(ServiceInstance instance) {
- assertThat(InetAddressUtils.isIPv4Address(instance.getHost())).as("host is an ip address").isFalse();
- }
-
- @Test
- public void getMetadataWorks() throws InterruptedException {
- List instances = this.discoveryClient.getInstances("testConsulDiscovery2");
- assertThat(instances).as("instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
-
- ServiceInstance instance = instances.get(0);
- assertInstance(instance);
- }
-
- private void assertInstance(ServiceInstance instance) {
- assertThat(instance.getInstanceId()).as("instance id was wrong").isEqualTo("testConsulDiscovery2Id");
- assertThat(instance.getServiceId()).as("service id was wrong").isEqualTo("testConsulDiscovery2");
-
- Map metadata = instance.getMetadata();
- assertThat(metadata).as("metadata was null").isNotNull();
-
- String foo = metadata.get("foo");
- assertThat(foo).as("metadata key foo was wrong").isEqualTo("bar");
-
- String foo2 = metadata.get("foo2");
- assertThat(foo2).as("metadata key foo2 was wrong").isEqualTo("bar2");
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @EnableDiscoveryClient
- public static class MyTestConfig {
-
- }
-
-}
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
deleted file mode 100644
index a2624d0c..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-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.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;
-
-/**
- * @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" },
- classes = ConsulDiscoveryClientHttpsTests.MyTestConfig.class, webEnvironment = RANDOM_PORT)
-@ContextConfiguration(initializers = ConsulTestcontainers.class)
-public class ConsulDiscoveryClientHttpsTests {
-
- @Autowired
- private ConsulDiscoveryClient discoveryClient;
-
- @Test
- public void getInstancesForServiceWorks() {
- List instances = this.discoveryClient.getInstances("testConsulDiscoveryHttps");
- assertThat(instances).as("instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
-
- ServiceInstance instance = instances.get(0);
- assertThat(instance.isSecure()).as("instance was not secure (https)").isTrue();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @EnableDiscoveryClient
- public static class MyTestConfig {
-
- }
-
-}
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
deleted file mode 100644
index 9f2f28f1..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-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;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
-import org.springframework.cloud.consul.ConsulAutoConfiguration;
-import org.springframework.cloud.consul.ConsulProperties;
-import org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration;
-import org.springframework.cloud.consul.test.ConsulTestcontainers;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
-/**
- * @author Tomas Forsman
- */
-@SpringBootTest(classes = ConsulDiscoveryClientNoPortTests.TestConfig.class,
- properties = { "spring.application.name=myTestService-NoPort",
- "spring.cloud.consul.discovery.instanceId=myTestService1-NoPort" },
- webEnvironment = NONE)
-@Testcontainers
-public class ConsulDiscoveryClientNoPortTests {
-
- // 1.10 introduces different data for port
- @Container
- static ConsulContainer consul = ConsulTestcontainers.createConsulContainer("1.10");
-
- @DynamicPropertySource
- static void consulProperties(DynamicPropertyRegistry registry) {
- registry.add(ConsulProperties.PREFIX + ".host", consul::getHost);
- registry.add(ConsulProperties.PREFIX + ".port", () -> consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT));
- }
-
- @Autowired
- private ConsulDiscoveryClient discoveryClient;
-
- @Autowired
- private ConsulClient client;
-
- @Test
- public void contextLoads() {
- NewService newService = new NewService();
- newService.setId("myTestService2-NoPort");
- newService.setName("myTestService2-NoPort");
- client.agentServiceRegister(newService);
-
- List instances = discoveryClient.getInstances("myTestService2-NoPort");
- assertThat(instances.size()).isEqualTo(1);
- ServiceInstance service = instances.get(0);
- assertThat(service).as("service was null").isNotNull();
- assertThat(service.getPort()).as("service port is not 0").isZero();
- assertThat(service.getInstanceId()).as("service id was wrong").isEqualTo("myTestService2-NoPort");
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class,
- ConsulAutoServiceRegistrationAutoConfiguration.class })
- public static class TestConfig {
-
- }
-
-}
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
deleted file mode 100644
index c988fc7a..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientProbeTests.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.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.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link ConsulDiscoveryClient} probe API.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ConsulDiscoveryClientProbeTests {
-
- @Mock
- private ConsulClient consulClient;
-
- @Mock
- private ConsulDiscoveryProperties consulDiscoveryProperties;
-
- @InjectMocks
- private ConsulDiscoveryClient discoveryClient;
-
- @Test
- public void probeSucceeds() {
- when(consulClient.getStatusLeader())
- .thenReturn(new Response<>("5150", 5150L, false, System.currentTimeMillis()));
- 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)
- .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
deleted file mode 100644
index 45732a8c..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientQueryTagsTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-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;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-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.test.ConsulTestcontainers;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Lightweight integration tests to verify Consul query tags usage in
- * {@link ConsulDiscoveryClient#getInstances(String)}.
- *
- * @author Piotr Wielgolaski
- * @author Chris Bono
- */
-class ConsulDiscoveryClientQueryTagsTests {
-
- private static final String NAME = "query-tags-test-services";
- static NewService QA_WEST_SERVICE = serviceForEnvironmentAndRegion("qa", "us-west", 9080);
- static NewService QA_EAST_SERVICE = serviceForEnvironmentAndRegion("qa", "us-east", 9080);
- static NewService PROD_WEST_SERVICE = serviceForEnvironmentAndRegion("prod", "us-west", 9082);
- static NewService PROD_EAST_SERVICE = serviceForEnvironmentAndRegion("prod", "us-east", 9082);
-
- private ApplicationContextRunner appContextRunner = new ApplicationContextRunner()
- .withInitializer(new ConsulTestcontainers()).withConfiguration(AutoConfigurations.of(TestConfig.class))
- .withPropertyValues("spring.application.name=consulServiceQueryTags",
- "spring.cloud.consul.discovery.catalogServicesWatch.enabled=false");
-
- private static NewService serviceForEnvironmentAndRegion(String env, String region, int port) {
- NewService service = new NewService();
- service.setAddress("localhost");
- service.setId(String.format("%s-%s-%s", NAME, env, region));
- service.setName(NAME);
- service.setPort(port);
- service.setTags(Arrays.asList(env, region));
- return service;
- }
-
- @Test
- void singleMatchingTagSpecifiedOnDefaultQueryTagProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa").run(
- context -> assertThatGetInstancesReturnsExpectedServices(context, QA_WEST_SERVICE, QA_EAST_SERVICE));
- }
-
- @Test
- void singleNonMatchingTagSpecifiedOnDefaultQueryTagProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=foo")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, new NewService[0]));
- }
-
- @Test
- void multipleMatchingTagsSpecifiedOnDefaultQueryTagProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=prod,us-west")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, PROD_WEST_SERVICE));
- }
-
- @Test
- void multipleNonMatchingTagsSpecifiedOnDefaultQueryTagProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=prod,foo")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, new NewService[0]));
- }
-
- @Test
- void multipleConflictingMatchingTagsSpecifiedOnDefaultQueryTagsProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=prod,qa")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context));
- }
-
- @Test
- void emptyTagSpecifiedOnDefaultQueryTagProperty() {
- appContextRunner.withPropertyValues("spring.cloud.consul.discovery.default-query-tag=")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, QA_WEST_SERVICE, QA_EAST_SERVICE,
- PROD_WEST_SERVICE, PROD_EAST_SERVICE));
- }
-
- @Test
- void singleTagSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=prod")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, PROD_WEST_SERVICE,
- PROD_EAST_SERVICE));
- }
-
- @Test
- void singleNonMatchingTagSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=foo")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, new NewService[0]));
- }
-
- @Test
- void multipleMatchingTagsSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=prod,us-west")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, PROD_WEST_SERVICE));
- }
-
- @Test
- void multipleNotAllMatchingTagsSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=prod,foo")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, new NewService[0]));
- }
-
- @Test
- void multipleConflictingMatchingTagsSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=prod,qa")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, new NewService[0]));
- }
-
- @Test
- void emptyTagSpecifiedOnServerListQueryTagsProperty() {
- appContextRunner
- .withPropertyValues("spring.cloud.consul.discovery.default-query-tag=qa",
- "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=")
- .run(context -> assertThatGetInstancesReturnsExpectedServices(context, QA_WEST_SERVICE, QA_EAST_SERVICE,
- PROD_WEST_SERVICE, PROD_EAST_SERVICE));
- }
-
- @Test
- void noTagsSpecifiedOnAnyProperties() {
- appContextRunner.run(context -> assertThatGetInstancesReturnsExpectedServices(context, QA_WEST_SERVICE,
- QA_EAST_SERVICE, PROD_WEST_SERVICE, PROD_EAST_SERVICE));
- }
-
- private void assertThatGetInstancesReturnsExpectedServices(AssertableApplicationContext context,
- NewService... expectedServices) {
- if (expectedServices == null) {
- expectedServices = new NewService[0];
- }
- assertThat(context).hasNotFailed();
- ConsulDiscoveryClient consulDiscoveryClient = context.getBean(ConsulDiscoveryClient.class);
- List serviceInstances = consulDiscoveryClient.getInstances(NAME);
- assertThat(serviceInstances).hasSize(expectedServices.length)
- .hasOnlyElementsOfType(ConsulServiceInstance.class);
- for (NewService expectedService : expectedServices) {
- assertThat(serviceInstances)
- .anySatisfy(serviceInstance -> assertThatServicesMatch((ConsulServiceInstance) serviceInstance,
- expectedService));
- }
- }
-
- private void assertThatServicesMatch(ConsulServiceInstance serviceInstance, NewService expectedService) {
- assertThat(serviceInstance.getPort()).isEqualTo(expectedService.getPort());
- assertThat(serviceInstance.getServiceId()).isEqualTo(expectedService.getName());
- assertThat(serviceInstance.getInstanceId()).isEqualTo(expectedService.getId());
- assertThat(serviceInstance).isInstanceOf(ConsulServiceInstance.class);
- assertThat(serviceInstance.getTags()).containsExactlyElementsOf(expectedService.getTags());
- assertThat(serviceInstance.getHealthService()).isNotNull();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @Import(ConsulDiscoveryClientConfiguration.class)
- protected static class TestConfig {
-
- @Autowired
- private ConsulClient consulClient;
-
- @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);
- }
-
- @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());
- }
-
- }
-
-}
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
deleted file mode 100644
index c537e41d..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-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.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.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;
-
-/**
- * @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)
-@ContextConfiguration(initializers = ConsulTestcontainers.class)
-public class ConsulDiscoveryClientTests {
-
- @Autowired
- private ConsulDiscoveryClient discoveryClient;
-
- @Autowired
- private ConsulClient consulClient;
-
- @Test
- public void getInstancesForServiceWorks() {
- List instances = this.discoveryClient.getInstances("testConsulDiscovery");
- assertThat(instances).as("instances was null").isNotNull();
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
-
- ServiceInstance instance = instances.get(0);
- assertThat(instance.isSecure()).as("instance was secure (https)").isFalse();
- assertIpAddress(instance);
- assertThat(instance.getMetadata()).containsEntry("foo", "bar");
- }
-
- @Test
- public void getInstancesForServiceRespectsQueryParams() {
- Response> catalogDatacenters = this.consulClient.getCatalogDatacenters();
-
- List dataCenterList = catalogDatacenters.getValue();
- assertThat(dataCenterList.isEmpty()).as("no data centers found").isFalse();
- List instances = this.discoveryClient.getInstances("testConsulDiscovery",
- new QueryParams(dataCenterList.get(0)));
- assertThat(instances.isEmpty()).as("instances was empty").isFalse();
-
- ServiceInstance instance = instances.get(0);
- assertIpAddress(instance);
- }
-
- @Test
- public void probeWorks() {
- discoveryClient.probe();
- }
-
- private void assertIpAddress(ServiceInstance instance) {
- assertThat(Character.isDigit(instance.getHost().charAt(0))).as("host isn't an ip address").isTrue();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @EnableDiscoveryClient
- public static class MyTestConfig {
-
- }
-
-}
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java
deleted file mode 100644
index 9764f168..00000000
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryPropertiesTests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.consul.discovery;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Unit tests for {@link ConsulDiscoveryProperties}.
- *
- * @author Chris Bono
- */
-class ConsulDiscoveryPropertiesTests {
-
- private static final String DEFAULT_TAG = "defaultTag";
-
- private static final String MAP_TAG = "mapTag";
-
- private static final String MAP_DC = "mapDc";
-
- private static final String SERVICE_NAME_IN_MAP = "serviceNameInMap";
-
- private static final String SERVICE_NAME_NOT_IN_MAP = "serviceNameNotInMap";
-
- private final Map