metadataMap = new HashMap<>();
-
- /**
- * Returns the data center this instance is deployed. This information is used to get
- * some AWS specific instance information if the instance is deployed in AWS.
- */
- private DataCenterInfo dataCenterInfo = new MyDataCenterInfo(DataCenterInfo.Name.MyOwn);
-
- /**
- * Get the IPAdress of the instance. This information is for academic purposes only as
- * the communication from other instances primarily happen using the information
- * supplied in {@link #getHostName(boolean)}.
- */
- private String ipAddress;
-
- /**
- * Gets the relative status page URL path for this instance. The status page URL is
- * then constructed out of the hostName and the type of communication - secure or
- * unsecure as specified in securePort and nonSecurePort.
- *
- * It is normally used for informational purposes for other services to find about the
- * status of this instance. Users can provide a simple HTML indicating what is the
- * current status of the instance.
- */
- private String statusPageUrlPath = actuatorPrefix + "/info";
-
- /**
- * Gets the absolute status page URL path for this instance. The users can provide the
- * statusPageUrlPath if the status page resides in the same instance talking to
- * eureka, else in the cases where the instance is a proxy for some other server,
- * users can provide the full URL. If the full URL is provided it takes precedence.
- *
- * It is normally used for informational purposes for other services to find about the
- * status of this instance. Users can provide a simple HTML indicating what is the
- * current status of the instance.
- */
- private String statusPageUrl;
-
- /**
- * Gets the relative home page URL Path for this instance. The home page URL is then
- * constructed out of the hostName and the type of communication - secure or unsecure.
- *
- * It is normally used for informational purposes for other services to use it as a
- * landing page.
- */
- private String homePageUrlPath = "/";
-
- /**
- * Gets the absolute home page URL for this instance. The users can provide the
- * homePageUrlPath if the home page resides in the same instance talking to eureka,
- * else in the cases where the instance is a proxy for some other server, users can
- * provide the full URL. If the full URL is provided it takes precedence.
- *
- * It is normally used for informational purposes for other services to use it as a
- * landing page. The full URL should follow the format http://${eureka.hostname}:7001/
- * where the value ${eureka.hostname} is replaced at runtime.
- */
- private String homePageUrl;
-
- /**
- * Gets the relative health check URL path for this instance. The health check page
- * URL is then constructed out of the hostname and the type of communication - secure
- * or unsecure as specified in securePort and nonSecurePort.
- *
- * It is normally used for making educated decisions based on the health of the
- * instance - for example, it can be used to determine whether to proceed deployments
- * to an entire farm or stop the deployments without causing further damage.
- */
- private String healthCheckUrlPath = actuatorPrefix + "/health";
-
- /**
- * Gets the absolute health check page URL for this instance. The users can provide
- * the healthCheckUrlPath if the health check page resides in the same instance
- * talking to eureka, else in the cases where the instance is a proxy for some other
- * server, users can provide the full URL. If the full URL is provided it takes
- * precedence.
- *
- *
- * It is normally used for making educated decisions based on the health of the
- * instance - for example, it can be used to determine whether to proceed deployments
- * to an entire farm or stop the deployments without causing further damage. The full
- * URL should follow the format http://${eureka.hostname}:7001/ where the value
- * ${eureka.hostname} is replaced at runtime.
- */
- private String healthCheckUrl;
-
- /**
- * Gets the absolute secure health check page URL for this instance. The users can
- * provide the secureHealthCheckUrl if the health check page resides in the same
- * instance talking to eureka, else in the cases where the instance is a proxy for
- * some other server, users can provide the full URL. If the full URL is provided it
- * takes precedence.
- *
- *
- * It is normally used for making educated decisions based on the health of the
- * instance - for example, it can be used to determine whether to proceed deployments
- * to an entire farm or stop the deployments without causing further damage. The full
- * URL should follow the format http://${eureka.hostname}:7001/ where the value
- * ${eureka.hostname} is replaced at runtime.
- */
- private String secureHealthCheckUrl;
-
- /**
- * Get the namespace used to find properties. Ignored in Spring Cloud.
- */
- private String namespace = "eureka";
-
- /**
- * The hostname if it can be determined at configuration time (otherwise it will be
- * guessed from OS primitives).
- */
- private String hostname;
-
- /**
- * Flag to say that, when guessing a hostname, the IP address of the server should be
- * used in preference to the hostname reported by the OS.
- */
- private boolean preferIpAddress = false;
-
- /**
- * Initial status to register with remote Eureka server.
- */
- private InstanceStatus initialStatus = InstanceStatus.UP;
-
- private String[] defaultAddressResolutionOrder = new String[0];
-
- private Environment environment;
-
- public String getHostname() {
- return getHostName(false);
- }
-
- @SuppressWarnings("unused")
- private EurekaInstanceConfigBean() {
- }
-
- @Autowired
- public EurekaInstanceConfigBean(InetUtils inetUtils) {
- this.inetUtils = inetUtils;
- this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo();
- this.ipAddress = this.hostInfo.getIpAddress();
- this.hostname = this.hostInfo.getHostname();
- }
-
- @Override
- public String getInstanceId() {
- if (this.instanceId == null && this.metadataMap != null) {
- return this.metadataMap.get("instanceId");
- }
- return this.instanceId;
- }
-
- @Override
- public boolean getSecurePortEnabled() {
- return this.securePortEnabled;
- }
-
- public void setHostname(String hostname) {
- this.hostname = hostname;
- this.hostInfo.override = true;
- }
-
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- this.hostInfo.override = true;
- }
-
- @Override
- public String getHostName(boolean refresh) {
- if (refresh && !this.hostInfo.override) {
- this.ipAddress = this.hostInfo.getIpAddress();
- this.hostname = this.hostInfo.getHostname();
- }
- return this.preferIpAddress ? this.ipAddress : this.hostname;
- }
-
- @Override
- public void setEnvironment(Environment environment) {
- this.environment = environment;
- // set some defaults from the environment, but allow the defaults to use relaxed
- // binding
- String springAppName = this.environment.getProperty("spring.application.name", "");
- if (StringUtils.hasText(springAppName)) {
- setAppname(springAppName);
- setVirtualHostName(springAppName);
- setSecureVirtualHostName(springAppName);
- }
- }
-
- private HostInfo getHostInfo() {
- return hostInfo;
- }
-
- private void setHostInfo(HostInfo hostInfo) {
- this.hostInfo = hostInfo;
- }
-
- private InetUtils getInetUtils() {
- return inetUtils;
- }
-
- private void setInetUtils(InetUtils inetUtils) {
- this.inetUtils = inetUtils;
- }
-
- public String getAppname() {
- return appname;
- }
-
- public void setAppname(String appname) {
- this.appname = appname;
- }
-
- public String getAppGroupName() {
- return appGroupName;
- }
-
- public void setAppGroupName(String appGroupName) {
- this.appGroupName = appGroupName;
- }
-
- public boolean isInstanceEnabledOnit() {
- return instanceEnabledOnit;
- }
-
- public void setInstanceEnabledOnit(boolean instanceEnabledOnit) {
- this.instanceEnabledOnit = instanceEnabledOnit;
- }
-
- public int getNonSecurePort() {
- return nonSecurePort;
- }
-
- public void setNonSecurePort(int nonSecurePort) {
- this.nonSecurePort = nonSecurePort;
- }
-
- public int getSecurePort() {
- return securePort;
- }
-
- public void setSecurePort(int securePort) {
- this.securePort = securePort;
- }
-
- public boolean isNonSecurePortEnabled() {
- return nonSecurePortEnabled;
- }
-
- public void setNonSecurePortEnabled(boolean nonSecurePortEnabled) {
- this.nonSecurePortEnabled = nonSecurePortEnabled;
- }
-
- public boolean isSecurePortEnabled() {
- return securePortEnabled;
- }
-
- public void setSecurePortEnabled(boolean securePortEnabled) {
- this.securePortEnabled = securePortEnabled;
- }
-
- public int getLeaseRenewalIntervalInSeconds() {
- return leaseRenewalIntervalInSeconds;
- }
-
- public void setLeaseRenewalIntervalInSeconds(int leaseRenewalIntervalInSeconds) {
- this.leaseRenewalIntervalInSeconds = leaseRenewalIntervalInSeconds;
- }
-
- public int getLeaseExpirationDurationInSeconds() {
- return leaseExpirationDurationInSeconds;
- }
-
- public void setLeaseExpirationDurationInSeconds(int leaseExpirationDurationInSeconds) {
- this.leaseExpirationDurationInSeconds = leaseExpirationDurationInSeconds;
- }
-
- public String getVirtualHostName() {
- return virtualHostName;
- }
-
- public void setVirtualHostName(String virtualHostName) {
- this.virtualHostName = virtualHostName;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- public String getSecureVirtualHostName() {
- return secureVirtualHostName;
- }
-
- public void setSecureVirtualHostName(String secureVirtualHostName) {
- this.secureVirtualHostName = secureVirtualHostName;
- }
-
- public String getASGName() {
- return aSGName;
- }
-
- public void setASGName(String aSGName) {
- this.aSGName = aSGName;
- }
-
- public Map getMetadataMap() {
- return metadataMap;
- }
-
- public void setMetadataMap(Map metadataMap) {
- this.metadataMap = metadataMap;
- }
-
- public DataCenterInfo getDataCenterInfo() {
- return dataCenterInfo;
- }
-
- public void setDataCenterInfo(DataCenterInfo dataCenterInfo) {
- this.dataCenterInfo = dataCenterInfo;
- }
-
- public String getIpAddress() {
- return ipAddress;
- }
-
- public String getStatusPageUrlPath() {
- return statusPageUrlPath;
- }
-
- public void setStatusPageUrlPath(String statusPageUrlPath) {
- this.statusPageUrlPath = statusPageUrlPath;
- }
-
- public String getStatusPageUrl() {
- return statusPageUrl;
- }
-
- public void setStatusPageUrl(String statusPageUrl) {
- this.statusPageUrl = statusPageUrl;
- }
-
- public String getHomePageUrlPath() {
- return homePageUrlPath;
- }
-
- public void setHomePageUrlPath(String homePageUrlPath) {
- this.homePageUrlPath = homePageUrlPath;
- }
-
- public String getHomePageUrl() {
- return homePageUrl;
- }
-
- public void setHomePageUrl(String homePageUrl) {
- this.homePageUrl = homePageUrl;
- }
-
- public String getHealthCheckUrlPath() {
- return healthCheckUrlPath;
- }
-
- public void setHealthCheckUrlPath(String healthCheckUrlPath) {
- this.healthCheckUrlPath = healthCheckUrlPath;
- }
-
- public String getHealthCheckUrl() {
- return healthCheckUrl;
- }
-
- public void setHealthCheckUrl(String healthCheckUrl) {
- this.healthCheckUrl = healthCheckUrl;
- }
-
- public String getSecureHealthCheckUrl() {
- return secureHealthCheckUrl;
- }
-
- public void setSecureHealthCheckUrl(String secureHealthCheckUrl) {
- this.secureHealthCheckUrl = secureHealthCheckUrl;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public boolean isPreferIpAddress() {
- return preferIpAddress;
- }
-
- public void setPreferIpAddress(boolean preferIpAddress) {
- this.preferIpAddress = preferIpAddress;
- }
-
- public InstanceStatus getInitialStatus() {
- return initialStatus;
- }
-
- public void setInitialStatus(InstanceStatus initialStatus) {
- this.initialStatus = initialStatus;
- }
-
- public String[] getDefaultAddressResolutionOrder() {
- return defaultAddressResolutionOrder;
- }
-
- public void setDefaultAddressResolutionOrder(String[] defaultAddressResolutionOrder) {
- this.defaultAddressResolutionOrder = defaultAddressResolutionOrder;
- }
-
- public Environment getEnvironment() {
- return environment;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaInstanceConfigBean that = (EurekaInstanceConfigBean) o;
- return Objects.equals(hostInfo, that.hostInfo) && Objects.equals(inetUtils, that.inetUtils)
- && Objects.equals(appname, that.appname) && Objects.equals(appGroupName, that.appGroupName)
- && instanceEnabledOnit == that.instanceEnabledOnit && nonSecurePort == that.nonSecurePort
- && securePort == that.securePort && nonSecurePortEnabled == that.nonSecurePortEnabled
- && securePortEnabled == that.securePortEnabled
- && leaseRenewalIntervalInSeconds == that.leaseRenewalIntervalInSeconds
- && leaseExpirationDurationInSeconds == that.leaseExpirationDurationInSeconds
- && Objects.equals(virtualHostName, that.virtualHostName) && Objects.equals(instanceId, that.instanceId)
- && Objects.equals(secureVirtualHostName, that.secureVirtualHostName)
- && Objects.equals(aSGName, that.aSGName) && Objects.equals(metadataMap, that.metadataMap)
- && Objects.equals(dataCenterInfo, that.dataCenterInfo) && Objects.equals(ipAddress, that.ipAddress)
- && Objects.equals(statusPageUrlPath, that.statusPageUrlPath)
- && Objects.equals(statusPageUrl, that.statusPageUrl)
- && Objects.equals(homePageUrlPath, that.homePageUrlPath)
- && Objects.equals(homePageUrl, that.homePageUrl)
- && Objects.equals(healthCheckUrlPath, that.healthCheckUrlPath)
- && Objects.equals(healthCheckUrl, that.healthCheckUrl)
- && Objects.equals(secureHealthCheckUrl, that.secureHealthCheckUrl)
- && Objects.equals(namespace, that.namespace) && Objects.equals(hostname, that.hostname)
- && preferIpAddress == that.preferIpAddress && Objects.equals(initialStatus, that.initialStatus)
- && Arrays.equals(defaultAddressResolutionOrder, that.defaultAddressResolutionOrder)
- && Objects.equals(environment, that.environment);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(hostInfo, inetUtils, appname, appGroupName, instanceEnabledOnit, nonSecurePort, securePort,
- nonSecurePortEnabled, securePortEnabled, leaseRenewalIntervalInSeconds,
- leaseExpirationDurationInSeconds, virtualHostName, instanceId, secureVirtualHostName, aSGName,
- metadataMap, dataCenterInfo, ipAddress, statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
- healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace, hostname, preferIpAddress,
- initialStatus, Arrays.hashCode(defaultAddressResolutionOrder), environment);
- }
-
- @Override
- public String toString() {
- return new StringBuilder("EurekaInstanceConfigBean{").append("hostInfo=").append(hostInfo).append(", ")
- .append("inetUtils=").append(inetUtils).append(", ").append("appname='").append(appname).append("', ")
- .append("appGroupName='").append(appGroupName).append("', ").append("instanceEnabledOnit=")
- .append(instanceEnabledOnit).append(", ").append("nonSecurePort=").append(nonSecurePort).append(", ")
- .append("securePort=").append(securePort).append(", ").append("nonSecurePortEnabled=")
- .append(nonSecurePortEnabled).append(", ").append("securePortEnabled=").append(securePortEnabled)
- .append(", ").append("leaseRenewalIntervalInSeconds=").append(leaseRenewalIntervalInSeconds)
- .append(", ").append("leaseExpirationDurationInSeconds=").append(leaseExpirationDurationInSeconds)
- .append(", ").append("virtualHostName='").append(virtualHostName).append("', ").append("instanceId='")
- .append(instanceId).append("', ").append("secureVirtualHostName='").append(secureVirtualHostName)
- .append("', ").append("aSGName='").append(aSGName).append("', ").append("metadataMap=")
- .append(metadataMap).append(", ").append("dataCenterInfo=").append(dataCenterInfo).append(", ")
- .append("ipAddress='").append(ipAddress).append("', ").append("statusPageUrlPath='")
- .append(statusPageUrlPath).append("', ").append("statusPageUrl='").append(statusPageUrl).append("', ")
- .append("homePageUrlPath='").append(homePageUrlPath).append("', ").append("homePageUrl='")
- .append(homePageUrl).append("', ").append("healthCheckUrlPath='").append(healthCheckUrlPath)
- .append("', ").append("healthCheckUrl='").append(healthCheckUrl).append("', ")
- .append("secureHealthCheckUrl='").append(secureHealthCheckUrl).append("', ").append("namespace='")
- .append(namespace).append("', ").append("hostname='").append(hostname).append("', ")
- .append("preferIpAddress=").append(preferIpAddress).append(", ").append("initialStatus=")
- .append(initialStatus).append(", ").append("defaultAddressResolutionOrder=")
- .append(Arrays.toString(defaultAddressResolutionOrder)).append(", ").append("environment=")
- .append(environment).append(", ").append("}").toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstance.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstance.java
deleted file mode 100644
index fadc02442..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstance.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Objects;
-
-import com.netflix.appinfo.InstanceInfo;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-
-import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
-
-/**
- * An Eureka-specific {@link ServiceInstance} implementation.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @author Olga Maciaszek-Sharma
- * @author Tim Ysewyn
- */
-public class EurekaServiceInstance implements ServiceInstance {
-
- private final InstanceInfo instance;
-
- public EurekaServiceInstance(InstanceInfo instance) {
- Assert.notNull(instance, "Service instance required");
- this.instance = instance;
- }
-
- public InstanceInfo getInstanceInfo() {
- return instance;
- }
-
- @Override
- public String getInstanceId() {
- return this.instance.getId();
- }
-
- @Override
- public String getServiceId() {
- return this.instance.getAppName();
- }
-
- @Override
- public String getHost() {
- return this.instance.getHostName();
- }
-
- @Override
- public int getPort() {
- if (isSecure()) {
- return this.instance.getSecurePort();
- }
- return this.instance.getPort();
- }
-
- @Override
- public boolean isSecure() {
- // assume if secure is enabled, that is the default
- return this.instance.isPortEnabled(SECURE);
- }
-
- @Override
- public URI getUri() {
- return DefaultServiceInstance.getUri(this);
- }
-
- @Override
- public Map getMetadata() {
- return this.instance.getMetadata();
- }
-
- @Override
- public String getScheme() {
- return getUri().getScheme();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaServiceInstance that = (EurekaServiceInstance) o;
- return Objects.equals(this.instance, that.instance);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.instance);
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("instance", instance).toString();
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java
deleted file mode 100644
index 22effe03b..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.util.Map;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.LeaseInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * See com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider.
- *
- * @author Spencer Gibb
- */
-public class InstanceInfoFactory {
-
- private static final Log log = LogFactory.getLog(InstanceInfoFactory.class);
-
- public InstanceInfo create(EurekaInstanceConfig config) {
- LeaseInfo.Builder leaseInfoBuilder = LeaseInfo.Builder.newBuilder()
- .setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds())
- .setDurationInSecs(config.getLeaseExpirationDurationInSeconds());
-
- // Builder the instance information to be registered with eureka
- // server
- InstanceInfo.Builder builder = InstanceInfo.Builder.newBuilder();
-
- String namespace = config.getNamespace();
- if (!namespace.endsWith(".")) {
- namespace = namespace + ".";
- }
- builder.setNamespace(namespace).setAppName(config.getAppname()).setInstanceId(config.getInstanceId())
- .setAppGroupName(config.getAppGroupName()).setDataCenterInfo(config.getDataCenterInfo())
- .setIPAddr(config.getIpAddress()).setHostName(config.getHostName(false))
- .setPort(config.getNonSecurePort())
- .enablePort(InstanceInfo.PortType.UNSECURE, config.isNonSecurePortEnabled())
- .setSecurePort(config.getSecurePort())
- .enablePort(InstanceInfo.PortType.SECURE, config.getSecurePortEnabled())
- .setVIPAddress(config.getVirtualHostName()).setSecureVIPAddress(config.getSecureVirtualHostName())
- .setHomePageUrl(config.getHomePageUrlPath(), config.getHomePageUrl())
- .setStatusPageUrl(config.getStatusPageUrlPath(), config.getStatusPageUrl())
- .setHealthCheckUrls(config.getHealthCheckUrlPath(), config.getHealthCheckUrl(),
- config.getSecureHealthCheckUrl())
- .setASGName(config.getASGName());
-
- // Start off with the STARTING state to avoid traffic
- if (!config.isInstanceEnabledOnit()) {
- InstanceInfo.InstanceStatus initialStatus = InstanceInfo.InstanceStatus.STARTING;
- if (log.isInfoEnabled()) {
- log.info("Setting initial instance status as: " + initialStatus);
- }
- builder.setStatus(initialStatus);
- }
- else {
- if (log.isInfoEnabled()) {
- log.info("Setting initial instance status as: " + InstanceInfo.InstanceStatus.UP
- + ". This may be too early for the instance to advertise itself as available. "
- + "You would instead want to control this via a healthcheck handler.");
- }
- }
-
- // Add any user-specific metadata information
- for (Map.Entry mapEntry : config.getMetadataMap().entrySet()) {
- String key = mapEntry.getKey();
- String value = mapEntry.getValue();
- // only add the metadata if the value is present
- if (value != null && !value.isEmpty()) {
- builder.add(key, value);
- }
- }
-
- InstanceInfo instanceInfo = builder.build();
- instanceInfo.setLeaseInfo(leaseInfoBuilder.build());
- return instanceInfo;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java
deleted file mode 100644
index 394420ddb..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.util.Objects;
-
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.core5.http.io.SocketConfig;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Properties for configuring timeouts used in {@link RestTemplate} required by
- * {@link RestTemplateEurekaHttpClient}.
- *
- * @author Jiwon Jeon
- * @since 3.1.6
- */
-@ConfigurationProperties("eureka.client.rest-template-timeout")
-public class RestTemplateTimeoutProperties {
-
- /**
- * Default values are set to 180000, in keeping with {@link RequestConfig} and
- * {@link SocketConfig} defaults.
- */
- private int connectTimeout = 3 * 60 * 1000;
-
- private int connectRequestTimeout = 3 * 60 * 1000;
-
- private int socketTimeout = 3 * 60 * 1000;
-
- public int getConnectTimeout() {
- return connectTimeout;
- }
-
- public int getConnectRequestTimeout() {
- return connectRequestTimeout;
- }
-
- public int getSocketTimeout() {
- return socketTimeout;
- }
-
- public void setConnectTimeout(int connectTimeout) {
- this.connectTimeout = connectTimeout;
- }
-
- public void setConnectRequestTimeout(int connectRequestTimeout) {
- this.connectRequestTimeout = connectRequestTimeout;
- }
-
- public void setSocketTimeout(int socketTimeout) {
- this.socketTimeout = socketTimeout;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- RestTemplateTimeoutProperties that = (RestTemplateTimeoutProperties) o;
-
- return connectTimeout == that.connectTimeout && connectRequestTimeout == that.connectRequestTimeout
- && socketTimeout == that.socketTimeout;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(connectTimeout, connectRequestTimeout, socketTimeout);
- }
-
- @Override
- public String toString() {
- return "RestTemplateTimeoutProperties{" + ", connectTimeout=" + connectTimeout + ", connectRequestTimeout="
- + connectRequestTimeout + ", socketTimeout=" + socketTimeout + '}';
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
deleted file mode 100644
index d621a8213..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.config;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-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.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.configuration.SSLContextFactory;
-import org.springframework.cloud.configuration.TlsProperties;
-import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
-import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories;
-import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
-import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactories;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Daniel Lavoie
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(RestTemplateTimeoutProperties.class)
-public class DiscoveryClientOptionalArgsConfiguration {
-
- protected static final Log logger = LogFactory.getLog(DiscoveryClientOptionalArgsConfiguration.class);
-
- @Bean
- @ConfigurationProperties("eureka.client.tls")
- public TlsProperties tlsProperties() {
- return new TlsProperties();
- }
-
- @Bean
- @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
- @ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
- @ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class }, search = SearchStrategy.CURRENT)
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
- havingValue = "false")
- public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs(TlsProperties tlsProperties,
- EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier)
- throws GeneralSecurityException, IOException {
- logger.info("Eureka HTTP Client uses RestTemplate.");
- RestTemplateDiscoveryClientOptionalArgs result = new RestTemplateDiscoveryClientOptionalArgs(
- eurekaClientHttpRequestFactorySupplier);
- setupTLS(result, tlsProperties);
- return result;
- }
-
- @Bean
- @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
- @ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
- @ConditionalOnMissingBean(value = { TransportClientFactories.class }, search = SearchStrategy.CURRENT)
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
- havingValue = "false")
- public RestTemplateTransportClientFactories restTemplateTransportClientFactories(
- RestTemplateDiscoveryClientOptionalArgs optionalArgs) {
- return new RestTemplateTransportClientFactories(optionalArgs);
- }
-
- @Bean
- @ConditionalOnMissingBean
- @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
- EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier(
- RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
- return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties);
- }
-
- private static void setupTLS(AbstractDiscoveryClientOptionalArgs args, TlsProperties properties)
- throws GeneralSecurityException, IOException {
- if (properties.isEnabled()) {
- SSLContextFactory factory = new SSLContextFactory(properties);
- args.setSSLContext(factory.createSSLContext());
- }
- }
-
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnClass(name = "org.glassfish.jersey.client.JerseyClient")
- @ConditionalOnBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
- static class DiscoveryClientOptionalArgsTlsConfiguration {
-
- DiscoveryClientOptionalArgsTlsConfiguration(TlsProperties tlsProperties,
- AbstractDiscoveryClientOptionalArgs optionalArgs) throws GeneralSecurityException, IOException {
- logger.info("Eureka HTTP Client uses Jersey");
- setupTLS(optionalArgs, tlsProperties);
- }
-
- }
-
- @ConditionalOnMissingClass("org.glassfish.jersey.client.JerseyClient")
- @ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
- protected static class WebClientConfiguration {
-
- @Autowired
- private TlsProperties tlsProperties;
-
- @Bean
- @ConditionalOnMissingBean(
- value = { AbstractDiscoveryClientOptionalArgs.class, RestTemplateDiscoveryClientOptionalArgs.class },
- search = SearchStrategy.CURRENT)
- public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs(
- ObjectProvider builder) throws GeneralSecurityException, IOException {
- logger.info("Eureka HTTP Client uses WebClient.");
- WebClientDiscoveryClientOptionalArgs result = new WebClientDiscoveryClientOptionalArgs(
- builder::getIfAvailable);
- setupTLS(result, tlsProperties);
- return result;
- }
-
- @Bean
- @ConditionalOnMissingBean(value = TransportClientFactories.class, search = SearchStrategy.CURRENT)
- public WebClientTransportClientFactories webClientTransportClientFactories(
- ObjectProvider builder) {
- return new WebClientTransportClientFactories(builder::getIfAvailable);
- }
-
- }
-
- @Configuration
- @ConditionalOnMissingClass({ "org.glassfish.jersey.client.JerseyClient",
- "org.springframework.web.reactive.function.client.WebClient" })
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
- protected static class WebClientNotFoundConfiguration {
-
- public WebClientNotFoundConfiguration() {
- throw new IllegalStateException(
- "eureka.client.webclient.enabled is true, " + "but WebClient is not on the classpath. Please add "
- + "spring-boot-starter-webflux as a dependency.");
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java
deleted file mode 100644
index f2c78efbd..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfiguration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.EurekaClient;
-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.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
-
-/**
- * Extra configuration for config server if it happens to be a Eureka instance.
- *
- * @author Dave Syer
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass(value = { EurekaInstanceConfigBean.class, EurekaClient.class },
- name = "org.springframework.cloud.config.server.config.ConfigServerProperties")
-public class EurekaClientConfigServerAutoConfiguration {
-
- @Autowired(required = false)
- private EurekaInstanceConfig instance;
-
- @Autowired
- private Environment env;
-
- @PostConstruct
- public void init() {
- if (this.instance == null) {
- return;
- }
- String prefix = this.env.getProperty("spring.cloud.config.server.prefix");
- if (StringUtils.hasText(prefix) && !StringUtils.hasText(this.instance.getMetadataMap().get("configPath"))) {
- this.instance.getMetadataMap().put("configPath", prefix);
- }
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java
deleted file mode 100644
index b4804bc4f..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfiguration.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.configuration.TlsProperties;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactory;
-import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
-import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.lang.Nullable;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * Bootstrap configuration for config client that wants to lookup the config server via
- * discovery.
- *
- * @author Dave Syer
- */
-@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@Conditional(EurekaConfigServerBootstrapConfiguration.EurekaConfigServerBootstrapCondition.class)
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-public class EurekaConfigServerBootstrapConfiguration {
-
- @Bean
- @ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
- public EurekaClientConfigBean eurekaClientConfigBean() {
- return new EurekaClientConfigBean();
- }
-
- @Bean
- @ConditionalOnMissingBean(EurekaHttpClient.class)
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", matchIfMissing = true,
- havingValue = "false")
- public RestTemplateEurekaHttpClient configDiscoveryRestTemplateEurekaHttpClient(EurekaClientConfigBean config,
- Environment env, @Nullable TlsProperties properties,
- EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
- return (RestTemplateEurekaHttpClient) new RestTemplateTransportClientFactory(properties,
- eurekaClientHttpRequestFactorySupplier)
- .newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env));
- }
-
- @Bean
- @ConditionalOnMissingBean
- EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier() {
- return new DefaultEurekaClientHttpRequestFactorySupplier();
- }
-
- @Bean
- public ConfigServerInstanceProvider.Function eurekaConfigServerInstanceProvider(EurekaHttpClient client,
- EurekaClientConfig config) {
- return new EurekaConfigServerInstanceProvider(client, config)::getInstances;
- }
-
- @Configuration(proxyBeanMethods = false)
- @ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
- @ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled", havingValue = "true")
- @ImportAutoConfiguration({ CodecsAutoConfiguration.class, WebClientAutoConfiguration.class })
- protected static class WebClientConfiguration {
-
- @Bean
- @ConditionalOnMissingBean(EurekaHttpClient.class)
- public WebClientEurekaHttpClient configDiscoveryWebClientEurekaHttpClient(EurekaClientConfigBean config,
- ObjectProvider builder, Environment env) {
- return (WebClientEurekaHttpClient) new WebClientTransportClientFactory(builder::getIfAvailable)
- .newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, env));
- }
-
- }
-
- static class EurekaConfigServerBootstrapCondition extends AllNestedConditions {
-
- EurekaConfigServerBootstrapCondition() {
- super(ConfigurationPhase.REGISTER_BEAN);
- }
-
- @ConditionalOnProperty("spring.cloud.config.discovery.enabled")
- static class OnCloudConfigProperty {
-
- }
-
- @ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
- static class OnEurekaClient {
-
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java
deleted file mode 100644
index edd935be0..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-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.Binder;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.config.client.ConfigClientProperties;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.configuration.TlsProperties;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactory;
-import org.springframework.util.ClassUtils;
-
-public class EurekaConfigServerBootstrapper implements BootstrapRegistryInitializer {
-
- @Override
- public void initialize(BootstrapRegistry registry) {
- if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null)) {
- return;
- }
-
- // It is important that we pass a lambda for the Function or else we will get a
- // ClassNotFoundException when config is not on the classpath
- registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, EurekaFunction::create);
- }
-
- private static Boolean getDiscoveryEnabled(Binder binder) {
- return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false)
- && binder.bind("eureka.client.enabled", Boolean.class).orElse(true)
- && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true);
- }
-
- final static class EurekaFunction implements ConfigServerInstanceProvider.Function {
-
- private final BootstrapContext context;
-
- static EurekaFunction create(BootstrapContext context) {
- return new EurekaFunction(context);
- }
-
- private EurekaFunction(BootstrapContext context) {
- this.context = context;
- }
-
- @Override
- public List apply(String serviceId, Binder binder, BindHandler bindHandler, Log log) {
- if (binder == null || !getDiscoveryEnabled(binder)) {
- return Collections.emptyList();
- }
-
- EurekaClientConfigBean config = binder.bind(EurekaClientConfigBean.PREFIX, EurekaClientConfigBean.class)
- .orElseGet(EurekaClientConfigBean::new);
- EurekaHttpClient httpClient = new RestTemplateTransportClientFactory(
- context.getOrElse(TlsProperties.class, null),
- context.getOrElse(EurekaClientHttpRequestFactorySupplier.class,
- new DefaultEurekaClientHttpRequestFactorySupplier()))
- .newClient(HostnameBasedUrlRandomizer.randomEndpoint(config, binder));
- return new EurekaConfigServerInstanceProvider(httpClient, config).getInstances(serviceId);
- }
-
- @Override
- public List apply(String serviceId) {
- // This should never be called now but is here for backward
- // compatibility
- return apply(serviceId, null, null, null);
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerInstanceProvider.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerInstanceProvider.java
deleted file mode 100644
index 1f0934d03..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerInstanceProvider.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
-import org.springframework.http.HttpStatus;
-
-public class EurekaConfigServerInstanceProvider {
-
- private final Log log;
-
- private final EurekaHttpClient client;
-
- private final EurekaClientConfig config;
-
- public EurekaConfigServerInstanceProvider(EurekaHttpClient client, EurekaClientConfig config) {
- this(LogFactory.getLog(EurekaConfigServerInstanceProvider.class), client, config);
- }
-
- public EurekaConfigServerInstanceProvider(Log log, EurekaHttpClient client, EurekaClientConfig config) {
- this.log = log;
- this.client = client;
- this.config = config;
- }
-
- public List getInstances(String serviceId) {
- if (log.isDebugEnabled()) {
- log.debug("eurekaConfigServerInstanceProvider finding instances for " + serviceId);
- }
- EurekaHttpResponse response = client.getApplications(config.getRegion());
- List instances = new ArrayList<>();
- if (!isSuccessful(response) || response.getEntity() == null) {
- return instances;
- }
-
- Applications applications = response.getEntity();
- applications.shuffleInstances(config.shouldFilterOnlyUpInstances());
- List infos = applications.getInstancesByVirtualHostName(serviceId);
- for (InstanceInfo info : infos) {
- instances.add(new EurekaServiceInstance(info));
- }
- if (log.isDebugEnabled()) {
- log.debug("eurekaConfigServerInstanceProvider found " + infos.size() + " instance(s) for " + serviceId
- + ", " + instances);
- }
- return instances;
- }
-
- private boolean isSuccessful(EurekaHttpResponse response) {
- HttpStatus httpStatus = HttpStatus.resolve(response.getStatusCode());
- return httpStatus != null && httpStatus.is2xxSuccessful();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaTlsProperties.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaTlsProperties.java
deleted file mode 100644
index 3cbb8f02e..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaTlsProperties.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.config;
-
-import org.springframework.cloud.configuration.TlsProperties;
-
-/**
- * Eureka client TLS properties.
- */
-
-public class EurekaTlsProperties extends TlsProperties {
-
- /**
- * Prefix for Eureka client TLS properties.
- */
- public static final String PREFIX = "eureka.client.tls";
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/HostnameBasedUrlRandomizer.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/HostnameBasedUrlRandomizer.java
deleted file mode 100644
index 494a18c44..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/HostnameBasedUrlRandomizer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import java.util.List;
-
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.endpoint.EndpointUtils;
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
-
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
-
-public final class HostnameBasedUrlRandomizer implements EndpointUtils.ServiceUrlRandomizer {
-
- private final String hostname;
-
- HostnameBasedUrlRandomizer(String hostname) {
- this.hostname = hostname;
- }
-
- @Override
- public void randomize(List urlList) {
- int listSize = 0;
- if (urlList != null) {
- listSize = urlList.size();
- }
- if (!StringUtils.hasText(hostname) || listSize == 0) {
- return;
- }
- // Find the hashcode of the instance hostname and use it to find an entry
- // and then arrange the rest of the entries after this entry.
- int instanceHashcode = hostname.hashCode();
- if (instanceHashcode < 0) {
- instanceHashcode = instanceHashcode * -1;
- }
- int backupInstance = instanceHashcode % listSize;
- for (int i = 0; i < backupInstance; i++) {
- String zone = urlList.remove(0);
- urlList.add(zone);
- }
- }
-
- public static String getEurekaUrl(EurekaClientConfig config, String hostname) {
- List urls = EndpointUtils.getDiscoveryServiceUrls(config, EurekaClientConfigBean.DEFAULT_ZONE,
- new HostnameBasedUrlRandomizer(hostname));
- return urls.get(0);
- }
-
- public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, Environment env) {
- String hostname = env.getProperty("eureka.instance.hostname");
- return new DefaultEndpoint(getEurekaUrl(config, hostname));
- }
-
- public static DefaultEndpoint randomEndpoint(EurekaClientConfig config, Binder binder) {
- String hostname = binder.bind("eureka.instance.hostname", String.class).orElseGet(() -> null);
- return new DefaultEndpoint(getEurekaUrl(config, hostname));
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java
deleted file mode 100644
index 36bf1b35a..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.http;
-
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
-import org.apache.hc.core5.http.io.SocketConfig;
-import org.apache.hc.core5.util.Timeout;
-
-import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.lang.Nullable;
-
-/**
- * Supplier for the {@link ClientHttpRequestFactory} to be used by Eureka client that uses
- * {@link HttpClients}.
- *
- * @author Marcin Grzejszczak
- * @author Olga Maciaszek-Sharma
- * @author Jiwon Jeon
- * @since 3.0.0
- */
-public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClientHttpRequestFactorySupplier {
-
- private final RestTemplateTimeoutProperties restTemplateTimeoutProperties;
-
- /**
- * @deprecated in favour of
- * {@link DefaultEurekaClientHttpRequestFactorySupplier#DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties)}
- */
- @Deprecated
- public DefaultEurekaClientHttpRequestFactorySupplier() {
- this.restTemplateTimeoutProperties = new RestTemplateTimeoutProperties();
- }
-
- public DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
- this.restTemplateTimeoutProperties = restTemplateTimeoutProperties;
- }
-
- @Override
- public ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier) {
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- if (sslContext != null || hostnameVerifier != null || restTemplateTimeoutProperties != null) {
- httpClientBuilder.setConnectionManager(
- buildConnectionManager(sslContext, hostnameVerifier, restTemplateTimeoutProperties));
- }
- if (restTemplateTimeoutProperties != null) {
- httpClientBuilder.setDefaultRequestConfig(buildRequestConfig());
- }
-
- CloseableHttpClient httpClient = httpClientBuilder.build();
- HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
- requestFactory.setHttpClient(httpClient);
- return requestFactory;
- }
-
- private HttpClientConnectionManager buildConnectionManager(SSLContext sslContext, HostnameVerifier hostnameVerifier,
- RestTemplateTimeoutProperties restTemplateTimeoutProperties) {
- PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder
- .create();
- SSLConnectionSocketFactoryBuilder sslConnectionSocketFactoryBuilder = SSLConnectionSocketFactoryBuilder
- .create();
- if (sslContext != null) {
- sslConnectionSocketFactoryBuilder.setSslContext(sslContext);
- }
- if (hostnameVerifier != null) {
- sslConnectionSocketFactoryBuilder.setHostnameVerifier(hostnameVerifier);
- }
- connectionManagerBuilder.setSSLSocketFactory(sslConnectionSocketFactoryBuilder.build());
- if (restTemplateTimeoutProperties != null) {
- connectionManagerBuilder.setDefaultSocketConfig(SocketConfig.custom()
- .setSoTimeout(Timeout.of(restTemplateTimeoutProperties.getSocketTimeout(), TimeUnit.MILLISECONDS))
- .build());
- }
- return connectionManagerBuilder.build();
- }
-
- private RequestConfig buildRequestConfig() {
- return RequestConfig.custom()
- .setConnectTimeout(Timeout.of(restTemplateTimeoutProperties.getConnectTimeout(), TimeUnit.MILLISECONDS))
- .setConnectionRequestTimeout(
- Timeout.of(restTemplateTimeoutProperties.getConnectRequestTimeout(), TimeUnit.MILLISECONDS))
- .build();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaApplications.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaApplications.java
deleted file mode 100644
index c71dadf85..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaApplications.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-
-/**
- * A simple wrapper class for {@link Applications} that insure proprer Jackson
- * serialization through the JsonPropert overwrites.
- *
- * @author Daniel Lavoie
- */
-public class EurekaApplications extends com.netflix.discovery.shared.Applications {
-
- @JsonCreator
- public EurekaApplications(@JsonProperty("apps__hashcode") String appsHashCode,
- @JsonProperty("versions__delta") Long versionDelta,
- @JsonProperty("application") List registeredApplications) {
- super(appsHashCode, versionDelta, registeredApplications);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaClientHttpRequestFactorySupplier.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaClientHttpRequestFactorySupplier.java
deleted file mode 100644
index b5a104c3c..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/EurekaClientHttpRequestFactorySupplier.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.http;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.lang.Nullable;
-
-/**
- * Supplier for the {@link ClientHttpRequestFactory} to be used by Eureka client.
- *
- * @author Marcin Grzejszczak
- * @since 3.0.0
- */
-public interface EurekaClientHttpRequestFactorySupplier {
-
- /**
- * Returns a constructed {@link ClientHttpRequestFactory}.
- * @param sslContext SSL Context
- * @param hostnameVerifier Hostname verifier
- * @return {@link ClientHttpRequestFactory}
- */
- ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier);
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateDiscoveryClientOptionalArgs.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateDiscoveryClientOptionalArgs.java
deleted file mode 100644
index 0e74905b4..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateDiscoveryClientOptionalArgs.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-
-/**
- * @author Daniel Lavoie
- */
-public class RestTemplateDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs {
-
- protected final EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier;
-
- public RestTemplateDiscoveryClientOptionalArgs(
- EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
- this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java
deleted file mode 100644
index 26f2a8875..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
-import com.netflix.discovery.util.StringUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEurekaHttpResponse;
-
-/**
- * @author Daniel Lavoie
- */
-public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
-
- protected final Log logger = LogFactory.getLog(getClass());
-
- private final RestTemplate restTemplate;
-
- private String serviceUrl;
-
- public RestTemplateEurekaHttpClient(RestTemplate restTemplate, String serviceUrl) {
- this.restTemplate = restTemplate;
- this.serviceUrl = serviceUrl;
- if (!serviceUrl.endsWith("/")) {
- this.serviceUrl = this.serviceUrl + "/";
- }
- }
-
- public String getServiceUrl() {
- return this.serviceUrl;
- }
-
- public RestTemplate getRestTemplate() {
- return restTemplate;
- }
-
- @Override
- public EurekaHttpResponse register(InstanceInfo info) {
- String urlPath = serviceUrl + "apps/" + info.getAppName();
-
- HttpHeaders headers = new HttpHeaders();
- headers.add(HttpHeaders.ACCEPT_ENCODING, "gzip");
- headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.POST, new HttpEntity<>(info, headers),
- Void.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse cancel(String appName, String id) {
- String urlPath = serviceUrl + "apps/" + appName + '/' + id;
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.DELETE, null, Void.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse sendHeartBeat(String appName, String id, InstanceInfo info,
- InstanceStatus overriddenStatus) {
- String urlPath = serviceUrl + "apps/" + appName + '/' + id + "?status=" + info.getStatus().toString()
- + "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString()
- + (overriddenStatus != null ? "&overriddenstatus=" + overriddenStatus.name() : "");
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.PUT, null,
- InstanceInfo.class);
-
- EurekaHttpResponseBuilder eurekaResponseBuilder = anEurekaHttpResponse(
- response.getStatusCode().value(), InstanceInfo.class).headers(headersOf(response));
-
- if (response.hasBody()) {
- eurekaResponseBuilder.entity(response.getBody());
- }
-
- return eurekaResponseBuilder.build();
- }
-
- @Override
- public EurekaHttpResponse statusUpdate(String appName, String id, InstanceStatus newStatus,
- InstanceInfo info) {
- String urlPath = serviceUrl + "apps/" + appName + '/' + id + "/status?value=" + newStatus.name()
- + "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString();
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.PUT, null, Void.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse deleteStatusOverride(String appName, String id, InstanceInfo info) {
- String urlPath = serviceUrl + "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
- + info.getLastDirtyTimestamp().toString();
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.DELETE, null, Void.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value()).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse getApplications(String... regions) {
- return getApplicationsInternal("apps/", regions);
- }
-
- private EurekaHttpResponse getApplicationsInternal(String urlPath, String[] regions) {
- String url = serviceUrl + urlPath;
-
- if (regions != null && regions.length > 0) {
- url = url + (urlPath.contains("?") ? "&" : "?") + "regions=" + StringUtil.join(regions);
- }
-
- ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, null,
- EurekaApplications.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value(),
- response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
- ? (Applications) response.getBody() : null).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse getDelta(String... regions) {
- return getApplicationsInternal("apps/delta", regions);
- }
-
- @Override
- public EurekaHttpResponse getVip(String vipAddress, String... regions) {
- return getApplicationsInternal("vips/" + vipAddress, regions);
- }
-
- @Override
- public EurekaHttpResponse getSecureVip(String secureVipAddress, String... regions) {
- return getApplicationsInternal("svips/" + secureVipAddress, regions);
- }
-
- @Override
- public EurekaHttpResponse getApplication(String appName) {
- String urlPath = serviceUrl + "apps/" + appName;
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.GET, null, Application.class);
-
- Application application = response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody()
- ? response.getBody() : null;
-
- return anEurekaHttpResponse(response.getStatusCode().value(), application).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse getInstance(String appName, String id) {
- return getInstanceInternal("apps/" + appName + '/' + id);
- }
-
- @Override
- public EurekaHttpResponse getInstance(String id) {
- return getInstanceInternal("instances/" + id);
- }
-
- private EurekaHttpResponse getInstanceInternal(String urlPath) {
- urlPath = serviceUrl + urlPath;
-
- ResponseEntity response = restTemplate.exchange(urlPath, HttpMethod.GET, null,
- InstanceInfo.class);
-
- return anEurekaHttpResponse(response.getStatusCode().value(),
- response.getStatusCode().value() == HttpStatus.OK.value() && response.hasBody() ? response.getBody()
- : null).headers(headersOf(response)).build();
- }
-
- @Override
- public void shutdown() {
- // Nothing to do
- }
-
- private static Map headersOf(ResponseEntity response) {
- HttpHeaders httpHeaders = response.getHeaders();
- if (httpHeaders == null || httpHeaders.isEmpty()) {
- return Collections.emptyMap();
- }
- Map headers = new HashMap<>();
- for (Entry> entry : httpHeaders.entrySet()) {
- if (!entry.getValue().isEmpty()) {
- headers.put(entry.getKey(), entry.getValue().get(0));
- }
- }
- return headers;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java
deleted file mode 100644
index d6f8b0cc0..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactories.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.Collection;
-import java.util.Optional;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.TransportClientFactory;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-
-/**
- * @author Daniel Lavoie
- */
-public class RestTemplateTransportClientFactories implements TransportClientFactories {
-
- private final RestTemplateDiscoveryClientOptionalArgs args;
-
- public RestTemplateTransportClientFactories(RestTemplateDiscoveryClientOptionalArgs args) {
- this.args = args;
- }
-
- @Override
- public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
- Collection additionalFilters, InstanceInfo myInstanceInfo) {
- return new RestTemplateTransportClientFactory(this.args.getSSLContext(), this.args.getHostnameVerifier(),
- this.args.eurekaClientHttpRequestFactorySupplier);
- }
-
- @Override
- public TransportClientFactory newTransportClientFactory(final EurekaClientConfig clientConfig,
- final Collection additionalFilters, final InstanceInfo myInstanceInfo,
- final Optional sslContext, final Optional hostnameVerifier) {
- return new RestTemplateTransportClientFactory(this.args.getSSLContext(), this.args.getHostnameVerifier(),
- this.args.eurekaClientHttpRequestFactorySupplier);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java
deleted file mode 100644
index 7fa09749b..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactory.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Optional;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.converters.jackson.mixin.ApplicationsJsonMixIn;
-import com.netflix.discovery.converters.jackson.mixin.InstanceInfoJsonMixIn;
-import com.netflix.discovery.converters.jackson.serializer.InstanceInfoJsonBeanSerializer;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.resolver.EurekaEndpoint;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.TransportClientFactory;
-
-import org.springframework.cloud.configuration.SSLContextFactory;
-import org.springframework.cloud.configuration.TlsProperties;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-/**
- * Provides the custom {@link RestTemplate} required by the
- * {@link RestTemplateEurekaHttpClient}. Relies on Jackson for serialization and
- * deserialization.
- *
- * @author Daniel Lavoie
- */
-public class RestTemplateTransportClientFactory implements TransportClientFactory {
-
- private final Optional sslContext;
-
- private final Optional hostnameVerifier;
-
- private final EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier;
-
- public RestTemplateTransportClientFactory(TlsProperties tlsProperties,
- EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
- this.sslContext = context(tlsProperties);
- this.hostnameVerifier = Optional.empty();
- this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
- }
-
- private Optional context(TlsProperties properties) {
- if (properties == null || !properties.isEnabled()) {
- return Optional.empty();
- }
- try {
- return Optional.of(new SSLContextFactory(properties).createSSLContext());
- }
- catch (Exception e) {
- throw new IllegalStateException(e);
- }
- }
-
- public RestTemplateTransportClientFactory(Optional sslContext,
- Optional hostnameVerifier,
- EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) {
- this.sslContext = sslContext;
- this.hostnameVerifier = hostnameVerifier;
- this.eurekaClientHttpRequestFactorySupplier = eurekaClientHttpRequestFactorySupplier;
- }
-
- public RestTemplateTransportClientFactory() {
- this.sslContext = Optional.empty();
- this.hostnameVerifier = Optional.empty();
- this.eurekaClientHttpRequestFactorySupplier = new DefaultEurekaClientHttpRequestFactorySupplier();
- }
-
- @Override
- public EurekaHttpClient newClient(EurekaEndpoint serviceUrl) {
- return new RestTemplateEurekaHttpClient(restTemplate(serviceUrl.getServiceUrl()),
- stripUserInfo(serviceUrl.getServiceUrl()));
- }
-
- // apache http client 5.2 fails with non-null userinfo
- // basic auth added in restTemplate() below
- private String stripUserInfo(String serviceUrl) {
- return UriComponentsBuilder.fromUriString(serviceUrl).userInfo(null).toUriString();
- }
-
- private RestTemplate restTemplate(String serviceUrl) {
- ClientHttpRequestFactory requestFactory = this.eurekaClientHttpRequestFactorySupplier
- .get(this.sslContext.orElse(null), this.hostnameVerifier.orElse(null));
- RestTemplate restTemplate = new RestTemplate(requestFactory);
-
- try {
- URI serviceURI = new URI(serviceUrl);
- if (serviceURI.getUserInfo() != null) {
- String[] credentials = serviceURI.getUserInfo().split(":");
- if (credentials.length == 2) {
- restTemplate.getInterceptors()
- .add(new BasicAuthenticationInterceptor(credentials[0], credentials[1]));
- }
- }
- }
- catch (URISyntaxException ignore) {
-
- }
-
- restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
- restTemplate.setErrorHandler(new ErrorHandler());
-
- restTemplate.getInterceptors().add((request, body, execution) -> {
- ClientHttpResponse response = execution.execute(request, body);
- if (!response.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
- return response;
- }
- return new NotFoundHttpResponse(response);
- });
-
- return restTemplate;
- }
-
- /**
- * Provides the serialization configurations required by the Eureka Server. JSON
- * content exchanged with eureka requires a root node matching the entity being
- * serialized or deserialized. Achived with
- * {@link SerializationFeature#WRAP_ROOT_VALUE} and
- * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
- * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
- * {@link ObjectMapper}.
- * @return a {@link MappingJackson2HttpMessageConverter} object
- */
- public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
- MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
- converter.setObjectMapper(new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE));
-
- SimpleModule jsonModule = new SimpleModule();
- jsonModule.setSerializerModifier(createJsonSerializerModifier());
- converter.getObjectMapper().registerModule(jsonModule);
-
- converter.getObjectMapper().configure(SerializationFeature.WRAP_ROOT_VALUE, true);
- converter.getObjectMapper().configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
- converter.getObjectMapper().addMixIn(Applications.class, ApplicationsJsonMixIn.class);
- converter.getObjectMapper().addMixIn(InstanceInfo.class, InstanceInfoJsonMixIn.class);
-
- return converter;
- }
-
- public static BeanSerializerModifier createJsonSerializerModifier() {
- return new BeanSerializerModifier() {
- @Override
- public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription beanDesc,
- JsonSerializer serializer) {
- if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
- return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
- }
- return serializer;
- }
- };
- }
-
- @Override
- public void shutdown() {
- }
-
- /**
- * Response that ignores body, specifically for 404 errors.
- */
- private static class NotFoundHttpResponse implements ClientHttpResponse {
-
- private final ClientHttpResponse response;
-
- NotFoundHttpResponse(ClientHttpResponse response) {
- this.response = response;
- }
-
- @Override
- public HttpStatusCode getStatusCode() throws IOException {
- return response.getStatusCode();
- }
-
- @Override
- public int getRawStatusCode() throws IOException {
- return response.getRawStatusCode();
- }
-
- @Override
- public String getStatusText() throws IOException {
- return response.getStatusText();
- }
-
- @Override
- public void close() {
- response.close();
- }
-
- @Override
- public InputStream getBody() throws IOException {
- // ignore body on 404 for heartbeat, see gh-4145
- return null;
- }
-
- @Override
- public HttpHeaders getHeaders() {
- return response.getHeaders();
- }
-
- }
-
- class ErrorHandler extends DefaultResponseErrorHandler {
-
- @Override
- protected boolean hasError(HttpStatusCode statusCode) {
- /**
- * When the Eureka server restarts and a client tries to sent a heartbeat the
- * server will respond with a 404. By default RestTemplate will throw an
- * exception in this case. What we want is to return the 404 to the upstream
- * code so it will send another registration request to the server.
- */
- if (statusCode.is4xxClientError()) {
- return false;
- }
- return super.hasError(statusCode);
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java
deleted file mode 100644
index 552162500..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientDiscoveryClientOptionalArgs.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.function.Supplier;
-
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Daniel Lavoie
- * @author Haytham Mohamed
- */
-public class WebClientDiscoveryClientOptionalArgs extends AbstractDiscoveryClientOptionalArgs {
-
- public WebClientDiscoveryClientOptionalArgs(Supplier builder) {
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java
deleted file mode 100644
index 5788c99f5..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.Map;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
-import com.netflix.discovery.util.StringUtil;
-import reactor.core.publisher.Mono;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEurekaHttpResponse;
-
-/**
- * @author Daniel Lavoie
- * @author Haytham Mohamed
- */
-public class WebClientEurekaHttpClient implements EurekaHttpClient {
-
- private WebClient webClient;
-
- public WebClientEurekaHttpClient(WebClient webClient) {
- this.webClient = webClient;
- }
-
- @Override
- public EurekaHttpResponse register(InstanceInfo info) {
- return webClient.post().uri("apps/" + info.getAppName()).body(BodyInserters.fromValue(info))
- .header(HttpHeaders.ACCEPT_ENCODING, "gzip")
- .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
- .block();
- }
-
- @Override
- public EurekaHttpResponse cancel(String appName, String id) {
- return webClient.delete().uri("apps/" + appName + '/' + id).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
- .block();
- }
-
- @Override
- public EurekaHttpResponse sendHeartBeat(String appName, String id, InstanceInfo info,
- InstanceStatus overriddenStatus) {
- String urlPath = "apps/" + appName + '/' + id + "?status=" + info.getStatus().toString()
- + "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString()
- + (overriddenStatus != null ? "&overriddenstatus=" + overriddenStatus.name() : "");
-
- ResponseEntity response = webClient.put().uri(urlPath)
- .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();
-
- EurekaHttpResponseBuilder builder = anEurekaHttpResponse(statusCodeValueOf(response),
- InstanceInfo.class).headers(headersOf(response));
-
- InstanceInfo entity = response.getBody();
-
- if (entity != null) {
- builder.entity(entity);
- }
-
- return builder.build();
-
- }
-
- @Override
- public EurekaHttpResponse statusUpdate(String appName, String id, InstanceStatus newStatus,
- InstanceInfo info) {
- String urlPath = "apps/" + appName + '/' + id + "/status?value=" + newStatus.name() + "&lastDirtyTimestamp="
- + info.getLastDirtyTimestamp().toString();
-
- return webClient.put().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
- .map(this::eurekaHttpResponse).block();
- }
-
- @Override
- public EurekaHttpResponse deleteStatusOverride(String appName, String id, InstanceInfo info) {
- String urlPath = "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
- + info.getLastDirtyTimestamp().toString();
-
- return webClient.delete().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
- .map(this::eurekaHttpResponse).block();
- }
-
- @Override
- public EurekaHttpResponse getApplications(String... regions) {
- return getApplicationsInternal("apps/", regions);
- }
-
- private EurekaHttpResponse getApplicationsInternal(String urlPath, String[] regions) {
- String url = urlPath;
-
- if (regions != null && regions.length > 0) {
- url = url + (urlPath.contains("?") ? "&" : "?") + "regions=" + StringUtil.join(regions);
- }
-
- ResponseEntity response = webClient.get().uri(url)
- .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Applications.class).block();
-
- int statusCode = statusCodeValueOf(response);
-
- Applications body = response.getBody();
-
- return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
- .headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse getDelta(String... regions) {
- return getApplicationsInternal("apps/delta", regions);
- }
-
- @Override
- public EurekaHttpResponse getVip(String vipAddress, String... regions) {
- return getApplicationsInternal("vips/" + vipAddress, regions);
- }
-
- @Override
- public EurekaHttpResponse getSecureVip(String secureVipAddress, String... regions) {
- return getApplicationsInternal("svips/" + secureVipAddress, regions);
- }
-
- @Override
- public EurekaHttpResponse getApplication(String appName) {
-
- ResponseEntity response = webClient.get().uri("apps/" + appName)
- .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Application.class).block();
-
- int statusCode = statusCodeValueOf(response);
- Application body = response.getBody();
-
- Application application = statusCode == HttpStatus.OK.value() && body != null ? body : null;
-
- return anEurekaHttpResponse(statusCode, application).headers(headersOf(response)).build();
- }
-
- @Override
- public EurekaHttpResponse getInstance(String appName, String id) {
- return getInstanceInternal("apps/" + appName + '/' + id);
- }
-
- @Override
- public EurekaHttpResponse getInstance(String id) {
- return getInstanceInternal("instances/" + id);
- }
-
- private EurekaHttpResponse getInstanceInternal(String urlPath) {
- ResponseEntity response = webClient.get().uri(urlPath)
- .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
- .onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();
-
- int statusCode = statusCodeValueOf(response);
- InstanceInfo body = response.getBody();
-
- return anEurekaHttpResponse(statusCode, statusCode == HttpStatus.OK.value() && body != null ? body : null)
- .headers(headersOf(response)).build();
- }
-
- @Override
- public void shutdown() {
- // Nothing to do
- }
-
- public WebClient getWebClient() {
- return this.webClient;
- }
-
- private Mono ignoreError(ClientResponse response) {
- return Mono.empty();
- }
-
- private static Map headersOf(ResponseEntity response) {
- return response.getHeaders().toSingleValueMap();
- }
-
- private int statusCodeValueOf(ResponseEntity response) {
- return response.getStatusCode().value();
- }
-
- private EurekaHttpResponse eurekaHttpResponse(ResponseEntity response) {
- return anEurekaHttpResponse(statusCodeValueOf(response)).headers(headersOf(response)).build();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactories.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactories.java
deleted file mode 100644
index b3315b5ec..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactories.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.Collection;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.TransportClientFactory;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Daniel Lavoie
- * @author Haytham Mohamed
- */
-public class WebClientTransportClientFactories implements TransportClientFactories {
-
- private final Supplier builder;
-
- public WebClientTransportClientFactories(Supplier builder) {
- this.builder = builder;
- }
-
- @Override
- public TransportClientFactory newTransportClientFactory(EurekaClientConfig clientConfig,
- Collection additionalFilters, InstanceInfo myInstanceInfo) {
- return new WebClientTransportClientFactory(builder);
- }
-
- @Override
- public TransportClientFactory newTransportClientFactory(final EurekaClientConfig clientConfig,
- final Collection additionalFilters, final InstanceInfo myInstanceInfo,
- final Optional sslContext, final Optional hostnameVerifier) {
- return new WebClientTransportClientFactory(builder);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java
deleted file mode 100644
index 5a4a20cd7..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactory.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.function.Supplier;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.converters.jackson.mixin.ApplicationsJsonMixIn;
-import com.netflix.discovery.converters.jackson.mixin.InstanceInfoJsonMixIn;
-import com.netflix.discovery.converters.jackson.serializer.InstanceInfoJsonBeanSerializer;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.resolver.EurekaEndpoint;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.TransportClientFactory;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.ClientCodecConfigurer;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
-import org.springframework.web.reactive.function.client.ExchangeFilterFunctions;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * Provides the custom {@link WebClient.Builder} required by the
- * {@link WebClientEurekaHttpClient}. Relies on Jackson for serialization and
- * deserialization.
- *
- * @author Daniel Lavoie
- * @author Haytham Mohamed
- */
-public class WebClientTransportClientFactory implements TransportClientFactory {
-
- private final Supplier builderSupplier;
-
- public WebClientTransportClientFactory(Supplier builderSupplier) {
- this.builderSupplier = builderSupplier;
- }
-
- @Override
- public EurekaHttpClient newClient(EurekaEndpoint endpoint) {
- // we want a copy to modify. Don't change the original
- WebClient.Builder builder = this.builderSupplier.get().clone();
- setUrl(builder, endpoint.getServiceUrl());
- setCodecs(builder);
- builder.filter(http4XxErrorExchangeFilterFunction());
- return new WebClientEurekaHttpClient(builder.build());
- }
-
- private WebClient.Builder setUrl(WebClient.Builder builder, String serviceUrl) {
- String url = serviceUrl;
- try {
- URI serviceURI = new URI(serviceUrl);
- if (serviceURI.getUserInfo() != null) {
- String[] credentials = serviceURI.getUserInfo().split(":");
- if (credentials.length == 2) {
- builder.filter(ExchangeFilterFunctions.basicAuthentication(credentials[0], credentials[1]));
- url = serviceUrl.replace(credentials[0] + ":" + credentials[1] + "@", "");
- }
- }
- }
- catch (URISyntaxException ignore) {
- }
- return builder.baseUrl(url);
- }
-
- private static BeanSerializerModifier createJsonSerializerModifier() {
- return new BeanSerializerModifier() {
- @Override
- public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription beanDesc,
- JsonSerializer serializer) {
- if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
- return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
- }
- return serializer;
- }
- };
- }
-
- private void setCodecs(WebClient.Builder builder) {
- ObjectMapper objectMapper = objectMapper();
- builder.codecs(configurer -> {
- ClientCodecConfigurer.ClientDefaultCodecs defaults = configurer.defaultCodecs();
- defaults.jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
- defaults.jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-
- });
- }
-
- /**
- * Provides the serialization configurations required by the Eureka Server. JSON
- * content exchanged with eureka requires a root node matching the entity being
- * serialized or deserialized. Achieved with
- * {@link SerializationFeature#WRAP_ROOT_VALUE} and
- * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
- * {@link PropertyNamingStrategies.SnakeCaseStrategy} is applied to the underlying
- * {@link ObjectMapper}.
- * @return a {@link ObjectMapper} object
- */
- private ObjectMapper objectMapper() {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
-
- SimpleModule jsonModule = new SimpleModule();
- jsonModule.setSerializerModifier(createJsonSerializerModifier());
- objectMapper.registerModule(jsonModule);
-
- objectMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
- objectMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true);
- objectMapper.addMixIn(Applications.class, ApplicationsJsonMixIn.class);
- objectMapper.addMixIn(InstanceInfo.class, InstanceInfoJsonMixIn.class);
-
- return objectMapper;
- }
-
- // Skip over 4xx http errors
- private ExchangeFilterFunction http4XxErrorExchangeFilterFunction() {
- return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
- // literally 400 pass the tests, not 4xxClientError
- if (clientResponse.statusCode().value() == 400) {
- ClientResponse newResponse = clientResponse.mutate().statusCode(HttpStatus.OK).build();
- newResponse.body((clientHttpResponse, context) -> clientHttpResponse.getBody());
- return Mono.just(newResponse);
- }
- if (clientResponse.statusCode().equals(HttpStatus.NOT_FOUND)) {
- ClientResponse newResponse = clientResponse.mutate().statusCode(clientResponse.statusCode())
- // ignore body on 404 for heartbeat, see gh-4145
- .body(Flux.empty()).build();
- return Mono.just(newResponse);
- }
- return Mono.just(clientResponse);
- });
- }
-
- @Override
- public void shutdown() {
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfiguration.java
deleted file mode 100644
index bdcf6c509..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfiguration.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.loadbalancer;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.EurekaClientConfig;
-import jakarta.annotation.PostConstruct;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
-import org.springframework.cloud.netflix.eureka.support.ZoneUtils;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-import static org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancerEurekaAutoConfiguration.LOADBALANCER_ZONE;
-
-/**
- * A configuration for Spring Cloud LoadBalancer that retrieves client instance zone from
- * Eureka and sets it as a property. Based on
- * {@link EurekaLoadBalancerClientConfiguration}.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.1
- * @see EurekaLoadBalancerClientConfiguration
- */
-@Configuration
-@ConditionalOnBean({ LoadBalancerZoneConfig.class, EurekaLoadBalancerProperties.class })
-public class EurekaLoadBalancerClientConfiguration {
-
- private static final Log LOG = LogFactory.getLog(EurekaLoadBalancerClientConfiguration.class);
-
- private final EurekaClientConfig clientConfig;
-
- private final EurekaInstanceConfig eurekaConfig;
-
- private final LoadBalancerZoneConfig zoneConfig;
-
- private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties;
-
- public EurekaLoadBalancerClientConfiguration(@Autowired(required = false) EurekaClientConfig clientConfig,
- @Autowired(required = false) EurekaInstanceConfig eurekaInstanceConfig, LoadBalancerZoneConfig zoneConfig,
- EurekaLoadBalancerProperties eurekaLoadBalancerProperties) {
- this.clientConfig = clientConfig;
- this.eurekaConfig = eurekaInstanceConfig;
- this.zoneConfig = zoneConfig;
- this.eurekaLoadBalancerProperties = eurekaLoadBalancerProperties;
- }
-
- @PostConstruct
- public void postprocess() {
- if (StringUtils.hasText(zoneConfig.getZone())) {
- return;
- }
- String zone = getZoneFromEureka();
- if (StringUtils.hasText(zone)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Setting the value of '" + LOADBALANCER_ZONE + "' to " + zone);
- }
- zoneConfig.setZone(zone);
- }
- }
-
- private String getZoneFromEureka() {
- String zone;
- boolean approximateZoneFromHostname = eurekaLoadBalancerProperties.isApproximateZoneFromHostname();
- if (approximateZoneFromHostname && eurekaConfig != null) {
- return ZoneUtils.extractApproximateZone(this.eurekaConfig.getHostName(false));
- }
- else {
- zone = eurekaConfig == null ? null : eurekaConfig.getMetadataMap().get("zone");
- if (!StringUtils.hasText(zone) && clientConfig != null) {
- String[] zones = clientConfig.getAvailabilityZones(clientConfig.getRegion());
- // Pick the first one from the regions we want to connect to
- zone = zones != null && zones.length > 0 ? zones[0] : null;
- }
- return zone;
- }
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerProperties.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerProperties.java
deleted file mode 100644
index b8389da32..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerProperties.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2012-2022 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.netflix.eureka.loadbalancer;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * A {@link ConfigurationProperties} bean for the Eureka-specific instrumentation of
- * Spring Cloud LoadBalancer.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.1
- */
-@ConfigurationProperties("spring.cloud.loadbalancer.eureka")
-public class EurekaLoadBalancerProperties {
-
- /**
- * Used to determine whether we should try to get the `zone` value from host name.
- */
- private boolean approximateZoneFromHostname = false;
-
- public boolean isApproximateZoneFromHostname() {
- return approximateZoneFromHostname;
- }
-
- public void setApproximateZoneFromHostname(boolean approximateZoneFromHostname) {
- this.approximateZoneFromHostname = approximateZoneFromHostname;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/LoadBalancerEurekaAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/LoadBalancerEurekaAutoConfiguration.java
deleted file mode 100644
index 684a3af2c..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/LoadBalancerEurekaAutoConfiguration.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.loadbalancer;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClientConfigurationRegistrar;
-import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-
-/**
- * An Autoconfiguration that loads default config for Spring Cloud LoadBalancer clients.
- *
- * @author Olga Maciaszek-Sharma
- * @since 2.2.1
- * @see EurekaLoadBalancerClientConfiguration
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass(LoadBalancerClientConfigurationRegistrar.class)
-@LoadBalancerClients(defaultConfiguration = EurekaLoadBalancerClientConfiguration.class)
-@ConditionalOnProperty(name = "eureka.client.enabled", matchIfMissing = true)
-public class LoadBalancerEurekaAutoConfiguration {
-
- /**
- * Spring Cloud LoadBalancer Zone property name.
- */
- public static final String LOADBALANCER_ZONE = "spring.cloud.loadbalancer.zone";
-
- @Bean
- @ConditionalOnMissingBean
- EurekaLoadBalancerProperties eurekaLoadBalancerProperties() {
- return new EurekaLoadBalancerProperties();
- }
-
- @Bean
- @ConditionalOnMissingBean
- LoadBalancerZoneConfig zoneConfig(Environment environment) {
- return new LoadBalancerZoneConfig(environment.getProperty(LOADBALANCER_ZONE));
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProvider.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProvider.java
deleted file mode 100644
index de809c3d3..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.metadata;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.util.StringUtils;
-
-/**
- * Default implementation of {@link DefaultManagementMetadataProvider}.
- *
- * @author Anastasiia Smirnova
- */
-public class DefaultManagementMetadataProvider implements ManagementMetadataProvider {
-
- private static final int RANDOM_PORT = 0;
-
- private static final Log log = LogFactory.getLog(DefaultManagementMetadataProvider.class);
-
- @Override
- public ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
- String managementContextPath, Integer managementPort) {
- if (isRandom(managementPort)) {
- return null;
- }
- if (managementPort == null && isRandom(serverPort)) {
- return null;
- }
- String healthCheckUrl = getHealthCheckUrl(instance, serverPort, serverContextPath, managementContextPath,
- managementPort, false);
- String statusPageUrl = getStatusPageUrl(instance, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- ManagementMetadata metadata = new ManagementMetadata(healthCheckUrl, statusPageUrl,
- managementPort == null ? serverPort : managementPort);
- if (instance.isSecurePortEnabled()) {
- metadata.setSecureHealthCheckUrl(getHealthCheckUrl(instance, serverPort, serverContextPath,
- managementContextPath, managementPort, true));
- }
- return metadata;
- }
-
- private boolean isRandom(Integer port) {
- return port != null && port == RANDOM_PORT;
- }
-
- protected String getHealthCheckUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
- String managementContextPath, Integer managementPort, boolean isSecure) {
- String healthCheckUrlPath = instance.getHealthCheckUrlPath();
- String healthCheckUrl = getUrl(instance, serverPort, serverContextPath, managementContextPath, managementPort,
- healthCheckUrlPath, isSecure);
- log.debug("Constructed eureka meta-data healthcheckUrl: " + healthCheckUrl);
- return healthCheckUrl;
- }
-
- public String getStatusPageUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
- String managementContextPath, Integer managementPort) {
- String statusPageUrlPath = instance.getStatusPageUrlPath();
- String statusPageUrl = getUrl(instance, serverPort, serverContextPath, managementContextPath, managementPort,
- statusPageUrlPath, false);
- log.debug("Constructed eureka meta-data statusPageUrl: " + statusPageUrl);
- return statusPageUrl;
- }
-
- private String getUrl(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
- String managementContextPath, Integer managementPort, String urlPath, boolean isSecure) {
- managementContextPath = refineManagementContextPath(serverContextPath, managementContextPath, managementPort);
- if (managementPort == null) {
- managementPort = serverPort;
- }
- String scheme = isSecure ? "https" : "http";
- return constructValidUrl(scheme, instance.getHostname(), managementPort, managementContextPath, urlPath);
- }
-
- private String refineManagementContextPath(String serverContextPath, String managementContextPath,
- Integer managementPort) {
- // management context path is relative to server context path when no management
- // port is set
- if (managementContextPath != null && managementPort == null) {
- return serverContextPath + managementContextPath;
- }
- if (managementContextPath != null) {
- return managementContextPath;
- }
- if (managementPort != null) {
- return "/";
- }
- return serverContextPath;
- }
-
- private String constructValidUrl(String scheme, String hostname, int port, String contextPath, String statusPath) {
- try {
- if (!contextPath.endsWith("/")) {
- contextPath = contextPath + "/";
- }
- String refinedContextPath = '/' + StringUtils.trimLeadingCharacter(contextPath, '/');
- URL base = new URL(scheme, hostname, port, refinedContextPath);
- String refinedStatusPath = refinedStatusPath(statusPath, contextPath);
- return new URL(base, refinedStatusPath).toString();
- }
- catch (MalformedURLException e) {
- String message = getErrorMessage(scheme, hostname, port, contextPath, statusPath);
- throw new IllegalStateException(message, e);
- }
- }
-
- private String refinedStatusPath(String statusPath, String contextPath) {
- if (statusPath.startsWith(contextPath) && !"/".equals(contextPath)) {
- statusPath = StringUtils.replace(statusPath, contextPath, "");
- }
- return StringUtils.trimLeadingCharacter(statusPath, '/');
- }
-
- private String getErrorMessage(String scheme, String hostname, int port, String contextPath, String statusPath) {
- return String.format(
- "Failed to construct url for scheme: %s, hostName: %s port: %s contextPath: %s statusPath: %s", scheme,
- hostname, port, contextPath, statusPath);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadata.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadata.java
deleted file mode 100644
index be075487b..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadata.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.metadata;
-
-import java.util.Objects;
-
-/**
- * Stores management metadata for Eureka.
- *
- * @author Anastasiia Smirnova
- * @author Ryan Baxter
- */
-public class ManagementMetadata {
-
- private final String healthCheckUrl;
-
- private final String statusPageUrl;
-
- private final Integer managementPort;
-
- private String secureHealthCheckUrl;
-
- public ManagementMetadata(String healthCheckUrl, String statusPageUrl, Integer managementPort) {
- this.healthCheckUrl = healthCheckUrl;
- this.statusPageUrl = statusPageUrl;
- this.managementPort = managementPort;
- this.secureHealthCheckUrl = null;
- }
-
- public String getHealthCheckUrl() {
- return healthCheckUrl;
- }
-
- public String getStatusPageUrl() {
- return statusPageUrl;
- }
-
- public Integer getManagementPort() {
- return managementPort;
- }
-
- public String getSecureHealthCheckUrl() {
- return secureHealthCheckUrl;
- }
-
- public void setSecureHealthCheckUrl(String secureHealthCheckUrl) {
- this.secureHealthCheckUrl = secureHealthCheckUrl;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- ManagementMetadata that = (ManagementMetadata) o;
- return Objects.equals(healthCheckUrl, that.healthCheckUrl) && Objects.equals(statusPageUrl, that.statusPageUrl)
- && Objects.equals(managementPort, that.managementPort);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(healthCheckUrl, statusPageUrl, managementPort);
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("ManagementMetadata{");
- sb.append("healthCheckUrl='").append(healthCheckUrl).append('\'');
- sb.append(", statusPageUrl='").append(statusPageUrl).append('\'');
- sb.append(", managementPort=").append(managementPort);
- sb.append('}');
- return sb.toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadataProvider.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadataProvider.java
deleted file mode 100644
index fb33402f3..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/metadata/ManagementMetadataProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.metadata;
-
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-
-/**
- * Provider for Eureka-specific management metadata.
- *
- * @author Anastasiia Smirnova
- */
-public interface ManagementMetadataProvider {
-
- ManagementMetadata get(EurekaInstanceConfigBean instance, int serverPort, String serverContextPath,
- String managementContextPath, Integer managementPort);
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClient.java
deleted file mode 100644
index be7f210cf..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2019-2022 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.netflix.eureka.reactive;
-
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
-import org.springframework.core.Ordered;
-
-/**
- * A {@link ReactiveDiscoveryClient} implementation for Eureka.
- *
- * @author Tim Ysewyn
- */
-public class EurekaReactiveDiscoveryClient implements ReactiveDiscoveryClient {
-
- private final EurekaClient eurekaClient;
-
- private final EurekaClientConfig clientConfig;
-
- public EurekaReactiveDiscoveryClient(EurekaClient eurekaClient, EurekaClientConfig clientConfig) {
- this.eurekaClient = eurekaClient;
- this.clientConfig = clientConfig;
- }
-
- @Override
- public String description() {
- return "Spring Cloud Eureka Reactive Discovery Client";
- }
-
- @Override
- public Flux getInstances(String serviceId) {
- return Flux.defer(() -> Flux.fromIterable(eurekaClient.getInstancesByVipAddress(serviceId, false)))
- .map(EurekaServiceInstance::new);
- }
-
- @Override
- public Flux getServices() {
- return Flux.defer(() -> Mono.justOrEmpty(eurekaClient.getApplications()))
- .flatMapIterable(Applications::getRegisteredApplications)
- .filter(application -> !application.getInstances().isEmpty()).map(Application::getName)
- .map(String::toLowerCase);
- }
-
- @Override
- public int getOrder() {
- return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder()
- : ReactiveDiscoveryClient.DEFAULT_ORDER;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java
deleted file mode 100644
index 7d23f3e0a..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfiguration.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2019-2022 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.netflix.eureka.reactive;
-
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.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.netflix.eureka.EurekaClientAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configuration related to service discovery when using Netflix Eureka.
- *
- * @author Tim Ysewyn
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(EurekaClientConfig.class)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnReactiveDiscoveryEnabled
-@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
-@EnableConfigurationProperties
-@AutoConfigureAfter({ EurekaClientAutoConfiguration.class, ReactiveCompositeDiscoveryClientAutoConfiguration.class })
-@AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class)
-@ImportAutoConfiguration(EurekaClientAutoConfiguration.class)
-public class EurekaReactiveDiscoveryClientConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public EurekaReactiveDiscoveryClient eurekaReactiveDiscoveryClient(EurekaClient client,
- EurekaClientConfig clientConfig) {
- return new EurekaReactiveDiscoveryClient(client, clientConfig);
- }
-
- @Bean
- @ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
- @ConditionalOnDiscoveryHealthIndicatorEnabled
- public ReactiveDiscoveryClientHealthIndicator eurekaReactiveDiscoveryClientHealthIndicator(
- EurekaReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) {
- return new ReactiveDiscoveryClientHealthIndicator(client, properties);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaAutoServiceRegistration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaAutoServiceRegistration.java
deleted file mode 100644
index f90c32bae..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaAutoServiceRegistration.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.serviceregistry;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.boot.web.context.WebServerInitializedEvent;
-import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistration;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.context.event.SmartApplicationListener;
-import org.springframework.core.Ordered;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Jon Schneider
- * @author Jakub Narloch
- * @author Raiyan Raiyan
- */
-public class EurekaAutoServiceRegistration
- implements AutoServiceRegistration, SmartLifecycle, Ordered, SmartApplicationListener {
-
- private static final Log log = LogFactory.getLog(EurekaAutoServiceRegistration.class);
-
- private final AtomicBoolean running = new AtomicBoolean(false);
-
- private final int order = 0;
-
- private final AtomicInteger port = new AtomicInteger(0);
-
- private final ApplicationContext context;
-
- private final EurekaServiceRegistry serviceRegistry;
-
- private final EurekaRegistration registration;
-
- public EurekaAutoServiceRegistration(ApplicationContext context, EurekaServiceRegistry serviceRegistry,
- EurekaRegistration registration) {
- this.context = context;
- this.serviceRegistry = serviceRegistry;
- this.registration = registration;
- }
-
- @Override
- public void start() {
- // only set the port if the nonSecurePort or securePort is 0 and this.port != 0
- if (this.port.get() != 0) {
- if (this.registration.getNonSecurePort() == 0) {
- this.registration.setNonSecurePort(this.port.get());
- }
-
- if (this.registration.getSecurePort() == 0 && this.registration.isSecure()) {
- this.registration.setSecurePort(this.port.get());
- }
- }
-
- // only initialize if nonSecurePort is greater than 0 and it isn't already running
- // because of containerPortInitializer below
- if (!this.running.get() && this.registration.getNonSecurePort() > 0) {
-
- this.serviceRegistry.register(this.registration);
-
- this.context.publishEvent(new InstanceRegisteredEvent<>(this, this.registration.getInstanceConfig()));
- this.running.set(true);
- }
- }
-
- @Override
- public void stop() {
- this.serviceRegistry.deregister(this.registration);
- this.running.set(false);
- }
-
- @Override
- public boolean isRunning() {
- return this.running.get();
- }
-
- @Override
- public int getPhase() {
- return 0;
- }
-
- @Override
- public boolean isAutoStartup() {
- return true;
- }
-
- @Override
- public void stop(Runnable callback) {
- stop();
- callback.run();
- }
-
- @Override
- public int getOrder() {
- return this.order;
- }
-
- @Override
- public boolean supportsEventType(Class eventType) {
- return WebServerInitializedEvent.class.isAssignableFrom(eventType)
- || ContextClosedEvent.class.isAssignableFrom(eventType);
- }
-
- @Override
- public void onApplicationEvent(ApplicationEvent event) {
- if (event instanceof WebServerInitializedEvent) {
- onApplicationEvent((WebServerInitializedEvent) event);
- }
- else if (event instanceof ContextClosedEvent) {
- onApplicationEvent((ContextClosedEvent) event);
- }
- }
-
- public void onApplicationEvent(WebServerInitializedEvent event) {
- // TODO: take SSL into account
- String contextName = event.getApplicationContext().getServerNamespace();
- if (contextName == null || !contextName.equals("management")) {
- int localPort = event.getWebServer().getPort();
- if (this.port.get() == 0) {
- log.info("Updating port to " + localPort);
- this.port.compareAndSet(0, localPort);
- start();
- }
- }
- }
-
- public void onApplicationEvent(ContextClosedEvent event) {
- if (event.getApplicationContext() == context) {
- stop();
- }
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaRegistration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaRegistration.java
deleted file mode 100644
index babd71258..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaRegistration.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.serviceregistry;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.aop.framework.Advised;
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
-import org.springframework.cloud.netflix.eureka.CloudEurekaInstanceConfig;
-import org.springframework.cloud.netflix.eureka.InstanceInfoFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.util.Assert;
-
-/**
- * Eureka-specific implementation of service instance {@link Registration}.
- *
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-public class EurekaRegistration implements Registration {
-
- private static final Log log = LogFactory.getLog(EurekaRegistration.class);
-
- private final EurekaClient eurekaClient;
-
- private final AtomicReference cloudEurekaClient = new AtomicReference<>();
-
- private final CloudEurekaInstanceConfig instanceConfig;
-
- private final ApplicationInfoManager applicationInfoManager;
-
- private ObjectProvider healthCheckHandler;
-
- public EurekaRegistration(CloudEurekaInstanceConfig instanceConfig, EurekaClient eurekaClient,
- ApplicationInfoManager applicationInfoManager, ObjectProvider healthCheckHandler) {
- this.eurekaClient = eurekaClient;
- this.instanceConfig = instanceConfig;
- this.applicationInfoManager = applicationInfoManager;
- this.healthCheckHandler = healthCheckHandler;
- }
-
- public static Builder builder(CloudEurekaInstanceConfig instanceConfig) {
- return new Builder(instanceConfig);
- }
-
- @Override
- public String getInstanceId() {
- return this.instanceConfig.getInstanceId();
- }
-
- @Override
- public String getServiceId() {
- return this.instanceConfig.getAppname();
- }
-
- @Override
- public String getHost() {
- return this.instanceConfig.getHostName(false);
- }
-
- @Override
- public int getPort() {
- if (this.instanceConfig.getSecurePortEnabled()) {
- return this.instanceConfig.getSecurePort();
- }
- return this.instanceConfig.getNonSecurePort();
- }
-
- @Override
- public boolean isSecure() {
- return this.instanceConfig.getSecurePortEnabled();
- }
-
- @Override
- public URI getUri() {
- return DefaultServiceInstance.getUri(this);
- }
-
- @Override
- public Map getMetadata() {
- return this.instanceConfig.getMetadataMap();
- }
-
- public CloudEurekaClient getEurekaClient() {
- if (this.cloudEurekaClient.get() == null) {
- try {
- this.cloudEurekaClient.compareAndSet(null, getTargetObject(eurekaClient, CloudEurekaClient.class));
- }
- catch (Exception e) {
- log.error("error getting CloudEurekaClient", e);
- }
- }
- return this.cloudEurekaClient.get();
- }
-
- @SuppressWarnings({ "unchecked" })
- protected T getTargetObject(Object proxy, Class targetClass) throws Exception {
- if (AopUtils.isJdkDynamicProxy(proxy)) {
- return (T) ((Advised) proxy).getTargetSource().getTarget();
- }
- else {
- return (T) proxy; // expected to be cglib proxy then, which is simply a
- // specialized class
- }
- }
-
- public CloudEurekaInstanceConfig getInstanceConfig() {
- return instanceConfig;
- }
-
- public ApplicationInfoManager getApplicationInfoManager() {
- return applicationInfoManager;
- }
-
- public ObjectProvider getHealthCheckHandler() {
- return healthCheckHandler;
- }
-
- public void setHealthCheckHandler(ObjectProvider healthCheckHandler) {
- this.healthCheckHandler = healthCheckHandler;
- }
-
- public void setNonSecurePort(int port) {
- this.instanceConfig.setNonSecurePort(port);
- }
-
- public int getNonSecurePort() {
- return this.instanceConfig.getNonSecurePort();
- }
-
- public void setSecurePort(int port) {
- this.instanceConfig.setSecurePort(port);
- }
-
- public int getSecurePort() {
- return this.instanceConfig.getSecurePort();
- }
-
- /**
- * A builder for {@link EurekaRegistration} objects.
- */
- public static class Builder {
-
- private final CloudEurekaInstanceConfig instanceConfig;
-
- private ApplicationInfoManager applicationInfoManager;
-
- private EurekaClient eurekaClient;
-
- private ObjectProvider healthCheckHandler;
-
- private EurekaClientConfig clientConfig;
-
- private ApplicationEventPublisher publisher;
-
- private TransportClientFactories transportClientFactories;
-
- Builder(CloudEurekaInstanceConfig instanceConfig) {
- this.instanceConfig = instanceConfig;
- }
-
- public Builder with(ApplicationInfoManager applicationInfoManager) {
- this.applicationInfoManager = applicationInfoManager;
- return this;
- }
-
- public Builder with(EurekaClient eurekaClient) {
- this.eurekaClient = eurekaClient;
- return this;
- }
-
- public Builder with(ObjectProvider healthCheckHandler) {
- this.healthCheckHandler = healthCheckHandler;
- return this;
- }
-
- public Builder with(TransportClientFactories transportClientFactories) {
- this.transportClientFactories = transportClientFactories;
- return this;
- }
-
- public Builder with(EurekaClientConfig clientConfig, ApplicationEventPublisher publisher) {
- this.clientConfig = clientConfig;
- this.publisher = publisher;
- return this;
- }
-
- public EurekaRegistration build() {
- Assert.notNull(instanceConfig, "instanceConfig may not be null");
-
- if (this.applicationInfoManager == null) {
- InstanceInfo instanceInfo = new InstanceInfoFactory().create(this.instanceConfig);
- this.applicationInfoManager = new ApplicationInfoManager(this.instanceConfig, instanceInfo);
- }
- if (this.eurekaClient == null) {
- Assert.notNull(this.clientConfig, "if eurekaClient is null, EurekaClientConfig may not be null");
- Assert.notNull(this.publisher, "if eurekaClient is null, ApplicationEventPublisher may not be null");
- Assert.notNull(this.transportClientFactories,
- "if eurekaClient is null, TransportClientFactories may not be null");
-
- this.eurekaClient = new CloudEurekaClient(this.applicationInfoManager, this.clientConfig,
- this.transportClientFactories, this.publisher);
- }
- return new EurekaRegistration(instanceConfig, eurekaClient, applicationInfoManager, healthCheckHandler);
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistry.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistry.java
deleted file mode 100644
index cc15667f4..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistry.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.serviceregistry;
-
-import java.util.HashMap;
-
-import com.netflix.appinfo.InstanceInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UNKNOWN;
-
-/**
- * @author Spencer Gibb
- */
-public class EurekaServiceRegistry implements ServiceRegistry {
-
- private static final Log log = LogFactory.getLog(EurekaServiceRegistry.class);
-
- @Override
- public void register(EurekaRegistration reg) {
- maybeInitializeClient(reg);
-
- if (log.isInfoEnabled()) {
- log.info("Registering application " + reg.getApplicationInfoManager().getInfo().getAppName()
- + " with eureka with status " + reg.getInstanceConfig().getInitialStatus());
- }
-
- reg.getApplicationInfoManager().setInstanceStatus(reg.getInstanceConfig().getInitialStatus());
-
- reg.getHealthCheckHandler()
- .ifAvailable(healthCheckHandler -> reg.getEurekaClient().registerHealthCheck(healthCheckHandler));
- }
-
- private void maybeInitializeClient(EurekaRegistration reg) {
- // force initialization of possibly scoped proxies
- reg.getApplicationInfoManager().getInfo();
- reg.getEurekaClient().getApplications();
- }
-
- @Override
- public void deregister(EurekaRegistration reg) {
- if (reg.getApplicationInfoManager().getInfo() != null) {
-
- if (log.isInfoEnabled()) {
- log.info("Unregistering application " + reg.getApplicationInfoManager().getInfo().getAppName()
- + " with eureka with status DOWN");
- }
-
- reg.getApplicationInfoManager().setInstanceStatus(InstanceInfo.InstanceStatus.DOWN);
-
- // shutdown of eureka client should happen with EurekaRegistration.close()
- // auto registration will create a bean which will be properly disposed
- // manual registrations will need to call close()
- }
- }
-
- @Override
- public void setStatus(EurekaRegistration registration, String status) {
- InstanceInfo info = registration.getApplicationInfoManager().getInfo();
-
- // TODO: howto deal with delete properly?
- if ("CANCEL_OVERRIDE".equalsIgnoreCase(status)) {
- registration.getEurekaClient().cancelOverrideStatus(info);
- return;
- }
-
- // TODO: howto deal with status types across discovery systems?
- InstanceInfo.InstanceStatus newStatus = InstanceInfo.InstanceStatus.toEnum(status);
- registration.getEurekaClient().setStatus(newStatus, info);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Object getStatus(EurekaRegistration registration) {
- String appname = registration.getApplicationInfoManager().getInfo().getAppName();
- String instanceId = registration.getApplicationInfoManager().getInfo().getId();
- InstanceInfo info = registration.getEurekaClient().getInstanceInfo(appname, instanceId);
-
- HashMap status = new HashMap<>();
- if (info != null) {
- status.put("status", info.getStatus().toString());
- status.put("overriddenStatus", info.getOverriddenStatus().toString());
- }
- else {
- status.put("status", UNKNOWN.toString());
- }
-
- return status;
- }
-
- public void close() {
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/support/ZoneUtils.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/support/ZoneUtils.java
deleted file mode 100644
index 749353bde..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/support/ZoneUtils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.support;
-
-import org.springframework.util.StringUtils;
-
-/**
- * Utility class for dealing with zones.
- *
- * @author Ryan Baxter
- *
- */
-public final class ZoneUtils {
-
- private ZoneUtils() {
- throw new AssertionError("Must not instantiate utility class.");
- }
-
- /**
- * Approximates Eureka zones from a host name. This method approximates the zone to be
- * everything after the first "." in the host name.
- * @param host The host name to extract the host name from
- * @return The approximate zone
- */
- public static String extractApproximateZone(String host) {
- String[] split = StringUtils.split(host, ".");
- return split == null ? host : split[1];
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 28612129f..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "properties": [
- {
- "defaultValue": true,
- "name": "eureka.client.healthcheck.enabled",
- "description": "Enables the Eureka health check handler.",
- "type": "java.lang.Boolean"
- },
- {
- "defaultValue": true,
- "name": "eureka.client.refresh.enable",
- "description": "Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).",
- "type": "java.lang.Boolean"
- },
- {
- "defaultValue": true,
- "name": "ribbon.eureka.enabled",
- "description": "Enables the use of Eureka with Ribbon.",
- "type": "java.lang.Boolean"
- },
- {
- "defaultValue": false,
- "name": "eureka.client.webclient.enabled",
- "description": "Enables the use of WebClient for Eureka HTTP Client.",
- "type": "java.lang.Boolean"
- },
- {
- "defaultValue": 1,
- "name": "eureka.instance.metadata-map.weight",
- "description": "The weight of service instance for weighted load balancing.",
- "type": "java.lang.Integer",
- "sourceType": "org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean"
- }
- ]
-}
diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index c2189497a..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.netflix.eureka.config.EurekaConfigServerBootstrapConfiguration
-
-org.springframework.boot.BootstrapRegistryInitializer=\
-org.springframework.cloud.netflix.eureka.config.EurekaConfigServerBootstrapper
diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/aot.factories b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/aot.factories
deleted file mode 100644
index 281a4a28d..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/aot.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.cloud.netflix.eureka.EurekaClientHints
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 8c150801e..000000000
--- a/spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,6 +0,0 @@
-org.springframework.cloud.netflix.eureka.config.EurekaClientConfigServerAutoConfiguration
-org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration
-org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
-org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration
-org.springframework.cloud.netflix.eureka.reactive.EurekaReactiveDiscoveryClientConfiguration
-org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancerEurekaAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java
deleted file mode 100644
index 9b0e39b71..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2015-2022 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.netflix.eureka;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration.ConditionalOnMissingRefreshScope;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration.ConditionalOnRefreshScope;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- * @author Biju Kunjummen
- */
-class ConditionalOnRefreshScopeTests {
-
- @Test
- void refreshScopeIncluded() {
- new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class))
- .withUserConfiguration(Beans.class).run(c -> {
- assertThat(c).hasSingleBean(org.springframework.cloud.context.scope.refresh.RefreshScope.class);
- assertThat(c.getBean("foo")).isEqualTo("foo");
- });
- }
-
- @Test
- void refreshScopeIncludedAndPropertyDisabled() {
- new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class))
- .withPropertyValues("eureka.client.refresh.enable=false").withUserConfiguration(Beans.class).run(c -> {
- assertThat(c).hasSingleBean(org.springframework.cloud.context.scope.refresh.RefreshScope.class);
- assertThat(c).doesNotHaveBean("foo");
- assertThat(c.getBean("bar")).isEqualTo("bar");
- });
- }
-
- @Test
- void refreshScopeNotIncluded() {
- new ApplicationContextRunner().withUserConfiguration(Beans.class).run(c -> {
- assertThat(c).doesNotHaveBean("foo");
- assertThat(c.getBean("bar")).isEqualTo("bar");
- });
-
- new ApplicationContextRunner().withUserConfiguration(Beans.class)
- .withPropertyValues("eureka.client.refresh.enable=false").run(c -> {
- assertThat(c).doesNotHaveBean("foo");
- assertThat(c.getBean("bar")).isEqualTo("bar");
- });
- }
-
- @Configuration(proxyBeanMethods = false)
- protected static class Beans {
-
- @Bean
- @ConditionalOnRefreshScope
- public String foo() {
- return "foo";
- }
-
- @Bean
- @ConditionalOnMissingRefreshScope
- public String bar() {
- return "bar";
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationRandomPortTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationRandomPortTests.java
deleted file mode 100644
index bd9ed0583..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationRandomPortTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.InstanceInfo;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-class EurekaClientAutoConfigurationRandomPortTests {
-
- @Autowired
- private ApplicationInfoManager infoManager;
-
- @Test
- void instanceInfoPortShouldNotBeZero() {
- InstanceInfo info = infoManager.getInfo();
- assertThat(info.getPort()).isGreaterThan(0);
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- public static class TestConfig {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
deleted file mode 100644
index 1f31e884c..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import org.springframework.aop.framework.Advised;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicator;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
-import org.springframework.cloud.context.config.ContextRefreshedWithApplicationEvent;
-import org.springframework.cloud.context.refresh.ContextRefresher;
-import org.springframework.cloud.context.scope.GenericScope;
-import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.SystemEnvironmentPropertySource;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.fail;
-
-/**
- * @author Spencer Gibb
- * @author Matt Jenkins
- * @author Olga Maciaszek-Sharma
- * @author Tim Ysewyn
- */
-class EurekaClientAutoConfigurationTests {
-
- private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
- @AfterEach
- void after() {
- if (this.context != null && this.context.isActive()) {
- this.context.close();
- }
- }
-
- private void setupContext(Class... config) {
- ConfigurationPropertySources.attach(this.context.getEnvironment());
- this.context.register(PropertyPlaceholderAutoConfiguration.class,
- DiscoveryClientOptionalArgsConfiguration.class, EurekaDiscoveryClientConfiguration.class);
- for (Class value : config) {
- this.context.register(value);
- }
- this.context.register(TestConfiguration.class);
- this.context.refresh();
- }
-
- @Test
- void shouldSetManagementPortInMetadataMapIfEqualToServerPort() {
- TestPropertyValues.of("server.port=8989").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
-
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
-
- assertThat(instance.getMetadataMap().get("management.port")).isEqualTo("8989");
- }
-
- @Test
- void shouldNotSetManagementAndJmxPortsInMetadataMap() {
- TestPropertyValues.of("server.port=8989", "management.server.port=0").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
-
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
-
- assertThat(instance.getMetadataMap().get("management.port")).isEqualTo(null);
- assertThat(instance.getMetadataMap().get("jmx.port")).isEqualTo(null);
- }
-
- @Test
- void shouldSetManagementAndJmxPortsInMetadataMap() {
- TestPropertyValues.of("management.server.port=9999", "com.sun.management.jmxremote.port=6789")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
-
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getMetadataMap().get("management.port")).isEqualTo("9999");
- assertThat(instance.getMetadataMap().get("jmx.port")).isEqualTo("6789");
- }
-
- @Test
- void shouldNotResetManagementAndJmxPortsInMetadataMap() {
- TestPropertyValues.of("management.server.port=9999", "eureka.instance.metadata-map.jmx.port=9898",
- "eureka.instance.metadata-map.management.port=7878").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
-
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getMetadataMap().get("management.port")).isEqualTo("7878");
- assertThat(instance.getMetadataMap().get("jmx.port")).isEqualTo("9898");
- }
-
- @Test
- void nonSecurePortPeriods() {
- testNonSecurePort("server.port");
- }
-
- @Test
- void nonSecurePortUnderscores() {
- testNonSecurePortSystemProp("SERVER_PORT");
- }
-
- @Test
- void nonSecurePort() {
- testNonSecurePortSystemProp("PORT");
- assertThat(this.context.getBeanDefinition("eurekaClient").getFactoryMethodName()).isEqualTo("eurekaClient");
- }
-
- @Test
- void securePortPeriods() {
- testSecurePort("server.port");
- }
-
- @Test
- void securePortUnderscores() {
- TestPropertyValues.of("eureka.instance.secure-port-enabled=true").applyTo(this.context);
- addSystemEnvironment(this.context.getEnvironment(), "SERVER_PORT:8443");
- setupContext();
- assertThat(getInstanceConfig().getSecurePort()).isEqualTo(8443);
- }
-
- @Test
- void securePort() {
- testSecurePort("PORT");
- assertThat(this.context.getBeanDefinition("eurekaClient").getFactoryMethodName()).isEqualTo("eurekaClient");
- }
-
- @Test
- void managementPort() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().contains("9999")).as("Wrong status page: " + instance.getStatusPageUrl())
- .isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPort() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "eureka.instance.statusPageUrlPath=/myStatusPage").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().contains("/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPort() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "eureka.instance.healthCheckUrlPath=/myHealthCheck").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().contains("/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrl_and_healthCheckUrl_do_not_contain_server_context_path() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "server.contextPath=/service")
- .applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":9999/actuator/info"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- assertThat(instance.getHealthCheckUrl().endsWith(":9999/actuator/health"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrl_and_healthCheckUrl_contain_management_context_path() {
- TestPropertyValues.of("server.port=8989", "management.server.servlet.context-path=/management")
- .applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":8989/management/actuator/info"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- assertThat(instance.getHealthCheckUrl().endsWith(":8989/management/actuator/health"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrl_and_healthCheckUrl_contain_management_context_path_random_port() {
- TestPropertyValues.of("server.port=0", "management.server.servlet.context-path=/management")
- .applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrlPath().equals("/management/actuator/info"))
- .as("Wrong status page: " + instance.getStatusPageUrlPath()).isTrue();
- assertThat(instance.getHealthCheckUrlPath().equals("/management/actuator/health"))
- .as("Wrong health check: " + instance.getHealthCheckUrlPath()).isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPortAndContextPath() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "management.server.servlet.context-path=/manage", "eureka.instance.status-page-url-path=/myStatusPage")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":9999/manage/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortAndContextPath() {
- TestPropertyValues
- .of("server.port=8989", "management.server.port=9999", "management.server.servlet.context-path=/manage",
- "eureka.instance.health-check-url-path=/myHealthCheck")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().endsWith(":9999/manage/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPortAndContextPathKebobCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "management.server.servlet.context-path=/manage", "eureka.instance.status-page-url-path=/myStatusPage")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":9999/manage/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortAndContextPathKebobCase() {
- TestPropertyValues
- .of("server.port=8989", "management.server.port=9999", "management.server.servlet.context-path=/manage",
- "eureka.instance.health-check-url-path=/myHealthCheck")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().endsWith(":9999/manage/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrl_and_healthCheckUrl_contain_management_base_path() {
- TestPropertyValues.of("server.port=8989", "management.server.base-path=/management").applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":8989/management/actuator/info"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- assertThat(instance.getHealthCheckUrl().endsWith(":8989/management/actuator/health"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrl_and_healthCheckUrl_contain_management_base_path_random_port() {
- TestPropertyValues.of("server.port=0", "management.server.base-path=/management").applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrlPath().equals("/management/actuator/info"))
- .as("Wrong status page: " + instance.getStatusPageUrlPath()).isTrue();
- assertThat(instance.getHealthCheckUrlPath().equals("/management/actuator/health"))
- .as("Wrong health check: " + instance.getHealthCheckUrlPath()).isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPortAndBasePath() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "management.server.base-path=/manage",
- "eureka.instance.status-page-url-path=/myStatusPage").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":9999/manage/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortAndBasePath() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "management.server.base-path=/manage",
- "eureka.instance.health-check-url-path=/myHealthCheck").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().endsWith(":9999/manage/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPortAndBasePathKebobCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "management.server.base-path=/manage",
- "eureka.instance.status-page-url-path=/myStatusPage").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().endsWith(":9999/manage/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortAndBasePathKebobCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "management.server.base-path=/manage",
- "eureka.instance.health-check-url-path=/myHealthCheck").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().endsWith(":9999/manage/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathWithServerPortAndContextPathKebobCase() {
- TestPropertyValues
- .of("server.port=8989", "server.servlet.context-path=/servletContextPath",
- "eureka.instance.health-check-url-path=${server.servlet.context-path:}/myHealthCheck")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl()).as("Wrong health check: " + instance.getHealthCheckUrl())
- .endsWith(":8989/servletContextPath/myHealthCheck");
- }
-
- @Test
- void statusPageUrlPathAndManagementPortKabobCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "eureka.instance.status-page-url-path=/myStatusPage").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().contains("/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void statusPageUrlAndPreferIpAddress() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "eureka.instance.hostname=foo",
- "eureka.instance.prefer-ip-address:true").applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
-
- assertThat(instance.getStatusPageUrl()).as("statusPageUrl is wrong")
- .isEqualTo("http://" + instance.getIpAddress() + ":9999/actuator/info");
- assertThat(instance.getHealthCheckUrl()).as("healthCheckUrl is wrong")
- .isEqualTo("http://" + instance.getIpAddress() + ":9999/actuator/health");
- }
-
- @Test
- void statusPageAndHealthCheckUrlsShouldSetUserDefinedIpAddress() {
- TestPropertyValues
- .of("server.port=8989", "management.server.port=9999", "eureka.instance.hostname=foo",
- "eureka.instance.ip-address:192.168.13.90", "eureka.instance.prefer-ip-address:true")
- .applyTo(this.context);
-
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
-
- assertThat(instance.getStatusPageUrl()).as("statusPageUrl is wrong")
- .isEqualTo("http://192.168.13.90:9999/actuator/info");
- assertThat(instance.getHealthCheckUrl()).as("healthCheckUrl is wrong")
- .isEqualTo("http://192.168.13.90:9999/actuator/health");
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortKabobCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999",
- "eureka.instance.health-check-url-path=/myHealthCheck").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().contains("/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void statusPageUrlPathAndManagementPortUpperCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999").applyTo(this.context);
- addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_STATUS_PAGE_URL_PATH=/myStatusPage");
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().contains("/myStatusPage"))
- .as("Wrong status page: " + instance.getStatusPageUrl()).isTrue();
- }
-
- @Test
- void healthCheckUrlPathAndManagementPortUpperCase() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999").applyTo(this.context);
- addSystemEnvironment(this.context.getEnvironment(), "EUREKA_INSTANCE_HEALTH_CHECK_URL_PATH=/myHealthCheck");
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getHealthCheckUrl().contains("/myHealthCheck"))
- .as("Wrong health check: " + instance.getHealthCheckUrl()).isTrue();
- }
-
- @Test
- void hostname() {
- TestPropertyValues.of("server.port=8989", "management.server.port=9999", "eureka.instance.hostname=foo")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class);
- EurekaInstanceConfigBean instance = this.context.getBean(EurekaInstanceConfigBean.class);
- assertThat(instance.getStatusPageUrl().contains("foo")).as("Wrong status page: " + instance.getStatusPageUrl())
- .isTrue();
- }
-
- @Test
- void refreshScopedBeans() {
- setupContext(RefreshAutoConfiguration.class);
- assertThat(this.context.getBeanDefinition("eurekaClient").getBeanClassName())
- .startsWith(GenericScope.class.getName() + "$LockedScopedProxyFactoryBean");
- assertThat(this.context.getBeanDefinition("eurekaApplicationInfoManager").getBeanClassName())
- .startsWith(GenericScope.class.getName() + "$LockedScopedProxyFactoryBean");
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Test
- void shouldReregisterHealthCheckHandlerAfterRefresh() throws Exception {
- TestPropertyValues
- .of("eureka.client.healthcheck.enabled=true", "spring.cloud.config.import-check.enabled=false",
- "spring.cloud.refresh.additionalPropertySourcesToRetain=test")
- .applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class, AutoServiceRegistrationConfiguration.class);
-
- EurekaClient oldEurekaClient = getLazyInitEurekaClient();
-
- HealthCheckHandler healthCheckHandler = this.context.getBean("eurekaHealthCheckHandler",
- HealthCheckHandler.class);
-
- assertThat(healthCheckHandler).isInstanceOf(EurekaHealthCheckHandler.class);
- assertThat(oldEurekaClient.getHealthCheckHandler()).isSameAs(healthCheckHandler);
-
- ContextRefresher refresher = this.context.getBean(ContextRefresher.class);
- if (refresher instanceof ApplicationListener) {
- ApplicationListener listener = (ApplicationListener) refresher;
- listener.onApplicationEvent(new ContextRefreshedWithApplicationEvent(Mockito.mock(SpringApplication.class),
- new String[0], this.context));
- }
- refresher.refresh();
-
- EurekaClient newEurekaClient = getLazyInitEurekaClient();
- HealthCheckHandler newHealthCheckHandler = this.context.getBean("eurekaHealthCheckHandler",
- HealthCheckHandler.class);
-
- assertThat(healthCheckHandler).isSameAs(newHealthCheckHandler);
- assertThat(oldEurekaClient).isNotSameAs(newEurekaClient);
- assertThat(newEurekaClient.getHealthCheckHandler()).isSameAs(healthCheckHandler);
- }
-
- @Test
- void shouldCloseDiscoveryClient() throws Exception {
- TestPropertyValues.of("eureka.client.healthcheck.enabled=true").applyTo(this.context);
- setupContext(RefreshAutoConfiguration.class, AutoServiceRegistrationConfiguration.class);
-
- AtomicBoolean isShutdown = (AtomicBoolean) ReflectionTestUtils.getField(getLazyInitEurekaClient(),
- "isShutdown");
-
- assertThat(isShutdown.get()).isFalse();
-
- this.context.close();
-
- assertThat(isShutdown.get()).isTrue();
- }
-
- @Test
- void testDefaultAppName() {
- setupContext();
- assertThat(getInstanceConfig().getAppname()).isEqualTo("unknown");
- assertThat(getInstanceConfig().getVirtualHostName()).isEqualTo("unknown");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).isEqualTo("unknown");
- }
-
- @Test
- void testAppName() {
- TestPropertyValues.of("spring.application.name=mytest").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getAppname()).isEqualTo("mytest");
- assertThat(getInstanceConfig().getVirtualHostName()).isEqualTo("mytest");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).isEqualTo("mytest");
- }
-
- @Test
- void testAppNameUpper() {
- addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestupper");
- setupContext();
- assertThat(getInstanceConfig().getAppname()).isEqualTo("mytestupper");
- assertThat(getInstanceConfig().getVirtualHostName()).isEqualTo("mytestupper");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).isEqualTo("mytestupper");
- }
-
- private void addSystemEnvironment(ConfigurableEnvironment environment, String... pairs) {
- MutablePropertySources sources = environment.getPropertySources();
- Map map = getOrAdd(sources, "testsysenv");
- for (String pair : pairs) {
- int index = getSeparatorIndex(pair);
- String key = pair.substring(0, index > 0 ? index : pair.length());
- String value = index > 0 ? pair.substring(index + 1) : "";
- map.put(key.trim(), value.trim());
- }
- }
-
- @SuppressWarnings("unchecked")
- private static Map getOrAdd(MutablePropertySources sources, String name) {
- if (sources.contains(name)) {
- return (Map) sources.get(name).getSource();
- }
- Map map = new HashMap<>();
- sources.addFirst(new SystemEnvironmentPropertySource(name, map));
- return map;
- }
-
- private static int getSeparatorIndex(String pair) {
- int colonIndex = pair.indexOf(":");
- int equalIndex = pair.indexOf("=");
- if (colonIndex == -1) {
- return equalIndex;
- }
- if (equalIndex == -1) {
- return colonIndex;
- }
- return Math.min(colonIndex, equalIndex);
- }
-
- @Test
- void testInstanceNamePreferred() {
- addSystemEnvironment(this.context.getEnvironment(), "SPRING_APPLICATION_NAME=mytestspringappname");
- TestPropertyValues.of("eureka.instance.appname=mytesteurekaappname").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getAppname()).isEqualTo("mytesteurekaappname");
- }
-
- @Test
- void eurekaHealthIndicatorCreated() {
- setupContext();
- this.context.getBean(EurekaHealthIndicator.class);
- }
-
- @Test
- void eurekaClientClosed() {
- setupContext(TestEurekaClientConfiguration.class);
- if (this.context != null) {
- CountDownLatch latch = this.context.getBean(CountDownLatch.class);
- this.context.close();
- assertThat(latch.getCount()).isEqualTo(0);
- }
- }
-
- @Test
- void eurekaConfigNotLoadedWhenDiscoveryClientDisabled() {
- TestPropertyValues.of("spring.cloud.discovery.enabled=false").applyTo(this.context);
- setupContext(TestConfiguration.class);
- assertBeanNotPresent(EurekaClientConfigBean.class);
- assertBeanNotPresent(EurekaInstanceConfigBean.class);
- assertBeanNotPresent(DiscoveryClient.class);
- assertBeanNotPresent(EurekaServiceRegistry.class);
- assertBeanNotPresent(EurekaClient.class);
- }
-
- @Test
- void shouldNotHaveDiscoveryClientWhenBlockingDiscoveryDisabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
- DiscoveryClientOptionalArgsConfiguration.class, EurekaClientAutoConfiguration.class,
- EurekaDiscoveryClientConfiguration.class))
- .withPropertyValues("spring.cloud.discovery.blocking.enabled=false").run(context -> {
- assertThat(context).doesNotHaveBean(DiscoveryClient.class);
- assertThat(context).doesNotHaveBean(DiscoveryClientHealthIndicator.class);
- });
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- 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 testNonSecurePortSystemProp(String propName) {
- addSystemEnvironment(this.context.getEnvironment(), propName + ":8888");
- setupContext();
- assertThat(getInstanceConfig().getNonSecurePort()).isEqualTo(8888);
- }
-
- private void testNonSecurePort(String propName) {
- TestPropertyValues.of(propName + ":8888").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getNonSecurePort()).isEqualTo(8888);
- }
-
- private void testSecurePort(String propName) {
- TestPropertyValues.of("eureka.instance.secure-port-enabled=true", propName + ":8443").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getSecurePort()).isEqualTo(8443);
- }
-
- private EurekaInstanceConfigBean getInstanceConfig() {
- return this.context.getBean(EurekaInstanceConfigBean.class);
- }
-
- private EurekaClient getLazyInitEurekaClient() throws Exception {
- return (EurekaClient) ((Advised) this.context.getBean("eurekaClient", EurekaClient.class)).getTargetSource()
- .getTarget();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableConfigurationProperties
- @Import({ UtilAutoConfiguration.class, EurekaClientAutoConfiguration.class })
- protected static class TestConfiguration {
-
- }
-
- @Configuration
- protected static class TestEurekaClientConfiguration {
-
- @Bean
- public CountDownLatch countDownLatch() {
- return new CountDownLatch(1);
- }
-
- @Bean(destroyMethod = "shutdown")
- @ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
- public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config,
- TransportClientFactories transportClientFactories, ApplicationContext context,
- AbstractDiscoveryClientOptionalArgs optionalArgs) {
- return new CloudEurekaClient(manager, config, transportClientFactories, optionalArgs, context) {
- @Override
- public synchronized void shutdown() {
- CountDownLatch latch = countDownLatch();
- if (latch.getCount() == 1) {
- latch.countDown();
- }
- super.shutdown();
- }
- };
- }
-
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableConfigurationProperties(AutoServiceRegistrationProperties.class)
- public static class AutoServiceRegistrationConfiguration {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java
deleted file mode 100644
index b1c3f2e4a..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.util.Collections;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.MapPropertySource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- */
-class EurekaClientConfigBeanTests {
-
- private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
- @AfterEach
- void init() {
- if (this.context != null) {
- this.context.close();
- }
- }
-
- @Test
- void basicBinding() {
- TestPropertyValues.of("eureka.client.proxyHost=example.com").applyTo(this.context);
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(this.context.getBean(EurekaClientConfigBean.class).getProxyHost()).isEqualTo("example.com");
- }
-
- @Test
- void serviceUrl() {
- TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:https://example.com").applyTo(this.context);
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl().toString())
- .isEqualTo("{defaultZone=https://example.com}");
- assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo("[https://example.com/]");
- }
-
- @Test
- void serviceUrlWithCompositePropertySource() {
- CompositePropertySource source = new CompositePropertySource("composite");
- this.context.getEnvironment().getPropertySources().addFirst(source);
- source.addPropertySource(new MapPropertySource("config", Collections.singletonMap(
- "eureka.client.serviceUrl.defaultZone",
- "https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com")));
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(this.context.getBean(EurekaClientConfigBean.class).getServiceUrl().toString()).isEqualTo(
- "{defaultZone=https://example.com,https://example2.com, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com}");
- assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo(
- "[https://example.com/, https://example2.com/, https://www.hugedomains.com/domain_profile.cfm?d=example3&e=com/]");
- }
-
- @Test
- void serviceUrlWithDefault() {
- TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:https://example.com").applyTo(this.context);
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo("[https://example.com/]");
- }
-
- @Test
- void serviceUrlWithCustomZone() {
- TestPropertyValues.of("eureka.client.serviceUrl.customZone:https://custom-example.com").applyTo(this.context);
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(getEurekaServiceUrls("customZone")).isEqualTo("[https://custom-example.com/]");
- }
-
- @Test
- void serviceUrlWithEmptyServiceUrls() {
- TestPropertyValues.of("eureka.client.serviceUrl.defaultZone:").applyTo(this.context);
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- assertThat(getEurekaServiceUrlsForDefaultZone()).isEqualTo("[]");
- }
-
- private String getEurekaServiceUrlsForDefaultZone() {
- return getEurekaServiceUrls("defaultZone");
- }
-
- private String getEurekaServiceUrls(String myZone) {
- return this.context.getBean(EurekaClientConfigBean.class).getEurekaServerServiceUrls(myZone).toString();
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableConfigurationProperties(EurekaClientConfigBean.class)
- protected static class TestConfiguration {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java
deleted file mode 100644
index 21a078226..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandlerTests.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Mono;
-
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
-import org.springframework.boot.actuate.health.CompositeHealthContributor;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthContributor;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.actuate.health.NamedContributor;
-import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
-import org.springframework.boot.actuate.health.SimpleStatusAggregator;
-import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicator;
-import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthContributor;
-import org.springframework.cloud.client.discovery.health.DiscoveryHealthIndicator;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests the {@link EurekaHealthCheckHandler} with different health indicator registered.
- *
- * @author Jakub Narloch
- * @author Nowrin Anwar Joyita
- * @author Olga Maciaszek-Sharma
- */
-class EurekaHealthCheckHandlerTests {
-
- private EurekaHealthCheckHandler healthCheckHandler;
-
- @BeforeEach
- void setUp() {
-
- healthCheckHandler = new EurekaHealthCheckHandler(new SimpleStatusAggregator());
- }
-
- @Test
- void testNoHealthCheckRegistered() {
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.UNKNOWN);
- }
-
- @Test
- void testAllUp() {
- initialize(UpHealthConfiguration.class, ReactiveUpHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.UP);
- }
-
- @Test
- void testHealthCheckNotReturnedWhenStopped() {
- initialize(UpHealthConfiguration.class);
-
- healthCheckHandler.stop();
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
-
- assertThat(status).isNull();
- healthCheckHandler.start();
- InstanceStatus newStatus = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(newStatus).isEqualTo(InstanceStatus.UP);
- }
-
- @Test
- void testDownWithBlockingIndicators() {
- initialize(UpHealthConfiguration.class, DownHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- @Test
- void testDownWithReactiveIndicators() {
- initialize(UpHealthConfiguration.class, ReactiveDownHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- @Test
- void testDownWhenBlockingIndicatorUpAndReactiveDown() {
- initialize(ReactiveUpHealthConfiguration.class, DownHealthConfiguration.class);
-
- InstanceStatus status = this.healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- @Test
- void testDownWhenBlockingIndicatorDownAndReactiveUp() {
- initialize(ReactiveUpHealthConfiguration.class, ReactiveDownHealthConfiguration.class);
-
- InstanceStatus status = this.healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- @Test
- void testUnknown() {
- initialize(FatalHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UNKNOWN);
- assertThat(status).isEqualTo(InstanceStatus.UNKNOWN);
- }
-
- @Test
- void testEurekaIgnored() {
- initialize(EurekaDownHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UP);
- assertThat(status).isEqualTo(InstanceStatus.UP);
- }
-
- @Test
- void testCompositeComponentsDown() {
- initialize(CompositeComponentsDownHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UP);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- @Test
- void testCompositeComponentsUp() {
- initialize(CompositeComponentsUpHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UP);
- assertThat(status).isEqualTo(InstanceStatus.UP);
- }
-
- @Test
- void testCompositeComponentsOneDown() {
- initialize(CompositeComponentsOneDownHealthConfiguration.class);
-
- InstanceStatus status = healthCheckHandler.getStatus(InstanceStatus.UP);
- assertThat(status).isEqualTo(InstanceStatus.DOWN);
- }
-
- private void initialize(Class... configurations) {
- ApplicationContext applicationContext = new AnnotationConfigApplicationContext(configurations);
- healthCheckHandler.setApplicationContext(applicationContext);
- healthCheckHandler.afterPropertiesSet();
- }
-
- public static class UpHealthConfiguration {
-
- @Bean
- public HealthIndicator healthIndicator() {
- return new AbstractHealthIndicator() {
- @Override
- protected void doHealthCheck(Health.Builder builder) {
- builder.up();
- }
- };
- }
-
- }
-
- public static class DownHealthConfiguration {
-
- @Bean
- public HealthIndicator healthIndicator() {
- return new AbstractHealthIndicator() {
- @Override
- protected void doHealthCheck(Health.Builder builder) {
- builder.down();
- }
- };
- }
-
- }
-
- public static class FatalHealthConfiguration {
-
- @Bean
- public HealthIndicator healthIndicator() {
- return new AbstractHealthIndicator() {
- @Override
- protected void doHealthCheck(Health.Builder builder) {
- builder.status("fatal");
- }
- };
- }
-
- }
-
- public static class ReactiveUpHealthConfiguration {
-
- @Bean
- public ReactiveHealthIndicator reactiveHealthIndicator() {
- return new AbstractReactiveHealthIndicator() {
- @Override
- protected Mono doHealthCheck(Health.Builder builder) {
- return Mono.just(builder.up().build());
- }
- };
- }
-
- }
-
- public static class ReactiveDownHealthConfiguration {
-
- @Bean
- public ReactiveHealthIndicator reactiveHealthIndicator() {
- return new AbstractReactiveHealthIndicator() {
- @Override
- protected Mono doHealthCheck(Health.Builder builder) {
- return Mono.just(builder.down().build());
- }
- };
- }
-
- }
-
- public static class EurekaDownHealthConfiguration {
-
- @Bean
- public DiscoveryHealthIndicator discoveryHealthIndicator() {
- return new DiscoveryClientHealthIndicator(null, null) {
- @Override
- public Health health() {
- return Health.up().build();
- }
- };
- }
-
- @Bean
- public DiscoveryHealthIndicator eurekaHealthIndicator() {
- return new EurekaHealthIndicator(null, null, null) {
- @Override
- public Health health() {
- return Health.down().build();
- }
- };
- }
-
- @Bean
- public DiscoveryCompositeHealthContributor discoveryCompositeHealthContributor(
- List indicators) {
- return new DiscoveryCompositeHealthContributor(indicators);
- }
-
- }
-
- protected static class CompositeComponentsDownHealthConfiguration {
-
- @Bean
- public CompositeHealthContributor compositeHealthContributor() {
- return new TestCompositeHealthContributor(InstanceStatus.DOWN, InstanceStatus.DOWN);
- }
-
- }
-
- protected static class CompositeComponentsUpHealthConfiguration {
-
- @Bean
- public CompositeHealthContributor compositeHealthContributor() {
- return new TestCompositeHealthContributor(InstanceStatus.UP, InstanceStatus.UP);
- }
-
- }
-
- protected static class CompositeComponentsOneDownHealthConfiguration {
-
- @Bean
- public CompositeHealthContributor compositeHealthContributor() {
- return new TestCompositeHealthContributor(InstanceStatus.UP, InstanceStatus.DOWN);
- }
-
- }
-
- static class TestCompositeHealthContributor implements CompositeHealthContributor {
-
- private final Map contributorMap = new HashMap<>();
-
- TestCompositeHealthContributor(InstanceStatus firstContributorStatus, InstanceStatus secondContributorStatus) {
- contributorMap.put("first", new AbstractHealthIndicator() {
- @Override
- protected void doHealthCheck(Health.Builder builder) {
- builder.status(firstContributorStatus.name());
- }
- });
- contributorMap.put("second", new AbstractHealthIndicator() {
- @Override
- protected void doHealthCheck(Health.Builder builder) {
- builder.status(secondContributorStatus.name());
- }
- });
- }
-
- @Override
- public HealthContributor getContributor(String name) {
- return contributorMap.get(name);
- }
-
- @Override
- public Iterator> iterator() {
- Iterator> iterator = contributorMap.entrySet().iterator();
- return new Iterator<>() {
-
- @Override
- public boolean hasNext() {
- return iterator.hasNext();
- }
-
- @Override
- public NamedContributor next() {
- Map.Entry entry = iterator.next();
- return NamedContributor.of(entry.getKey(), entry.getValue());
- }
-
- };
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
deleted file mode 100644
index 109d5e2f9..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBeanTests.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.util.StringUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Ryan Baxter
- * @author Tim Ysewyn
- */
-class EurekaInstanceConfigBeanTests {
-
- private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
- private String hostName;
-
- private String ipAddress;
-
- @BeforeEach
- void init() {
- try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
- InetUtils.HostInfo hostInfo = utils.findFirstNonLoopbackHostInfo();
- this.hostName = hostInfo.getHostname();
- this.ipAddress = hostInfo.getIpAddress();
- }
- }
-
- @AfterEach
- void clear() {
- if (this.context != null) {
- this.context.close();
- }
- }
-
- @Test
- void basicBinding() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getAppGroupName()).isEqualTo("mygroup");
- }
-
- @Test
- void nonSecurePort() {
- TestPropertyValues.of("eureka.instance.nonSecurePort:8888").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getNonSecurePort()).isEqualTo(8888);
- }
-
- @Test
- void instanceId() {
- TestPropertyValues.of("eureka.instance.instanceId:special").applyTo(this.context);
- setupContext();
- EurekaInstanceConfigBean instance = getInstanceConfig();
- assertThat(instance.getInstanceId()).isEqualTo("special");
- }
-
- @Test
- void initialHostName() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- if (this.hostName != null) {
- assertThat(getInstanceConfig().getHostname()).isEqualTo(this.hostName);
- }
- }
-
- @Test
- void refreshHostName() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- ReflectionTestUtils.setField(getInstanceConfig(), "hostname", "marvin");
- assertThat(getInstanceConfig().getHostname()).isEqualTo("marvin");
- getInstanceConfig().getHostName(true);
- if (this.hostName != null) {
- assertThat(getInstanceConfig().getHostname()).isEqualTo(this.hostName);
- }
- }
-
- @Test
- void refreshHostNameWhenSetByUser() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- getInstanceConfig().setHostname("marvin");
- assertThat(getInstanceConfig().getHostname()).isEqualTo("marvin");
- getInstanceConfig().getHostName(true);
- assertThat(getInstanceConfig().getHostname()).isEqualTo("marvin");
- }
-
- @Test
- void initialIpAddress() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- if (this.ipAddress != null) {
- assertThat(getInstanceConfig().getIpAddress()).isEqualTo(this.ipAddress);
- }
- }
-
- @Test
- void refreshIpAddress() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- ReflectionTestUtils.setField(getInstanceConfig(), "ipAddress", "10.0.0.1");
- assertThat(getInstanceConfig().getIpAddress()).isEqualTo("10.0.0.1");
- getInstanceConfig().getHostName(true);
- if (this.ipAddress != null) {
- assertThat(getInstanceConfig().getIpAddress()).isEqualTo(this.ipAddress);
- }
- }
-
- @Test
- void refreshIpAddressWhenSetByUser() {
- TestPropertyValues.of("eureka.instance.appGroupName=mygroup").applyTo(this.context);
- setupContext();
- getInstanceConfig().setIpAddress("10.0.0.1");
- assertThat(getInstanceConfig().getIpAddress()).isEqualTo("10.0.0.1");
- getInstanceConfig().getHostName(true);
- assertThat(getInstanceConfig().getIpAddress()).isEqualTo("10.0.0.1");
- }
-
- @Test
- void testDefaultInitialStatus() {
- setupContext();
- assertThat(getInstanceConfig().getInitialStatus()).as("initialStatus wrong").isEqualTo(InstanceStatus.UP);
- }
-
- @Test
- void testCustomInitialStatus() {
- TestPropertyValues.of("eureka.instance.initial-status:STARTING").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getInitialStatus()).as("initialStatus wrong").isEqualTo(InstanceStatus.STARTING);
- }
-
- @Test
- void testPreferIpAddress() {
- TestPropertyValues.of("eureka.instance.preferIpAddress:true").applyTo(this.context);
- setupContext();
- EurekaInstanceConfigBean instance = getInstanceConfig();
- assertThat(getInstanceConfig().getHostname().equals(instance.getIpAddress()))
- .as("Wrong hostname: " + instance.getHostname()).isTrue();
-
- }
-
- @Test
- void testDefaultVirtualHostName() {
- TestPropertyValues.of("spring.application.name:myapp").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getVirtualHostName()).as("virtualHostName wrong").isEqualTo("myapp");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).as("secureVirtualHostName wrong").isEqualTo("myapp");
-
- }
-
- @Test
- void testCustomVirtualHostName() {
- TestPropertyValues.of("spring.application.name:myapp", "eureka.instance.virtualHostName=myvirthost",
- "eureka.instance.secureVirtualHostName=mysecurevirthost").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getVirtualHostName()).as("virtualHostName wrong").isEqualTo("myvirthost");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).as("secureVirtualHostName wrong")
- .isEqualTo("mysecurevirthost");
-
- }
-
- @Test
- void testDefaultAppName() {
- setupContext();
- assertThat(getInstanceConfig().getAppname()).as("default app name is wrong").isEqualTo("unknown");
- assertThat(getInstanceConfig().getVirtualHostName()).as("default virtual hostname is wrong")
- .isEqualTo("unknown");
- assertThat(getInstanceConfig().getSecureVirtualHostName()).as("default secure virtual hostname is wrong")
- .isEqualTo("unknown");
- }
-
- @Test
- void testCustomInstanceId() {
- TestPropertyValues.of("eureka.instance.instanceId=myinstance").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
- }
-
- @Test
- void testCustomInstanceIdWithMetadata() {
- TestPropertyValues.of("eureka.instance.metadataMap.instanceId=myinstance").applyTo(this.context);
- setupContext();
- assertThat(getInstanceConfig().getInstanceId()).as("instance id is wrong").isEqualTo("myinstance");
- }
-
- @Test
- void testDefaultInstanceId() {
- setupContext();
- assertThat(getInstanceConfig().getInstanceId()).as("default instance id is wrong").isEqualTo(null);
- }
-
- private void setupContext() {
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
- }
-
- private EurekaInstanceConfigBean getInstanceConfig() {
- return this.context.getBean(EurekaInstanceConfigBean.class);
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableConfigurationProperties
- protected static class TestConfiguration {
-
- @Autowired
- ConfigurableEnvironment env;
-
- @Bean
- public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
- EurekaInstanceConfigBean configBean = new EurekaInstanceConfigBean(
- new InetUtils(new InetUtilsProperties()));
- String springAppName = this.env.getProperty("spring.application.name", "");
- if (StringUtils.hasText(springAppName)) {
- configBean.setSecureVirtualHostName(springAppName);
- configBean.setVirtualHostName(springAppName);
- configBean.setAppname(springAppName);
- }
- return configBean;
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstanceTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstanceTests.java
deleted file mode 100644
index f497c4183..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstanceTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import com.netflix.appinfo.InstanceInfo;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class EurekaServiceInstanceTests {
-
- @Test
- void getSchemeReturnsNonNull() {
- InstanceInfo instanceInfo = InstanceInfo.Builder.newBuilder().setAppName("test").setHostName("myhost")
- .setPort(8080).build();
- EurekaServiceInstance instance = new EurekaServiceInstance(instanceInfo);
- Assertions.assertThat(instance.getScheme()).isEqualTo("http");
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java
deleted file mode 100644
index 1e58aac3a..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactoryTests.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka;
-
-import com.netflix.appinfo.InstanceInfo;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class InstanceInfoFactoryTests {
-
- private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-
- @Test
- void instanceIdIsHostNameByDefault() {
- InstanceInfo instanceInfo = setupInstance();
- try (InetUtils utils = new InetUtils(new InetUtilsProperties())) {
- assertThat(instanceInfo.getId()).isEqualTo(utils.findFirstNonLoopbackHostInfo().getHostname());
- }
- }
-
- @Test
- void instanceIdIsIpWhenIpPreferred() {
- InstanceInfo instanceInfo = setupInstance("eureka.instance.preferIpAddress:true");
- assertThat(instanceInfo.getId().matches("(\\d+\\.){3}\\d+")).isTrue();
- }
-
- @Test
- void instanceInfoIdIsInstanceIdWhenSet() {
- InstanceInfo instanceInfo = setupInstance("eureka.instance.instanceId:special");
- assertThat(instanceInfo.getId()).isEqualTo("special");
- }
-
- private InstanceInfo setupInstance(String... pairs) {
- TestPropertyValues.of(pairs).applyTo(this.context);
-
- this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class);
- this.context.refresh();
-
- EurekaInstanceConfigBean instanceConfig = getInstanceConfig();
- return new InstanceInfoFactory().create(instanceConfig);
- }
-
- private EurekaInstanceConfigBean getInstanceConfig() {
- return this.context.getBean(EurekaInstanceConfigBean.class);
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableConfigurationProperties
- protected static class TestConfiguration {
-
- @Bean
- public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
- return new EurekaInstanceConfigBean(new InetUtils(new InetUtilsProperties()));
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java
deleted file mode 100644
index 40e2ae6c0..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import com.netflix.discovery.EurekaClient;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
-import org.springframework.cloud.netflix.eureka.sample.RefreshEurekaSampleApplication;
-import org.springframework.context.ApplicationEventPublisher;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * @author Ryan Baxter
- */
-@SpringBootTest(webEnvironment = RANDOM_PORT, classes = RefreshEurekaSampleApplication.class)
-class ConfigRefreshTests {
-
- @Autowired
- private ApplicationEventPublisher publisher;
-
- @Autowired
- // Mocked in RefreshEurekaSampleApplication
- private EurekaClient client;
-
- @Test
- // This test is used to verify that getApplications is called the correct number of
- // times when a refresh event is fired. The getApplications call in
- // EurekaClientConfigurationRefresher.onApplicationEvent
- // ensures that the EurekaClient bean is recreated after a refresh event and that we
- // reregister the client with the server
- void verifyGetApplications() {
- if (publisher != null) {
- publisher.publishEvent(new RefreshScopeRefreshedEvent());
- }
- verify(client, times(3)).getApplications();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java
deleted file mode 100644
index b663c77fc..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaClientConfigServerAutoConfigurationTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
-import org.springframework.cloud.config.server.config.ConfigServerProperties;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- * @author Biju Kunjummen
- */
-class EurekaClientConfigServerAutoConfigurationTests {
-
- @Test
- void offByDefault() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class))
- .run(c -> assertThat(c.getBeanNamesForType(EurekaInstanceConfigBean.class).length).isEqualTo(0));
- }
-
- @Test
- void onWhenRequested() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
- UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
- .withPropertyValues("spring.cloud.config.server.prefix=/config").run(c -> {
- assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
- EurekaInstanceConfig instance = c.getBean(EurekaInstanceConfig.class);
- assertThat(instance.getMetadataMap().get("configPath")).isEqualTo("/config");
- });
- }
-
- @Test
- void notOverridingMetamapSettings() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaClientConfigServerAutoConfiguration.class,
- UtilAutoConfiguration.class, ConfigServerProperties.class, EurekaInstanceConfigBean.class))
- .withPropertyValues("spring.cloud.config.server.prefix=/config")
- .withPropertyValues("eureka.instance.metadataMap.configPath=/differentpath").run(c -> {
- assertThat(c.getBeanNamesForType(EurekaInstanceConfig.class).length).isEqualTo(1);
- EurekaInstanceConfig instance = c.getBean(EurekaInstanceConfig.class);
- assertThat(instance.getMetadataMap().get("configPath")).isEqualTo("/differentpath");
- });
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java
deleted file mode 100644
index 5799b9717..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.boot.test.system.OutputCaptureRule;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
-import org.springframework.cloud.test.ClassPathExclusions;
-import org.springframework.cloud.test.ModifiedClassPathRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Spencer Gibb
- */
-@RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions("spring-webflux-*")
-public class EurekaConfigServerBootstrapConfigurationTests {
-
- @Rule
- public OutputCaptureRule output = new OutputCaptureRule();
-
- @Test
- public void offByDefault() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void properBeansCreatedWhenDiscoveryEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true").run(this::assertEurekaBeansPresent);
- }
-
- @Test
- public void beansNotCreatedWhenDiscoveryNotEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=false")
- .run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenDiscoveryDisabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.disabled").run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenEurekaClientEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("eureka.client.enabled=true").run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenEurekaClientNotEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("eureka.client.enabled=false").run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenEurekaClientDisabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("eureka.client.disabled").run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void properBeansCreatedWhenDiscoveryEnabled_EurekaEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true")
- .run(this::assertEurekaBeansPresent);
- }
-
- @Test
- public void beansNotCreatedWhenDiscoveryEnabled_EurekaNotEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false")
- .run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenDiscoveryNotEnabled_EurekaEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=true")
- .run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void beansNotCreatedWhenDiscoveryNotEnabled_EurekaNotEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=false")
- .run(this::assertEurekaBeansNotPresent);
- }
-
- @Test
- public void eurekaDnsConfigurationWorks() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true",
- "eureka.instance.hostname=eurekaclient1",
- "eureka.client.use-dns-for-fetching-service-urls=true",
- "eureka.client.eureka-server-d-n-s-name=myeurekahost",
- "eureka.client.eureka-server-u-r-l-context=eureka", "eureka.client.eureka-server-port=30000")
- .run(context -> assertThat(output)
- .contains("Cannot get cnames bound to the region:txt.us-east-1.myeurekahost"));
- }
-
- @Test
- public void eurekaConfigServerInstanceProviderCalled() {
- // FIXME: why do I need to do this? (fails in maven build without it.
- TomcatURLStreamHandlerFactory.disable();
- new SpringApplicationBuilder(TestConfigDiscoveryConfiguration.class)
- .properties("spring.config.use-legacy-processing=true", "spring.cloud.config.discovery.enabled=true",
- "eureka.client.enabled=true",
- "spring.main.sources=" + TestConfigDiscoveryBootstrapConfiguration.class.getName(),
- "logging.level.org.springframework.cloud.netflix.eureka.config=DEBUG")
- .run();
- assertThat(output).contains("eurekaConfigServerInstanceProvider finding instances for configserver")
- .contains("eurekaConfigServerInstanceProvider found 1 instance(s) for configserver");
- }
-
- private void assertEurekaBeansPresent(AssertableApplicationContext context) {
- assertThat(context).hasSingleBean(EurekaClientConfigBean.class);
- assertThat(context).hasSingleBean(RestTemplateEurekaHttpClient.class);
- assertThat(context).hasSingleBean(ConfigServerInstanceProvider.Function.class);
- }
-
- private void assertEurekaBeansNotPresent(AssertableApplicationContext context) {
- assertThat(context).doesNotHaveBean(EurekaClientConfigBean.class);
- assertThat(context).doesNotHaveBean(EurekaHttpClient.class);
- assertThat(context).doesNotHaveBean(ConfigServerInstanceProvider.Function.class);
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- protected static class TestConfigDiscoveryConfiguration {
-
- @Bean
- public EurekaClient getClient() {
- return mock(CloudEurekaClient.class);
- }
-
- }
-
- @Configuration
- protected static class TestConfigDiscoveryBootstrapConfiguration {
-
- @SuppressWarnings("unchecked")
- @Bean
- public EurekaHttpClient mockEurekaHttpClient() {
- InstanceInfo instanceInfo = InstanceInfo.Builder.newBuilder().setAppName("configserver").build();
- List instanceInfos = Collections.singletonList(instanceInfo);
-
- Applications applications = mock(Applications.class);
- when(applications.getInstancesByVirtualHostName("configserver")).thenReturn(instanceInfos);
-
- EurekaHttpResponse response = mock(EurekaHttpResponse.class);
- when(response.getStatusCode()).thenReturn(200);
- when(response.getEntity()).thenReturn(applications);
-
- EurekaHttpClient client = mock(EurekaHttpClient.class);
- when(client.getApplications("us-east-1")).thenReturn(response);
- return client;
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java
deleted file mode 100644
index 717b55868..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * @author Spencer Gibb
- */
-@SpringBootTest(properties = { "spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true",
- "spring.config.use-legacy-processing=true", "eureka.client.webclient.enabled=true",
- "spring.codec.max-in-memory-size=310000" }, webEnvironment = RANDOM_PORT)
-class EurekaConfigServerBootstrapConfigurationWebClientIntegrationTests {
-
- @LocalServerPort
- private int port;
-
- @Autowired
- private WebClientEurekaHttpClient eurekaHttpClient;
-
- @Test
- void webClientRespectsCodecProperties() {
- WebClient webClient = eurekaHttpClient.getWebClient();
- ClientResponse response = webClient.get().uri("http://localhost:" + port).exchange().block();
- assertThat(response).isNotNull();
- assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
- assertThat(response.bodyToMono(String.class).block()).startsWith("....").hasSize(300000);
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- @RestController
- static class WebClientController {
-
- @GetMapping("/")
- public String hello() {
- return ".".repeat(300000);
- }
-
- @Bean
- public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
- http.authorizeHttpRequests().anyRequest().permitAll().and().csrf().disable();
- return http.build();
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientTests.java
deleted file mode 100644
index 735853d28..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationWebClientTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
-import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Spencer Gibb
- */
-class EurekaConfigServerBootstrapConfigurationWebClientTests {
-
- @Test
- void properBeansCreatedWhenEnabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true",
- "eureka.client.webclient.enabled=true")
- .run(context -> {
- assertThat(context).hasSingleBean(EurekaClientConfigBean.class);
- assertThat(context).hasSingleBean(WebClientEurekaHttpClient.class);
- assertThat(context).hasSingleBean(ConfigServerInstanceProvider.Function.class);
- });
- }
-
- @Test
- void properBeansCreatedWhenEnabledWebClientDisabled() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
- .withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true")
- .run(context -> {
- assertThat(context).hasSingleBean(EurekaClientConfigBean.class);
- assertThat(context).doesNotHaveBean(WebClientEurekaHttpClient.class);
- assertThat(context).hasSingleBean(RestTemplateEurekaHttpClient.class);
- assertThat(context).hasSingleBean(ConfigServerInstanceProvider.Function.class);
- });
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperIT.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperIT.java
deleted file mode 100644
index 10d494030..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperIT.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2013-2023 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.netflix.eureka.config;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.converters.jackson.serializer.InstanceInfoJsonBeanSerializer;
-import com.netflix.discovery.shared.Application;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockserver.client.MockServerClient;
-import org.testcontainers.containers.MockServerContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.config.environment.Environment;
-import org.springframework.cloud.config.environment.PropertySource;
-import org.springframework.cloud.netflix.eureka.http.EurekaApplications;
-import org.springframework.context.ConfigurableApplicationContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-
-/**
- * @author Ryan Baxter
- */
-@Testcontainers
-public class EurekaConfigServerBootstrapperIT {
-
- public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse("mockserver/mockserver")
- .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
-
- @Container
- static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
-
- private ConfigurableApplicationContext context;
-
- @BeforeEach
- void before() {
-
- }
-
- @AfterEach
- void after() {
- this.context.close();
- }
-
- @Test
- public void contextLoads() throws JsonProcessingException {
- Environment environment = new Environment("test", "default");
- Map properties = new HashMap<>();
- properties.put("hello", "world");
- PropertySource p = new PropertySource("p1", properties);
- environment.add(p);
- ObjectMapper objectMapper = new ObjectMapper();
- SimpleModule jsonModule = new SimpleModule();
- jsonModule.setSerializerModifier(createJsonSerializerModifier());
- objectMapper.registerModule(jsonModule);
- try (MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(),
- mockServer.getMappedPort(MockServerContainer.PORT))) {
- mockServerClient.when(request().withPath("/application/default"))
- .respond(response().withBody(objectMapper.writeValueAsString(environment))
- .withHeader("content-type", "application/json"));
- InstanceInfo configServerInstanceInfo = InstanceInfo.Builder.newBuilder()
- .setVIPAddress("eureka-configserver").setInstanceId("eureka-configserver")
- .setAppName("eureka-configserver").setStatus(InstanceInfo.InstanceStatus.UP)
- .enablePort(InstanceInfo.PortType.UNSECURE, true).setHostName("localhost")
- .setPort(mockServer.getMappedPort(MockServerContainer.PORT)).build();
- Application configServer = new Application("eureka-configserver",
- Collections.singletonList(configServerInstanceInfo));
- EurekaApplications eurekaApplications = new EurekaApplications("hashcode", 0L,
- Collections.singletonList(configServer));
- mockServerClient.when(request().withPath("/apps/"))
- .respond(response()
- .withBody("{\"applications\":" + objectMapper.writeValueAsString(eurekaApplications) + "}")
- .withHeader("content-type", "application/json"));
- this.context = setup().run();
- assertThat(this.context.getEnvironment().getProperty("hello")).isEqualTo("world");
- }
-
- }
-
- public static BeanSerializerModifier createJsonSerializerModifier() {
- return new BeanSerializerModifier() {
- @Override
- public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription beanDesc,
- JsonSerializer serializer) {
- if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
- return new InstanceInfoJsonBeanSerializer((BeanSerializerBase) serializer, false);
- }
- return serializer;
- }
- };
- }
-
- SpringApplicationBuilder setup(String... env) {
- SpringApplicationBuilder builder = new SpringApplicationBuilder(TestConfig.class)
- .properties(addDefaultEnv(env));
- return builder;
- }
-
- private String[] addDefaultEnv(String[] env) {
- Set set = new LinkedHashSet<>();
- if (env != null && env.length > 0) {
- set.addAll(Arrays.asList(env));
- }
- set.add("spring.config.import=classpath:bootstrapper.yaml");
- set.add("spring.cloud.config.enabled=true");
- set.add("spring.cloud.service-registry.auto-registration.enabled=false");
- set.add("eureka.client.serviceUrl.defaultZone=http://" + mockServer.getHost() + ":"
- + mockServer.getMappedPort(MockServerContainer.PORT));
- return set.toArray(new String[0]);
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- static class TestConfig {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java
deleted file mode 100644
index 9f173aa51..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.config;
-
-import org.apache.commons.logging.Log;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.properties.bind.BindHandler;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.cloud.config.client.ConfigClientProperties;
-import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.web.client.ResourceAccessException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-
-class EurekaConfigServerBootstrapperTests {
-
- @Test
- void notEnabledReturnsEmptyList() {
- new SpringApplicationBuilder(TestConfig.class)
- .properties("spring.cloud.service-registry.auto-registration.enabled=false")
- .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
- ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
- .get(ConfigServerInstanceProvider.Function.class);
- assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty();
- })).run().close();
- }
-
- @Test
- public void discoveryClientNotEnabledProvidesEmptyList() {
- new SpringApplicationBuilder(TestConfig.class)
- .properties("spring.cloud.config.discovery.enabled=true", "spring.cloud.discovery.enabled=false",
- "spring.cloud.service-registry.auto-registration.enabled=false")
- .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
- ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
- .get(ConfigServerInstanceProvider.Function.class);
- Binder binder = event.getBootstrapContext().get(Binder.class);
- BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
- assertThat(providerFn.apply("id", binder, bindHandler, mock(Log.class)))
- .as("Should return empty list").isEmpty();
- })).run().close();
- }
-
- @Test
- public void eurekaClientNotEnabledProvidesEmptyList() {
- new SpringApplicationBuilder(TestConfig.class)
- .properties("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false",
- "spring.cloud.service-registry.auto-registration.enabled=false")
- .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
- ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
- .get(ConfigServerInstanceProvider.Function.class);
- Binder binder = event.getBootstrapContext().get(Binder.class);
- BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
- assertThat(providerFn.apply("id", binder, bindHandler, mock(Log.class)))
- .as("Should return empty list").isEmpty();
- })).run().close();
- }
-
- @Test
- void enabledAddsInstanceProviderFn() {
- new SpringApplicationBuilder(TestConfig.class)
- .properties("spring.config.import: classpath:bootstrapper.yaml",
- ConfigClientProperties.PREFIX + ".enabled=true")
- .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> {
- ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext()
- .get(ConfigServerInstanceProvider.Function.class);
- Binder binder = event.getBootstrapContext().get(Binder.class);
- BindHandler bindHandler = event.getBootstrapContext().get(BindHandler.class);
- assertThatThrownBy(() -> providerFn.apply("id", binder, bindHandler, mock(Log.class)))
- .isInstanceOf(ResourceAccessException.class)
- .hasMessageContaining("I/O error on GET request for \"http://localhost:8761/eureka/apps/\"")
- .as("Should have tried to connect to Eureka to fetch instances.");
- })).run().close();
- }
-
- @SpringBootConfiguration
- @EnableAutoConfiguration
- static class TestConfig {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest.java
deleted file mode 100644
index 9e40ca5d6..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.config;
-
-import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
-import org.springframework.cloud.test.ClassPathExclusions;
-import org.springframework.cloud.test.ModifiedClassPathRunner;
-import org.springframework.context.ConfigurableApplicationContext;
-
-import static org.assertj.core.api.AssertionsForClassTypes.fail;
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-/**
- * @author Daniel Lavoie
- */
-@RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*", "spring-webflux-*" })
-@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-public class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {
-
- @Test
- public void contextFailsWithoutWebClient() {
-
- ConfigurableApplicationContext ctx = null;
- try {
- TomcatURLStreamHandlerFactory.disable();
- ctx = new SpringApplicationBuilder(EurekaSampleApplication.class)
- .properties("eureka.client.webclient.enabled=true").run();
- fail("exception not thrown");
- }
- catch (Exception e) {
- // this is the desired state
- assertThat(e).hasStackTraceContaining("WebClient is not on the classpath");
- }
- if (ctx != null) {
- ctx.close();
- }
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
deleted file mode 100644
index fd4cac894..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.config;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
-import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
-import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
-import org.springframework.cloud.test.ClassPathExclusions;
-import org.springframework.cloud.test.ModifiedClassPathRunner;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-/**
- * @author Daniel Lavoie
- */
-@RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*" })
-@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-public class EurekaHttpClientsOptionalArgsConfigurationTest {
-
- @Test
- public void contextLoadsWithRestTemplate() {
- new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class)
- .withPropertyValues("eureka.client.webclient.enabled=false").run(context -> {
- assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class);
- assertThat(context).doesNotHaveBean(WebClientDiscoveryClientOptionalArgs.class);
- });
- }
-
- @Test
- public void contextLoadsWithWebClient() {
- new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class)
- .withPropertyValues("eureka.client.webclient.enabled=true").run(context -> {
- assertThat(context).doesNotHaveBean(RestTemplateDiscoveryClientOptionalArgs.class);
- assertThat(context).hasSingleBean(WebClientDiscoveryClientOptionalArgs.class);
- });
- }
-
- @Test
- public void contextLoadsWithRestTemplateAsDefault() {
- new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class).run(context -> {
- assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class);
- assertThat(context).doesNotHaveBean(WebClientDiscoveryClientOptionalArgs.class);
- });
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java
deleted file mode 100644
index 177502c49..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.config;
-
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
-import org.springframework.test.annotation.DirtiesContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Daniel Lavoie
- */
-@DirtiesContext
-@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-class JerseyOptionalArgsConfigurationTest {
-
- @Autowired
- private AbstractDiscoveryClientOptionalArgs optionalArgs;
-
- @Test
- void contextLoads() {
- assertThat(optionalArgs).isNotNull();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java
deleted file mode 100644
index 34e81a556..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.healthcheck;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests the Eureka health check handler.
- *
- * @author Jakub Narloch
- * @author Olga Maciaszek-Sharma
- */
-@SpringBootTest(classes = EurekaHealthCheckTests.EurekaHealthCheckApplication.class,
- webEnvironment = WebEnvironment.RANDOM_PORT, value = { "eureka.client.healthcheck.enabled=true", "debug=true" })
-@DirtiesContext
-class EurekaHealthCheckTests {
-
- @Autowired
- private EurekaClient discoveryClient;
-
- @Test
- void shouldRegisterService() {
- System.setProperty("status", "UP");
-
- InstanceInfo.InstanceStatus status = this.discoveryClient.getHealthCheckHandler()
- .getStatus(InstanceInfo.InstanceStatus.UNKNOWN);
-
- assertThat(status).isNotNull();
- assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.UP);
- }
-
- @Test
- void shouldMapOutOfServiceToDown() {
- System.setProperty("status", "OUT_OF_SERVICE");
-
- InstanceInfo.InstanceStatus status = this.discoveryClient.getHealthCheckHandler()
- .getStatus(InstanceInfo.InstanceStatus.UNKNOWN);
-
- assertThat(status).isNotNull();
- assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.DOWN);
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- protected static class EurekaHealthCheckApplication {
-
- @Bean
- public HealthIndicator healthIndicator() {
- return () -> new Health.Builder().status(System.getProperty("status")).build();
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java
deleted file mode 100644
index 104331c15..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/AbstractEurekaHttpClientTests.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2012-2022 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.netflix.eureka.http;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.shared.Applications;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.http.HttpStatus;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Haytham Mohamed
- **/
-abstract class AbstractEurekaHttpClientTests {
-
- protected EurekaHttpClient eurekaHttpClient;
-
- protected InstanceInfo info;
-
- abstract void setup();
-
- @Test
- void testRegister() {
- assertThat(eurekaHttpClient.register(info).getStatusCode()).isEqualTo(HttpStatus.OK.value());
- }
-
- @Test
- void testCancel() {
- assertThat(eurekaHttpClient.cancel("test", "test").getStatusCode()).isEqualTo(HttpStatus.OK.value());
- }
-
- @Test
- void testSendHeartBeat() {
- EurekaHttpResponse response = eurekaHttpClient.sendHeartBeat("test", "test", info, null);
- assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK.value());
- assertThat(response.getEntity()).isNotNull();
- }
-
- @Test
- void testSendHeartBeatFourOFour() {
- assertThat(eurekaHttpClient.sendHeartBeat("fourOFour", "test", info, null).getStatusCode())
- .isEqualTo(HttpStatus.NOT_FOUND.value());
- }
-
- @Test
- void testSendHeartBeatFourOFourWithBody() {
- assertThat(eurekaHttpClient.sendHeartBeat("fourOFourWithBody", "test", info, null).getStatusCode())
- .isEqualTo(HttpStatus.NOT_FOUND.value());
- }
-
- @Test
- void testStatusUpdate() {
- assertThat(eurekaHttpClient.statusUpdate("test", "test", InstanceInfo.InstanceStatus.UP, info).getStatusCode())
- .isEqualTo(HttpStatus.OK.value());
- }
-
- @Test
- void testDeleteStatusOverride() {
- assertThat(eurekaHttpClient.deleteStatusOverride("test", "test", info).getStatusCode())
- .isEqualTo(HttpStatus.OK.value());
- }
-
- @Test
- void testGetApplications() {
- Applications entity = eurekaHttpClient.getApplications().getEntity();
- assertThat(entity).isNotNull();
- assertThat(eurekaHttpClient.getApplications("us", "eu").getEntity()).isNotNull();
- }
-
- @Test
- void testGetDelta() {
- eurekaHttpClient.getDelta().getEntity();
- eurekaHttpClient.getDelta("us", "eu").getEntity();
- }
-
- @Test
- void testGetVips() {
- eurekaHttpClient.getVip("test");
- eurekaHttpClient.getVip("test", "us", "eu");
- }
-
- @Test
- void testGetSecureVip() {
- eurekaHttpClient.getSecureVip("test");
- eurekaHttpClient.getSecureVip("test", "us", "eu");
- }
-
- @Test
- void testGetApplication() {
- eurekaHttpClient.getApplication("test");
- }
-
- @Test
- void testGetInstance() {
- eurekaHttpClient.getInstance("test");
- eurekaHttpClient.getInstance("test", "test");
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
deleted file mode 100644
index 5534f6278..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.Collections;
-import java.util.HashMap;
-
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.LeaseInfo;
-import com.netflix.appinfo.MyDataCenterInfo;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-import static com.netflix.appinfo.InstanceInfo.DEFAULT_PORT;
-import static com.netflix.appinfo.InstanceInfo.DEFAULT_SECURE_PORT;
-import static org.springframework.util.Assert.isTrue;
-
-/**
- * Mocked Eureka Server.
- *
- * @author Daniel Lavoie
- */
-@Configuration(proxyBeanMethods = false)
-@RestController
-@RequestMapping("/eureka")
-@SpringBootApplication
-public class EurekaServerMockApplication {
-
- private static final InstanceInfo INFO = InstanceInfo.Builder.newBuilder().setInstanceId("app1instance1")
- .setAppName("app1").setAppNameForDeser("app1fordeser").setAppGroupName("app1group")
- .setAppGroupNameForDeser("app1group1fordeser").setHostName("app1host1")
- .setStatus(InstanceInfo.InstanceStatus.UP).setOverriddenStatus(InstanceInfo.InstanceStatus.DOWN)
- .setIPAddr("127.0.0.1").setSID("app1sid").setPort(8080).setSecurePort(4443)
- .enablePort(InstanceInfo.PortType.UNSECURE, true).setHomePageUrl("/", "http://localhost/")
- .setHomePageUrlForDeser("http://localhost/").setStatusPageUrl("/status", "http://localhost/info")
- .setStatusPageUrlForDeser("http://localhost/status")
- .setHealthCheckUrls("/ping", "http://localhost/ping", null)
- .setHealthCheckUrlsForDeser("http://localhost/ping", null).setVIPAddress("localhost:8080")
- .setVIPAddressDeser("localhost:8080").setSecureVIPAddress("localhost:4443")
- .setSecureVIPAddressDeser("localhost:4443")
- .setDataCenterInfo(new MyDataCenterInfo(DataCenterInfo.Name.MyOwn))
- .setLeaseInfo(LeaseInfo.Builder.newBuilder().setDurationInSecs(30).setRenewalIntervalInSecs(30)
- .setEvictionTimestamp(System.currentTimeMillis() + 30000)
- .setRenewalTimestamp(System.currentTimeMillis() - 1000)
- .setRegistrationTimestamp(System.currentTimeMillis() - 2000).build())
- .add("metadatakey1", "metadatavalue1").setASGName("asg1").setIsCoordinatingDiscoveryServer(false)
- .setLastUpdatedTimestamp(System.currentTimeMillis()).setLastDirtyTimestamp(System.currentTimeMillis())
- .setActionType(InstanceInfo.ActionType.ADDED).setNamespace("namespace1").build();
-
- /**
- * Simulates Eureka Server own's serialization.
- * @return converter
- */
- @Bean
- public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
- return new RestTemplateTransportClientFactory().mappingJacksonHttpMessageConverter();
- }
-
- @ResponseStatus(HttpStatus.OK)
- @PostMapping("/apps/{appName}")
- public void register(@PathVariable String appName, @RequestBody InstanceInfo instanceInfo) {
- isTrue(instanceInfo.getPort() != DEFAULT_PORT && instanceInfo.getPort() != 0, "Port not received from client");
- isTrue(instanceInfo.getSecurePort() != DEFAULT_SECURE_PORT && instanceInfo.getSecurePort() != 0,
- "Secure Port not received from client");
- // Nothing to do
- }
-
- @ResponseStatus(HttpStatus.OK)
- @DeleteMapping("/apps/{appName}/{id}")
- public void cancel(@PathVariable String appName, @PathVariable String id) {
-
- }
-
- @ResponseStatus(HttpStatus.OK)
- @PutMapping(value = "/apps/{appName}/{id}", params = { "status", "lastDirtyTimestamp" })
- public ResponseEntity sendHeartBeat(@PathVariable String appName, @PathVariable String id,
- @RequestParam String status, @RequestParam String lastDirtyTimestamp,
- @RequestParam(required = false) String overriddenstatus) {
- if ("fourOFour".equals(appName)) {
- return new ResponseEntity(HttpStatus.NOT_FOUND);
- }
- if ("fourOFourWithBody".equals(appName)) {
- return new ResponseEntity(
- "{ \"error\": \"Not Found\", \"message\": null, \"path\": \"/1\", \"requestId\": \"9e5d3244-1\", \"status\": 404, \"timestamp\": \"2023-03-04T03:31:20.810+00:00\" }",
- HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(new InstanceInfo(null, null, null, null, null, null, null, null, null, null, null,
- null, null, 0, null, null, null, null, null, null, null, new HashMap<>(), 0L, 0L, null, null),
- HttpStatus.OK);
- }
-
- @ResponseStatus(HttpStatus.OK)
- @PutMapping(value = "/apps/{appName}/{id}/status", params = { "value", "lastDirtyTimestamp" })
- public void statusUpdate(@PathVariable String appName, @PathVariable String id, @RequestParam String value,
- @RequestParam String lastDirtyTimestamp) {
-
- }
-
- @ResponseStatus(HttpStatus.OK)
- @DeleteMapping(value = "/apps/{appName}/{id}/status", params = "lastDirtyTimestamp")
- public void deleteStatusOverride(@PathVariable String appName, @PathVariable String id,
- @RequestParam String lastDirtyTimestamp) {
-
- }
-
- @GetMapping({ "/apps/", "/apps/delta", "/vips/{address}", "/svips/{address}" })
- public Applications getApplications(@PathVariable(required = false) String address,
- @RequestParam(required = false) String regions) {
- Applications applications = new Applications();
- applications.addApplication(new Application("app1", Collections.singletonList(INFO)));
- return applications;
- }
-
- @GetMapping("/apps/{appName}")
- public Application getApplication(@PathVariable String appName) {
- return new Application();
- }
-
- @GetMapping({ "/apps/{appName}/{id}", "/instances/{id}" })
- public InstanceInfo getInstance(@PathVariable(required = false) String appName, @PathVariable String id) {
- return INFO;
- }
-
- @Configuration(proxyBeanMethods = false)
- @Order(Ordered.HIGHEST_PRECEDENCE)
- protected static class TestSecurityConfiguration {
-
- @Bean
- public InMemoryUserDetailsManager userDetailsService() {
- UserDetails user = User.withDefaultPasswordEncoder().username("test").password("test").roles("USER")
- .build();
- return new InMemoryUserDetailsManager(user);
- }
-
- @Bean
- public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
- // @formatter:off
- http
- .securityMatcher("/v2/apps/**")
- .httpBasic();
- // @formatter:on
- return http.build();
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java
deleted file mode 100644
index 8c6f32b82..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import java.util.List;
-
-import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider;
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.client.RestTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Daniel Lavoie
- */
-@SpringBootTest(classes = EurekaServerMockApplication.class,
- properties = { "debug=true", "security.basic.enabled=true", "eureka.client.fetch-registry=false",
- "eureka.client.register-with-eureka=false", "logging.level.org.springframework=INFO" },
- webEnvironment = WebEnvironment.RANDOM_PORT)
-@DirtiesContext
-class RestTemplateEurekaHttpClientTests extends AbstractEurekaHttpClientTests {
-
- @Autowired
- private InetUtils inetUtils;
-
- @Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka")
- private String serviceUrl;
-
- @BeforeEach
- void setup() {
- eurekaHttpClient = new RestTemplateTransportClientFactory().newClient(new DefaultEndpoint(serviceUrl));
-
- EurekaInstanceConfigBean config = new EurekaInstanceConfigBean(inetUtils);
-
- String appname = "customapp";
- config.setIpAddress("127.0.0.1");
- config.setHostname("localhost");
- config.setAppname(appname);
- config.setVirtualHostName(appname);
- config.setSecureVirtualHostName(appname);
- config.setNonSecurePort(4444);
- config.setSecurePort(8443);
- config.setInstanceId("127.0.0.1:customapp:4444");
-
- info = new EurekaConfigBasedInstanceInfoProvider(config).get();
- }
-
- @Test
- void basicAuth() {
- assertThat(eurekaHttpClient).isInstanceOf(RestTemplateEurekaHttpClient.class);
- RestTemplateEurekaHttpClient restTemplateEurekaHttpClient = (RestTemplateEurekaHttpClient) eurekaHttpClient;
- RestTemplate restTemplate = restTemplateEurekaHttpClient.getRestTemplate();
- List interceptors = restTemplate.getInterceptors();
- boolean hasBasicAuth = interceptors.stream()
- .anyMatch(interceptor -> interceptor instanceof BasicAuthenticationInterceptor);
- assertThat(hasBasicAuth).as("Basic Auth not configured").isTrue();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactoryTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactoryTest.java
deleted file mode 100644
index 33d1b7af0..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateTransportClientFactoryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * @author Daniel Lavoie
- */
-class RestTemplateTransportClientFactoryTest {
-
- private RestTemplateTransportClientFactory transportClientFatory;
-
- @BeforeEach
- void setup() {
- transportClientFatory = new RestTemplateTransportClientFactory();
- }
-
- @Test
- void testWithoutUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://localhost:8761"));
- }
-
- @Test
- void testInvalidUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://test@localhost:8761"));
- }
-
- @Test
- void testUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://test:test@localhost:8761"));
- }
-
- @AfterEach
- void shutdown() {
- transportClientFatory.shutdown();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java
deleted file mode 100644
index 3dd7030cf..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClientTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider;
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
-import org.junit.jupiter.api.BeforeEach;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Daniel Lavoie
- */
-@SpringBootTest(classes = EurekaServerMockApplication.class,
- properties = { "debug=true", "security.basic.enabled=true", "eureka.client.webclient.enabled=true",
- "eureka.client.fetch-registry=false", "eureka.client.register-with-eureka=false" },
- webEnvironment = WebEnvironment.RANDOM_PORT)
-@DirtiesContext
-class WebClientEurekaHttpClientTests extends AbstractEurekaHttpClientTests {
-
- @Autowired
- private InetUtils inetUtils;
-
- @Value("http://${security.user.name}:${security.user.password}@localhost:${local.server.port}/eureka/")
- private String serviceUrl;
-
- @BeforeEach
- void setup() {
- eurekaHttpClient = new WebClientTransportClientFactory(WebClient::builder)
- .newClient(new DefaultEndpoint(serviceUrl));
-
- EurekaInstanceConfigBean config = new EurekaInstanceConfigBean(inetUtils);
-
- String appname = "customapp";
- config.setIpAddress("127.0.0.1");
- config.setHostname("localhost");
- config.setAppname(appname);
- config.setVirtualHostName(appname);
- config.setSecureVirtualHostName(appname);
- config.setNonSecurePort(4444);
- config.setSecurePort(8443);
- config.setInstanceId("127.0.0.1:customapp:4444");
-
- info = new EurekaConfigBasedInstanceInfoProvider(config).get();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactoryTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactoryTest.java
deleted file mode 100644
index b7d2d17ba..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/WebClientTransportClientFactoryTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.http;
-
-import com.netflix.discovery.shared.resolver.DefaultEndpoint;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * @author Daniel Lavoie
- */
-class WebClientTransportClientFactoryTest {
-
- private WebClientTransportClientFactory transportClientFatory;
-
- @BeforeEach
- void setup() {
- transportClientFatory = new WebClientTransportClientFactory(WebClient::builder);
- }
-
- @Test
- void testWithoutUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://localhost:8761"));
- }
-
- @Test
- void testInvalidUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://test@localhost:8761"));
- }
-
- @Test
- void testUserInfo() {
- transportClientFatory.newClient(new DefaultEndpoint("http://test:test@localhost:8761"));
- }
-
- @AfterEach
- void shutdown() {
- transportClientFatory.shutdown();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfigurationTests.java
deleted file mode 100644
index 1b6bf181a..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfigurationTests.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2015-2022 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.netflix.eureka.loadbalancer;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link EurekaLoadBalancerClientConfiguration}.
- *
- * @author Olga Maciaszek-Sharma
- */
-class EurekaLoadBalancerClientConfigurationTests {
-
- private final EurekaClientConfigBean eurekaClientConfig = new EurekaClientConfigBean();
-
- private final EurekaInstanceConfigBean eurekaInstanceConfig = new EurekaInstanceConfigBean(
- new InetUtils(new InetUtilsProperties()));
-
- private final LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);
-
- private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties = new EurekaLoadBalancerProperties();
-
- private final EurekaLoadBalancerClientConfiguration postprocessor = new EurekaLoadBalancerClientConfiguration(
- eurekaClientConfig, eurekaInstanceConfig, zoneConfig, eurekaLoadBalancerProperties);
-
- @Test
- void shouldSetZoneFromInstanceMetadata() {
- eurekaInstanceConfig.getMetadataMap().put("zone", "myZone");
-
- postprocessor.postprocess();
-
- assertThat(zoneConfig.getZone()).isEqualTo("myZone");
- }
-
- @Test
- void shouldSetZoneToDefaultWhenNotSetInMetadata() {
- postprocessor.postprocess();
-
- assertThat(zoneConfig.getZone()).isEqualTo("defaultZone");
- }
-
- @Test
- void shouldResolveApproximateZoneFromHost() {
- eurekaInstanceConfig.setHostname("this.is.a.test.com");
- eurekaLoadBalancerProperties.setApproximateZoneFromHostname(true);
-
- postprocessor.postprocess();
-
- assertThat(zoneConfig.getZone()).isEqualTo("is.a.test.com");
- }
-
- @Test
- void disabledViaProperty() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(LoadBalancerEurekaAutoConfiguration.class))
- .withPropertyValues("eureka.client.enabled=false").run(context -> {
- assertThat(context).doesNotHaveBean(EurekaLoadBalancerProperties.class);
- assertThat(context).doesNotHaveBean(LoadBalancerZoneConfig.class);
- });
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java
deleted file mode 100644
index c002b695f..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/metadata/DefaultManagementMetadataProviderTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.metadata;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class DefaultManagementMetadataProviderTest {
-
- private static final EurekaInstanceConfigBean INSTANCE = mock(EurekaInstanceConfigBean.class);
-
- private final ManagementMetadataProvider provider = new DefaultManagementMetadataProvider();
-
- @BeforeEach
- void setUp() {
- when(INSTANCE.getHostname()).thenReturn("host");
- when(INSTANCE.getHealthCheckUrlPath()).thenReturn("health");
- when(INSTANCE.getStatusPageUrlPath()).thenReturn("info");
- when(INSTANCE.isSecurePortEnabled()).thenReturn(false);
- }
-
- @Test
- void serverPortIsRandomAndManagementPortIsNull() {
- int serverPort = 0;
- String serverContextPath = "/";
- String managementContextPath = null;
- Integer managementPort = null;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual).isNull();
- }
-
- @Test
- void managementPortIsRandom() {
- int serverPort = 0;
- String serverContextPath = "/";
- String managementContextPath = null;
- Integer managementPort = 0;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual).isNull();
- }
-
- @Test
- void serverPort() {
- int serverPort = 7777;
- String serverContextPath = "/";
- String managementContextPath = null;
- Integer managementPort = null;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/info");
- assertThat(actual.getManagementPort()).isEqualTo(7777);
- }
-
- @Test
- void serverPortManagementPort() {
- int serverPort = 7777;
- String serverContextPath = "/";
- String managementContextPath = null;
- Integer managementPort = 8888;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info");
- assertThat(actual.getManagementPort()).isEqualTo(8888);
- }
-
- @Test
- void serverPortManagementPortServerContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/Server";
- String managementContextPath = null;
- Integer managementPort = 8888;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/info");
- assertThat(actual.getManagementPort()).isEqualTo(8888);
- }
-
- @Test
- void serverPortManagementPortServerContextPathManagementContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/Server";
- String managementContextPath = "/Management";
- Integer managementPort = 8888;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/Management/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/Management/info");
- assertThat(actual.getManagementPort()).isEqualTo(8888);
- }
-
- @Test
- void serverPortServerContextPathManagementContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/Server";
- String managementContextPath = "/Management";
- Integer managementPort = null;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/Server/Management/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/Server/Management/info");
- assertThat(actual.getManagementPort()).isEqualTo(7777);
- }
-
- @Test
- void serverPortManagementContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/";
- String managementContextPath = "/Management";
- Integer managementPort = null;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/Management/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/Management/info");
- assertThat(actual.getManagementPort()).isEqualTo(7777);
- }
-
- @Test
- void serverPortServerContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/Server";
- String managementContextPath = null;
- Integer managementPort = null;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:7777/Server/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:7777/Server/info");
- assertThat(actual.getManagementPort()).isEqualTo(7777);
- }
-
- @Test
- void serverPortManagementPortManagementContextPath() {
- int serverPort = 7777;
- String serverContextPath = "/";
- String managementContextPath = "/Management";
- Integer managementPort = 8888;
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/Management/health");
- assertThat(actual.getSecureHealthCheckUrl()).isNullOrEmpty();
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/Management/info");
- assertThat(actual.getManagementPort()).isEqualTo(8888);
-
- }
-
- @Test
- void setSecureHealthCheckUrl() {
- int serverPort = 7777;
- String serverContextPath = "/";
- String managementContextPath = "/Management";
- Integer managementPort = 8888;
- doReturn(true).when(INSTANCE).isSecurePortEnabled();
- ManagementMetadata actual = provider.get(INSTANCE, serverPort, serverContextPath, managementContextPath,
- managementPort);
-
- assertThat(actual.getHealthCheckUrl()).isEqualTo("http://host:8888/Management/health");
- assertThat(actual.getSecureHealthCheckUrl()).isEqualTo("https://host:8888/Management/health");
- assertThat(actual.getStatusPageUrl()).isEqualTo("http://host:8888/Management/info");
- assertThat(actual.getManagementPort()).isEqualTo(8888);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfigurationTests.java
deleted file mode 100644
index 2a80deab8..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientConfigurationTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2019-2022 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.netflix.eureka.reactive;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.FilteredClassLoader;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
-import org.springframework.cloud.commons.util.UtilAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Tim Ysewyn
- */
-class EurekaReactiveDiscoveryClientConfigurationTests {
-
- private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
- ReactiveCommonsClientAutoConfiguration.class, EurekaClientAutoConfiguration.class,
- DiscoveryClientOptionalArgsConfiguration.class, EurekaReactiveDiscoveryClientConfiguration.class));
-
- @Test
- void shouldWorkWithDefaults() {
- contextRunner.run(context -> {
- assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class);
- assertThat(context).hasSingleBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
- @Test
- void shouldNotHaveDiscoveryClientWhenDiscoveryDisabled() {
- contextRunner.withPropertyValues("spring.cloud.discovery.enabled=false").run(context -> {
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
- @Test
- void shouldNotHaveDiscoveryClientWhenReactiveDiscoveryDisabled() {
- contextRunner.withPropertyValues("spring.cloud.discovery.reactive.enabled=false").run(context -> {
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
- @Test
- void shouldNotHaveDiscoveryClientWhenEurekaClientDisabled() {
- contextRunner.withPropertyValues("eureka.client.enabled=false").run(context -> {
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
- @Test
- void worksWithoutWebflux() {
- contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.web.reactive")).run(context -> {
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
- @Test
- void worksWithoutActuator() {
- contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")).run(context -> {
- assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class);
- assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
- });
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientTests.java
deleted file mode 100644
index 3fe553b87..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/reactive/EurekaReactiveDiscoveryClientTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2019-2022 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.netflix.eureka.reactive;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import reactor.core.publisher.Flux;
-import reactor.test.StepVerifier;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Tim Ysewyn
- */
-@ExtendWith(MockitoExtension.class)
-class EurekaReactiveDiscoveryClientTests {
-
- @Mock
- private EurekaClient eurekaClient;
-
- @InjectMocks
- private EurekaReactiveDiscoveryClient client;
-
- @Test
- void verifyDefaults() {
- assertThat(client.description()).isEqualTo("Spring Cloud Eureka Reactive Discovery Client");
- assertThat(client.getOrder()).isEqualTo(ReactiveDiscoveryClient.DEFAULT_ORDER);
- }
-
- @Test
- void verifyDefaultsWhenUsingEurekaClientConfigBean() {
- EurekaClientConfigBean configBean = new EurekaClientConfigBean();
- configBean.setOrder(1);
- EurekaReactiveDiscoveryClient client = new EurekaReactiveDiscoveryClient(eurekaClient, configBean);
- assertThat(client.description()).isEqualTo("Spring Cloud Eureka Reactive Discovery Client");
- assertThat(client.getOrder()).isEqualTo(1);
- }
-
- @Test
- void shouldReturnEmptyFluxOfServices() {
- when(eurekaClient.getApplications()).thenReturn(new Applications());
- Flux services = this.client.getServices();
- StepVerifier.create(services).expectNextCount(0).expectComplete().verify();
- }
-
- @Test
- void shouldReturnEmptyFluxOfServicesWhenNoInstancesFound() {
- Applications applications = new Applications();
- applications.addApplication(new Application("my-service"));
- when(eurekaClient.getApplications()).thenReturn(applications);
- Flux services = this.client.getServices();
- StepVerifier.create(services).expectNextCount(0).expectComplete().verify();
- }
-
- @Test
- void shouldReturnFluxOfServices() {
- Applications applications = new Applications();
- Application app = new Application("my-service");
- app.addInstance(new InstanceInfo("instance", "my-service", "", "127.0.0.1", "", null, null, "", "", "", "", "",
- "", 0, null, "", null, null, null, null, null, null, null, null, null, null));
- applications.addApplication(app);
- when(eurekaClient.getApplications()).thenReturn(applications);
- Flux services = this.client.getServices();
- StepVerifier.create(services).expectNext("my-service").expectComplete().verify();
- }
-
- @Test
- void shouldReturnEmptyFluxForNonExistingService() {
- when(eurekaClient.getInstancesByVipAddress("nonexistent-service", false)).thenReturn(emptyList());
- Flux instances = this.client.getInstances("nonexistent-service");
- StepVerifier.create(instances).expectNextCount(0).expectComplete().verify();
- }
-
- @Test
- void shouldReturnFluxOfServiceInstances() {
- InstanceInfo instanceInfo = new InstanceInfo(
- new InstanceInfo("instance", "my-service", "", "127.0.0.1", "", null, null, "", "", "", "", "", "", 0,
- null, "", null, null, null, null, null, null, null, null, null, null));
- when(eurekaClient.getInstancesByVipAddress("my-service", false)).thenReturn(singletonList(instanceInfo));
- Flux instances = this.client.getInstances("my-service");
- StepVerifier.create(instances).expectNextCount(1).expectComplete().verify();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java
deleted file mode 100644
index 89298fbb5..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.sample;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.annotation.DirtiesContext;
-
-@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@DirtiesContext
-class ApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java
deleted file mode 100644
index 8341b4c72..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.sample;
-
-import java.io.Closeable;
-
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.appinfo.InstanceInfo;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.springframework.web.bind.annotation.RequestMethod.POST;
-
-@Configuration(proxyBeanMethods = false)
-@ComponentScan
-@EnableAutoConfiguration
-@RestController
-public class EurekaSampleApplication implements ApplicationContextAware, Closeable {
-
- @Autowired
- private DiscoveryClient discoveryClient;
-
- @Autowired
- private ServiceRegistry serviceRegistry;
-
- @Autowired
- private InetUtils inetUtils;
-
- @Autowired
- private EurekaClientConfigBean clientConfig;
-
- private ApplicationContext context;
-
- private EurekaRegistration registration;
-
- @Bean
- public HealthCheckHandler healthCheckHandler() {
- return currentStatus -> InstanceInfo.InstanceStatus.UP;
- }
-
- @RequestMapping("/")
- public String home() {
- return "Hello world " + registration.getUri();
- }
-
- @Override
- public void setApplicationContext(ApplicationContext context) throws BeansException {
- this.context = context;
- }
-
- @RequestMapping(path = "/register", method = POST)
- public String register() {
- EurekaInstanceConfigBean config = new EurekaInstanceConfigBean(inetUtils);
- String appname = "customapp";
- config.setIpAddress("127.0.0.1");
- config.setHostname("localhost");
- config.setAppname(appname);
- config.setVirtualHostName(appname);
- config.setSecureVirtualHostName(appname);
- config.setNonSecurePort(4444);
- config.setInstanceId("127.0.0.1:customapp:4444");
-
- this.registration = EurekaRegistration.builder(config).with(this.clientConfig, this.context).build();
-
- this.serviceRegistry.register(this.registration);
- return config.getInstanceId();
- }
-
- @RequestMapping(path = "/deregister", method = POST)
- public String deregister() {
- this.serviceRegistry.deregister(this.registration);
- return "deregister";
- }
-
- @Override
- public void close() {
- deregister();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java
deleted file mode 100644
index 4aa9a02d5..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.sample;
-
-import com.netflix.discovery.EurekaClient;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Ryan Baxter
- */
-@SpringBootConfiguration(proxyBeanMethods = false)
-@EnableAutoConfiguration
-@RestController
-public class RefreshEurekaSampleApplication {
-
- @Bean
- public EurekaClient getClient() {
- return mock(CloudEurekaClient.class);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistryTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistryTests.java
deleted file mode 100644
index 072caed39..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/serviceregistry/EurekaServiceRegistryTests.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.serviceregistry;
-
-import java.util.Map;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.InstanceInfo;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
-import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.context.ApplicationEventPublisher;
-
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.DOWN;
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE;
-import static com.netflix.appinfo.InstanceInfo.InstanceStatus.UNKNOWN;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-class EurekaServiceRegistryTests {
-
- @Test
- void eurekaClientNotShutdownInDeregister() {
- EurekaServiceRegistry registry = new EurekaServiceRegistry();
-
- CloudEurekaClient eurekaClient = mock(CloudEurekaClient.class);
- ApplicationInfoManager applicationInfoManager = mock(ApplicationInfoManager.class);
-
- when(applicationInfoManager.getInfo()).thenReturn(mock(InstanceInfo.class));
-
- EurekaRegistration registration = EurekaRegistration
- .builder(new EurekaInstanceConfigBean(new InetUtils(new InetUtilsProperties()))).with(eurekaClient)
- .with(applicationInfoManager).with(new EurekaClientConfigBean(), mock(ApplicationEventPublisher.class))
- .build();
-
- registry.deregister(registration);
-
- verifyNoInteractions(eurekaClient);
- }
-
- @SuppressWarnings("unchecked")
- @Test
- void eurekaClientGetStatus() {
- EurekaServiceRegistry registry = new EurekaServiceRegistry();
-
- EurekaInstanceConfigBean config = new EurekaInstanceConfigBean(new InetUtils(new InetUtilsProperties()));
- config.setAppname("myapp");
- config.setInstanceId("1234");
-
- InstanceInfo local = InstanceInfo.Builder.newBuilder().setAppName("myapp").setInstanceId("1234").setStatus(DOWN)
- .build();
-
- InstanceInfo remote = InstanceInfo.Builder.newBuilder().setAppName("myapp").setInstanceId("1234")
- .setStatus(DOWN).setOverriddenStatus(OUT_OF_SERVICE).build();
-
- CloudEurekaClient eurekaClient = mock(CloudEurekaClient.class);
- when(eurekaClient.getInstanceInfo(local.getAppName(), local.getId())).thenReturn(remote);
-
- ApplicationInfoManager applicationInfoManager = mock(ApplicationInfoManager.class);
- when(applicationInfoManager.getInfo()).thenReturn(local);
-
- EurekaRegistration registration = EurekaRegistration.builder(config).with(eurekaClient)
- .with(applicationInfoManager).with(new EurekaClientConfigBean(), mock(ApplicationEventPublisher.class))
- .build();
-
- Object status = registry.getStatus(registration);
-
- assertThat(registration.getInstanceId()).isEqualTo("1234");
-
- assertThat(status).isInstanceOf(Map.class);
-
- Map map = (Map) status;
-
- assertThat(map).hasSize(2).containsEntry("status", DOWN.toString()).containsEntry("overriddenStatus",
- OUT_OF_SERVICE.toString());
- }
-
- @SuppressWarnings("unchecked")
- @Test
- void eurekaClientGetStatusNoInstance() {
- EurekaServiceRegistry registry = new EurekaServiceRegistry();
-
- EurekaInstanceConfigBean config = new EurekaInstanceConfigBean(new InetUtils(new InetUtilsProperties()));
- config.setAppname("myapp");
- config.setInstanceId("1234");
-
- CloudEurekaClient eurekaClient = mock(CloudEurekaClient.class);
-
- when(eurekaClient.getInstanceInfo("myapp", "1234")).thenReturn(null);
-
- ApplicationInfoManager applicationInfoManager = mock(ApplicationInfoManager.class);
- when(applicationInfoManager.getInfo()).thenReturn(mock(InstanceInfo.class));
-
- EurekaRegistration registration = EurekaRegistration.builder(config).with(eurekaClient)
- .with(applicationInfoManager).with(new EurekaClientConfigBean(), mock(ApplicationEventPublisher.class))
- .build();
-
- Object status = registry.getStatus(registration);
-
- assertThat(registration.getInstanceId()).isEqualTo("1234");
-
- assertThat(status).isInstanceOf(Map.class);
-
- Map map = (Map) status;
-
- assertThat(map).hasSize(1).containsEntry("status", UNKNOWN.toString());
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/support/ZoneUtilsTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/support/ZoneUtilsTests.java
deleted file mode 100644
index e3a94e75d..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/support/ZoneUtilsTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.support;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Ryan Baxter
- *
- */
-class ZoneUtilsTests {
-
- @Test
- void extractApproximateZoneTest() {
- assertThat("foo".equals(ZoneUtils.extractApproximateZone("foo"))).isTrue();
- assertThat("bar".equals(ZoneUtils.extractApproximateZone("foo.bar"))).isTrue();
- assertThat("world.foo.bar".equals(ZoneUtils.extractApproximateZone("hello.world.foo.bar"))).isTrue();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-client/src/test/resources/application.yml b/spring-cloud-netflix-eureka-client/src/test/resources/application.yml
deleted file mode 100644
index 3e83e31a8..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/resources/application.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# for EurekaRibbonClientPropertyOverrideIntegrationTests
-foo3:
- ribbon:
- NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
- NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList
-
-security:
- basic:
- enabled: false
- user:
- name: test
- password: test
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-client/src/test/resources/bootstrapper.yaml b/spring-cloud-netflix-eureka-client/src/test/resources/bootstrapper.yaml
deleted file mode 100644
index a08f17cb3..000000000
--- a/spring-cloud-netflix-eureka-client/src/test/resources/bootstrapper.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-spring:
- config:
- import: "optional:configserver:"
- cloud:
- config:
- enabled: true
- discovery:
- service-id: eureka-configserver
- enabled: true
- service-registry:
- auto-registration:
- enabled: false
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-server/.flattened-pom.xml b/spring-cloud-netflix-eureka-server/.flattened-pom.xml
new file mode 100644
index 000000000..e5251b89e
--- /dev/null
+++ b/spring-cloud-netflix-eureka-server/.flattened-pom.xml
@@ -0,0 +1,212 @@
+
+
+ 4.0.0
+
+ org.springframework.cloud
+ spring-cloud-netflix
+ 4.1.0-SNAPSHOT
+ ..
+
+ org.springframework.cloud
+ spring-cloud-netflix-eureka-server
+ 4.1.0-SNAPSHOT
+ Spring Cloud Netflix Eureka Server
+ Spring Cloud Netflix
+ https://projects.spring.io/spring-cloud/
+
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+
+
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0
+ Copyright 2014-2021 the original author or authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+
+ dsyer
+ Dave Syer
+ dsyer at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ sgibb
+ Spencer Gibb
+ sgibb at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ lead
+
+
+
+ mgrzejszczak
+ Marcin Grzejszczak
+ mgrzejszczak at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ rbaxter
+ Ryan Baxter
+ rbaxter at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+ omaciaszeksharma
+ Olga Maciaszek-Sharma
+ omaciaszeksharma at pivotal.io
+ Pivotal Software, Inc.
+ https://www.spring.io
+
+ developer
+
+
+
+
+ scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-eureka-server
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-eureka-server
+ https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-eureka-server
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 3.2.0-SNAPSHOT
+ compile
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+ 3.2.0-SNAPSHOT
+ compile
+
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+ 3.2.0-SNAPSHOT
+ compile
+
+
+ org.springframework.cloud
+ spring-cloud-commons
+ 4.1.0-SNAPSHOT
+ compile
+
+
+ org.springframework.cloud
+ spring-cloud-context
+ 4.1.0-SNAPSHOT
+ compile
+ true
+
+
+ org.springframework.cloud
+ spring-cloud-netflix-eureka-client
+ 4.1.0-SNAPSHOT
+ compile
+
+
+ com.netflix.eureka
+ eureka-client-jersey3
+ 2.0.1
+ compile
+
+
+ aopalliance
+ aopalliance
+
+
+
+
+ com.netflix.eureka
+ eureka-core-jersey3
+ 2.0.1
+ compile
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet
+ 3.1.3
+ compile
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ 3.1.3
+ compile
+
+
+ org.glassfish.jersey.core
+ jersey-client
+ 3.1.3
+ compile
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ 3.1.3
+ compile
+
+
+ org.glassfish.hk2
+ spring-bridge
+ 3.0.3
+ compile
+
+
+ jakarta.inject
+ jakarta.inject-api
+ 2.0.1
+ compile
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+ 2.15.2
+ compile
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure-processor
+ 3.2.0-SNAPSHOT
+ compile
+ true
+
+
+
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
deleted file mode 100644
index e8958533b..000000000
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.cloud
- spring-cloud-netflix
- 4.1.0-SNAPSHOT
- ..
-
- spring-cloud-netflix-eureka-server
- Spring Cloud Netflix Eureka Server
- https://projects.spring.io/spring-cloud/
-
- 1.10.1
- 2.27.2
-
- true
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
- org.springframework.boot
- spring-boot-starter-freemarker
-
-
- org.springframework.cloud
- spring-cloud-commons
-
-
- org.springframework.cloud
- spring-cloud-context
- true
-
-
- org.springframework.cloud
- spring-cloud-netflix-eureka-client
-
-
- com.netflix.eureka
- eureka-client-jersey3
-
-
- com.netflix.eureka
- eureka-core-jersey3
-
-
- org.glassfish.jersey.containers
- jersey-container-servlet
-
-
- org.glassfish.jersey.core
- jersey-server
-
-
- org.glassfish.jersey.core
- jersey-client
-
-
- org.glassfish.jersey.inject
- jersey-hk2
-
-
- org.glassfish.hk2
- spring-bridge
-
- 3.0.3
-
-
- jakarta.inject
- jakarta.inject-api
-
- 2.0.1
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
-
-
- org.springframework.boot
- spring-boot-autoconfigure-processor
- true
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.security
- spring-security-rsa
- test
-
-
-
-
-
- ${project.basedir}/src/main/resources
-
-
- ${project.build.directory}/generated-resources
-
-
-
-
- maven-resources-plugin
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${basedir}/target/wro
-
-
- src/main/wro
- true
-
-
-
-
-
- copy-docs
- prepare-package
-
- copy-resources
-
-
-
- ${project.build.outputDirectory}/static/docs
-
-
-
-
- ${project.build.directory}/generated-docs
-
-
-
-
-
-
-
-
- ro.isdc.wro4j
- wro4j-maven-plugin
- ${wro4j.version}
-
-
- generate-resources
-
- run
-
-
-
-
- ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory
- ${project.build.directory}/generated-resources/static/eureka/css
- ${project.build.directory}/generated-resources/static/eureka/js
- ${project.build.directory}/wro/wro.xml
- ${basedir}/src/main/wro/wro.properties
- ${basedir}/src/main/wro
-
-
-
-
- org.webjars.npm
- glob
- 7.2.0
-
-
- org.webjars.npm
- jquery
- 3.6.0
-
-
- org.webjars.npm
- bootstrap
- 5.1.3
-
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
-
-
- generate-docs
- prepare-package
-
- process-asciidoc
-
-
- html
- book
-
-
-
-
-
-
-
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/CloudJacksonJson.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/CloudJacksonJson.java
deleted file mode 100644
index e4d87a3aa..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/CloudJacksonJson.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.function.Supplier;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.LeaseInfo;
-import com.netflix.discovery.converters.EurekaJacksonCodec;
-import com.netflix.discovery.converters.EurekaJacksonCodec.InstanceInfoDeserializer;
-import com.netflix.discovery.converters.EurekaJacksonCodec.InstanceInfoSerializer;
-import com.netflix.discovery.converters.wrappers.CodecWrappers.LegacyJacksonJson;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import static com.netflix.discovery.converters.wrappers.CodecWrappers.getCodecName;
-
-/**
- * @author Spencer Gibb
- */
-public class CloudJacksonJson extends LegacyJacksonJson {
-
- protected final CloudJacksonCodec codec = new CloudJacksonCodec();
-
- public CloudJacksonCodec getCodec() {
- return codec;
- }
-
- @Override
- public String codecName() {
- return getCodecName(LegacyJacksonJson.class);
- }
-
- @Override
- public String encode(T object) {
- return this.codec.writeToString(object);
- }
-
- @Override
- public void encode(T object, OutputStream outputStream) throws IOException {
- this.codec.writeTo(object, outputStream);
- }
-
- @Override
- public T decode(String textValue, Class type) throws IOException {
- return this.codec.readValue(type, textValue);
- }
-
- @Override
- public T decode(InputStream inputStream, Class type) throws IOException {
- return this.codec.readValue(type, inputStream);
- }
-
- static InstanceInfo updateIfNeeded(final InstanceInfo info) {
- if (info.getInstanceId() == null && info.getMetadata() != null) {
- String instanceId = info.getMetadata().get("instanceId");
- if (StringUtils.hasText(instanceId)) {
- // backwards compatibility for Angel
- if (StringUtils.hasText(info.getHostName()) && !instanceId.startsWith(info.getHostName())) {
- instanceId = info.getHostName() + ":" + instanceId;
- }
- return new InstanceInfo.Builder(info).setInstanceId(instanceId).build();
- }
- }
- return info;
- }
-
- static class CloudJacksonCodec extends EurekaJacksonCodec {
-
- private static final Version VERSION = new Version(1, 1, 0, null, null, null);
-
- @SuppressWarnings("deprecation")
- CloudJacksonCodec() {
- super();
-
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
- SimpleModule module = new SimpleModule("eureka1.x", VERSION);
- module.addSerializer(DataCenterInfo.class, new DataCenterInfoSerializer());
- module.addSerializer(InstanceInfo.class, new CloudInstanceInfoSerializer());
- module.addSerializer(Application.class, new ApplicationSerializer());
- module.addSerializer(Applications.class,
- new ApplicationsSerializer(this.getVersionDeltaKey(), this.getAppHashCodeKey()));
-
- // TODO: Watch if this causes problems
- // module.addDeserializer(DataCenterInfo.class,
- // new DataCenterInfoDeserializer());
- module.addDeserializer(LeaseInfo.class, new LeaseInfoDeserializer());
- module.addDeserializer(InstanceInfo.class, new CloudInstanceInfoDeserializer(mapper));
- module.addDeserializer(Application.class, new ApplicationDeserializer(mapper));
- module.addDeserializer(Applications.class,
- new ApplicationsDeserializer(mapper, this.getVersionDeltaKey(), this.getAppHashCodeKey()));
-
- mapper.registerModule(module);
-
- HashMap, Supplier> readers = new HashMap<>();
- readers.put(InstanceInfo.class,
- () -> mapper.reader().withType(InstanceInfo.class).withRootName("instance"));
- readers.put(Application.class,
- () -> mapper.reader().withType(Application.class).withRootName("application"));
- readers.put(Applications.class,
- () -> mapper.reader().withType(Applications.class).withRootName("applications"));
- setField("objectReaderByClass", readers);
-
- HashMap, ObjectWriter> writers = new HashMap<>();
- writers.put(InstanceInfo.class, mapper.writer().withType(InstanceInfo.class).withRootName("instance"));
- writers.put(Application.class, mapper.writer().withType(Application.class).withRootName("application"));
- writers.put(Applications.class, mapper.writer().withType(Applications.class).withRootName("applications"));
- setField("objectWriterByClass", writers);
-
- setField("mapper", mapper);
- }
-
- void setField(String name, Object value) {
- Field field = ReflectionUtils.findField(EurekaJacksonCodec.class, name);
- ReflectionUtils.makeAccessible(field);
- ReflectionUtils.setField(field, this, value);
- }
-
- }
-
- static class CloudInstanceInfoSerializer extends InstanceInfoSerializer {
-
- @Override
- public void serialize(final InstanceInfo info, JsonGenerator jgen, SerializerProvider provider)
- throws IOException {
-
- InstanceInfo updated = updateIfNeeded(info);
- super.serialize(updated, jgen, provider);
- }
-
- }
-
- static class CloudInstanceInfoDeserializer extends InstanceInfoDeserializer {
-
- protected CloudInstanceInfoDeserializer(ObjectMapper mapper) {
- super(mapper);
- }
-
- @Override
- public InstanceInfo deserialize(JsonParser jp, DeserializationContext context) throws IOException {
- InstanceInfo info = super.deserialize(jp, context);
- InstanceInfo updated = updateIfNeeded(info);
- return updated;
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EnableEurekaServer.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EnableEurekaServer.java
deleted file mode 100644
index c6780e4ee..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EnableEurekaServer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.context.annotation.Import;
-
-/**
- * Annotation to activate Eureka Server related configuration.
- * {@link EurekaServerAutoConfiguration}
- *
- * @author Dave Syer
- * @author Biju Kunjummen
- *
- */
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Import(EurekaServerMarkerConfiguration.class)
-public @interface EnableEurekaServer {
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
deleted file mode 100644
index 119b05533..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.netflix.appinfo.AmazonInfo;
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Pair;
-import com.netflix.eureka.EurekaServerContext;
-import com.netflix.eureka.EurekaServerContextHolder;
-import com.netflix.eureka.cluster.PeerEurekaNode;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl;
-import com.netflix.eureka.resources.StatusResource;
-import com.netflix.eureka.util.StatusInfo;
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * @author Spencer Gibb
- * @author Gang Li
- * @author Weix Sun
- */
-@Controller
-@RequestMapping("${eureka.dashboard.path:/}")
-public class EurekaController {
-
- @Value("${eureka.dashboard.path:/}")
- private String dashboardPath = "";
-
- private final ApplicationInfoManager applicationInfoManager;
-
- private final EurekaProperties eurekaProperties;
-
- public EurekaController(ApplicationInfoManager applicationInfoManager, EurekaProperties eurekaProperties) {
- this.applicationInfoManager = applicationInfoManager;
- this.eurekaProperties = eurekaProperties;
- }
-
- @RequestMapping(method = RequestMethod.GET)
- public String status(HttpServletRequest request, Map model) {
- populateBase(request, model);
- populateApps(model);
- StatusInfo statusInfo;
- try {
- statusInfo = new StatusResource().getStatusInfo();
- }
- catch (Exception e) {
- statusInfo = StatusInfo.Builder.newBuilder().isHealthy(false).build();
- }
- model.put("statusInfo", statusInfo);
- populateInstanceInfo(model, statusInfo);
- filterReplicas(model, statusInfo);
- return "eureka/status";
- }
-
- @RequestMapping(value = "/lastn", method = RequestMethod.GET)
- public String lastn(HttpServletRequest request, Map model) {
- populateBase(request, model);
- PeerAwareInstanceRegistryImpl registry = (PeerAwareInstanceRegistryImpl) getRegistry();
- ArrayList> lastNCanceled = new ArrayList<>();
- List> list = registry.getLastNCanceledInstances();
- for (Pair entry : list) {
- lastNCanceled.add(registeredInstance(entry.second(), entry.first()));
- }
- model.put("lastNCanceled", lastNCanceled);
- list = registry.getLastNRegisteredInstances();
- ArrayList> lastNRegistered = new ArrayList<>();
- for (Pair entry : list) {
- lastNRegistered.add(registeredInstance(entry.second(), entry.first()));
- }
- model.put("lastNRegistered", lastNRegistered);
- return "eureka/lastn";
- }
-
- private Map registeredInstance(String id, long date) {
- HashMap map = new HashMap<>();
- map.put("id", id);
- map.put("date", new Date(date));
- return map;
- }
-
- protected void populateBase(HttpServletRequest request, Map model) {
- model.put("time", new Date());
- model.put("basePath", "/");
- model.put("dashboardPath", this.dashboardPath.equals("/") ? "" : this.dashboardPath);
- populateHeader(model);
- populateNavbar(request, model);
- }
-
- private void populateHeader(Map model) {
- model.put("currentTime", StatusResource.getCurrentTimeAsString());
- model.put("upTime", StatusInfo.getUpTime());
- model.put("environment", eurekaProperties.getEnvironment());
- model.put("datacenter", eurekaProperties.getDatacenter());
- PeerAwareInstanceRegistry registry = getRegistry();
- model.put("registry", registry);
- model.put("isBelowRenewThreshold", registry.isBelowRenewThresold() == 1);
- DataCenterInfo info = applicationInfoManager.getInfo().getDataCenterInfo();
- if (info.getName() == DataCenterInfo.Name.Amazon) {
- AmazonInfo amazonInfo = (AmazonInfo) info;
- model.put("amazonInfo", amazonInfo);
- model.put("amiId", amazonInfo.get(AmazonInfo.MetaDataKey.amiId));
- model.put("availabilityZone", amazonInfo.get(AmazonInfo.MetaDataKey.availabilityZone));
- model.put("instanceId", amazonInfo.get(AmazonInfo.MetaDataKey.instanceId));
- }
- }
-
- private PeerAwareInstanceRegistry getRegistry() {
- return getServerContext().getRegistry();
- }
-
- private EurekaServerContext getServerContext() {
- return EurekaServerContextHolder.getInstance().getServerContext();
- }
-
- private void populateNavbar(HttpServletRequest request, Map model) {
- Map replicas = new LinkedHashMap<>();
- List list = getServerContext().getPeerEurekaNodes().getPeerNodesView();
- for (PeerEurekaNode node : list) {
- try {
- URI uri = new URI(node.getServiceUrl());
- String href = scrubBasicAuth(node.getServiceUrl());
- replicas.put(uri.getHost(), href);
- }
- catch (Exception ex) {
- // ignore?
- }
- }
- model.put("replicas", replicas.entrySet());
- }
-
- private void populateApps(Map model) {
- List sortedApplications = getRegistry().getSortedApplications();
- ArrayList> apps = new ArrayList<>();
- for (Application app : sortedApplications) {
- LinkedHashMap appData = new LinkedHashMap<>();
- apps.add(appData);
- appData.put("name", app.getName());
- Map amiCounts = new HashMap<>();
- Map>> instancesByStatus = new HashMap<>();
- Map zoneCounts = new HashMap<>();
- for (InstanceInfo info : app.getInstances()) {
- String id = info.getId();
- String url = info.getStatusPageUrl();
- InstanceInfo.InstanceStatus status = info.getStatus();
- String ami = "n/a";
- String zone = "";
- if (info.getDataCenterInfo().getName() == DataCenterInfo.Name.Amazon) {
- AmazonInfo dcInfo = (AmazonInfo) info.getDataCenterInfo();
- ami = dcInfo.get(AmazonInfo.MetaDataKey.amiId);
- zone = dcInfo.get(AmazonInfo.MetaDataKey.availabilityZone);
- }
- Integer count = amiCounts.get(ami);
- if (count != null) {
- amiCounts.put(ami, count + 1);
- }
- else {
- amiCounts.put(ami, 1);
- }
- count = zoneCounts.get(zone);
- if (count != null) {
- zoneCounts.put(zone, count + 1);
- }
- else {
- zoneCounts.put(zone, 1);
- }
- List> list = instancesByStatus.computeIfAbsent(status, k -> new ArrayList<>());
- list.add(new Pair<>(id, url));
- }
- appData.put("amiCounts", amiCounts.entrySet());
- appData.put("zoneCounts", zoneCounts.entrySet());
- ArrayList> instanceInfos = new ArrayList<>();
- appData.put("instanceInfos", instanceInfos);
- for (Map.Entry>> entry : instancesByStatus
- .entrySet()) {
- List> value = entry.getValue();
- InstanceInfo.InstanceStatus status = entry.getKey();
- LinkedHashMap instanceData = new LinkedHashMap<>();
- instanceInfos.add(instanceData);
- instanceData.put("status", entry.getKey());
- ArrayList> instances = new ArrayList<>();
- instanceData.put("instances", instances);
- instanceData.put("isNotUp", status != InstanceInfo.InstanceStatus.UP);
-
- // TODO
-
- /*
- * if(status != InstanceInfo.InstanceStatus.UP){
- * buf.append(""); }
- * buf.append("").append(status
- * .name()).append(" (").append(value.size()).append(") - ");
- * if(status != InstanceInfo.InstanceStatus.UP){
- * buf.append(""); }
- */
-
- for (Pair p : value) {
- LinkedHashMap instance = new LinkedHashMap<>();
- instances.add(instance);
- instance.put("id", p.first());
- String url = p.second();
- instance.put("url", url);
- boolean isHref = url != null && url.startsWith("http");
- instance.put("isHref", isHref);
- /*
- * String id = p.first(); String url = p.second(); if(url != null &&
- * url.startsWith("http")){
- * buf.append(""); }else { url =
- * null; } buf.append(id); if(url != null){ buf.append(""); }
- * buf.append(", ");
- */
- }
- }
- // out.println("| " + buf.toString() + " | ");
- }
- model.put("apps", apps);
- }
-
- private void populateInstanceInfo(Map model, StatusInfo statusInfo) {
- InstanceInfo instanceInfo = statusInfo.getInstanceInfo();
- Map instanceMap = new HashMap<>();
- instanceMap.put("ipAddr", instanceInfo.getIPAddr());
- instanceMap.put("status", instanceInfo.getStatus().toString());
- if (instanceInfo.getDataCenterInfo().getName() == DataCenterInfo.Name.Amazon) {
- AmazonInfo info = (AmazonInfo) instanceInfo.getDataCenterInfo();
- instanceMap.put("availability-zone", info.get(AmazonInfo.MetaDataKey.availabilityZone));
- instanceMap.put("public-ipv4", info.get(AmazonInfo.MetaDataKey.publicIpv4));
- instanceMap.put("instance-id", info.get(AmazonInfo.MetaDataKey.instanceId));
- instanceMap.put("public-hostname", info.get(AmazonInfo.MetaDataKey.publicHostname));
- instanceMap.put("ami-id", info.get(AmazonInfo.MetaDataKey.amiId));
- instanceMap.put("instance-type", info.get(AmazonInfo.MetaDataKey.instanceType));
- }
- model.put("instanceInfo", instanceMap);
- }
-
- protected void filterReplicas(Map model, StatusInfo statusInfo) {
- Map applicationStats = statusInfo.getApplicationStats();
- if (applicationStats.get("registered-replicas").contains("@")) {
- applicationStats.put("registered-replicas", scrubBasicAuth(applicationStats.get("registered-replicas")));
- }
- if (applicationStats.get("unavailable-replicas").contains("@")) {
- applicationStats.put("unavailable-replicas", scrubBasicAuth(applicationStats.get("unavailable-replicas")));
- }
- if (applicationStats.get("available-replicas").contains("@")) {
- applicationStats.put("available-replicas", scrubBasicAuth(applicationStats.get("available-replicas")));
- }
- model.put("applicationStats", applicationStats);
- }
-
- private String scrubBasicAuth(String urlList) {
- String[] urls = urlList.split(",");
- StringBuilder filteredUrls = new StringBuilder();
- for (String u : urls) {
- if (u.contains("@")) {
- filteredUrls.append(u, 0, u.indexOf("//") + 2).append(u.substring(u.indexOf("@") + 1)).append(",");
- }
- else {
- filteredUrls.append(u).append(",");
- }
- }
- return filteredUrls.substring(0, filteredUrls.length() - 1);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaDashboardProperties.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaDashboardProperties.java
deleted file mode 100644
index 432da4579..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaDashboardProperties.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.util.Objects;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Configuration properties for the Eureka dashboard (UI).
- *
- * @author Dave Syer
- */
-@ConfigurationProperties("eureka.dashboard")
-public class EurekaDashboardProperties {
-
- /**
- * The path to the Eureka dashboard (relative to the servlet path). Defaults to "/".
- */
- private String path = "/";
-
- /**
- * Flag to enable the Eureka dashboard. Default true.
- */
- private boolean enabled = true;
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaDashboardProperties that = (EurekaDashboardProperties) o;
- return enabled == that.enabled && Objects.equals(path, that.path);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(path, enabled);
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("EurekaDashboardProperties{");
- sb.append("path='").append(path).append('\'');
- sb.append(", enabled=").append(enabled);
- sb.append('}');
- return sb.toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaProperties.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaProperties.java
deleted file mode 100644
index 483c68afa..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaProperties.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.util.Objects;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Configuration properties for the Eureka deployment.
- *
- * @author Weix Sun
- */
-@ConfigurationProperties("eureka")
-public class EurekaProperties {
-
- /**
- * Eureka environment. Defaults to "test".
- */
- private String environment = "test";
-
- /**
- * Eureka datacenter. Defaults to "default".
- */
- private String datacenter = "default";
-
- public String getEnvironment() {
- return environment;
- }
-
- public void setEnvironment(String environment) {
- this.environment = environment;
- }
-
- public String getDatacenter() {
- return datacenter;
- }
-
- public void setDatacenter(String datacenter) {
- this.datacenter = datacenter;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaProperties that = (EurekaProperties) o;
- return Objects.equals(datacenter, that.datacenter) && Objects.equals(environment, that.environment);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(environment, datacenter);
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("EurekaProperties{");
- sb.append("environment='").append(environment).append('\'');
- sb.append(", datacenter=").append(datacenter);
- sb.append('}');
- return sb.toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java
deleted file mode 100644
index ec8f135db..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.Jersey3DiscoveryClientOptionalArgs;
-import com.netflix.discovery.converters.EurekaJacksonCodec;
-import com.netflix.discovery.converters.wrappers.CodecWrapper;
-import com.netflix.discovery.converters.wrappers.CodecWrappers;
-import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
-import com.netflix.discovery.shared.transport.jersey3.EurekaIdentityHeaderFilter;
-import com.netflix.discovery.shared.transport.jersey3.EurekaJersey3Client;
-import com.netflix.discovery.shared.transport.jersey3.EurekaJersey3ClientImpl;
-import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories;
-import com.netflix.eureka.DefaultEurekaServerContext;
-import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.EurekaServerContext;
-import com.netflix.eureka.EurekaServerIdentity;
-import com.netflix.eureka.cluster.PeerEurekaNode;
-import com.netflix.eureka.cluster.PeerEurekaNodes;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
-import com.netflix.eureka.resources.DefaultServerCodecs;
-import com.netflix.eureka.resources.ServerCodecs;
-import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
-import com.netflix.eureka.transport.Jersey3DynamicGZIPContentEncodingFilter;
-import com.netflix.eureka.transport.Jersey3EurekaServerHttpClientFactory;
-import com.netflix.eureka.transport.Jersey3ReplicationClient;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientRequestFilter;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.ext.Provider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spi.Container;
-import org.glassfish.jersey.server.spi.ContainerLifecycleListener;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.glassfish.jersey.servlet.ServletProperties;
-import org.jvnet.hk2.spring.bridge.api.SpringBridge;
-import org.jvnet.hk2.spring.bridge.api.SpringIntoHK2Bridge;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.cloud.netflix.eureka.EurekaConstants;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.Ordered;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @author Gunnar Hillert
- * @author Biju Kunjummen
- * @author Fahim Farook
- * @author Weix Sun
- */
-@Configuration(proxyBeanMethods = false)
-@Import(EurekaServerInitializerConfiguration.class)
-@ConditionalOnBean(EurekaServerMarkerConfiguration.Marker.class)
-@EnableConfigurationProperties({ EurekaDashboardProperties.class, InstanceRegistryProperties.class,
- EurekaProperties.class })
-@PropertySource("classpath:/eureka/server.properties")
-public class EurekaServerAutoConfiguration implements WebMvcConfigurer {
-
- private static final Log log = LogFactory.getLog(EurekaServerAutoConfiguration.class);
-
- /**
- * List of packages containing Jersey resources required by the Eureka server.
- */
- private static final String[] EUREKA_PACKAGES = new String[] { "com.netflix.discovery", "com.netflix.eureka" };
-
- /**
- * Static content pattern for dashboard elements (images, css, etc...).
- */
- private static final String STATIC_CONTENT_PATTERN = "/(fonts|images|css|js)/.*";
-
- @Autowired
- private ApplicationInfoManager applicationInfoManager;
-
- @Autowired
- private EurekaServerConfig eurekaServerConfig;
-
- @Autowired
- private EurekaClientConfig eurekaClientConfig;
-
- @Autowired
- private EurekaClient eurekaClient;
-
- @Autowired
- private InstanceRegistryProperties instanceRegistryProperties;
-
- /**
- * A {@link CloudJacksonJson} instance.
- */
- public static final CloudJacksonJson JACKSON_JSON = new CloudJacksonJson();
-
- @Bean
- public HasFeatures eurekaServerFeature() {
- return HasFeatures.namedFeature("Eureka Server", EurekaServerAutoConfiguration.class);
- }
-
- @Bean
- @ConditionalOnProperty(prefix = "eureka.dashboard", name = "enabled", matchIfMissing = true)
- public EurekaController eurekaController(EurekaProperties eurekaProperties) {
- return new EurekaController(this.applicationInfoManager, eurekaProperties);
- }
-
- static {
- CodecWrappers.registerWrapper(JACKSON_JSON);
- EurekaJacksonCodec.setInstance(JACKSON_JSON.getCodec());
- }
-
- @Bean
- public ServerCodecs serverCodecs() {
- return new CloudServerCodecs(this.eurekaServerConfig);
- }
-
- private static CodecWrapper getFullJson(EurekaServerConfig serverConfig) {
- CodecWrapper codec = CodecWrappers.getCodec(serverConfig.getJsonCodecName());
- return codec == null ? CodecWrappers.getCodec(JACKSON_JSON.codecName()) : codec;
- }
-
- private static CodecWrapper getFullXml(EurekaServerConfig serverConfig) {
- CodecWrapper codec = CodecWrappers.getCodec(serverConfig.getXmlCodecName());
- return codec == null ? CodecWrappers.getCodec(CodecWrappers.XStreamXml.class) : codec;
- }
-
- @Bean
- @ConditionalOnMissingBean
- public ReplicationClientAdditionalFilters replicationClientAdditionalFilters() {
- return new ReplicationClientAdditionalFilters(Collections.emptySet());
- }
-
- @Bean
- @ConditionalOnMissingBean(TransportClientFactories.class)
- public Jersey3TransportClientFactories jersey3TransportClientFactories() {
- return Jersey3TransportClientFactories.getInstance();
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Bean
- @ConditionalOnMissingBean(EurekaServerHttpClientFactory.class)
- public Jersey3EurekaServerHttpClientFactory jersey3EurekaServerHttpClientFactory() {
- return new Jersey3EurekaServerHttpClientFactory();
- }
-
- @Bean
- @ConditionalOnMissingBean(AbstractDiscoveryClientOptionalArgs.class)
- public Jersey3DiscoveryClientOptionalArgs jersey3DiscoveryClientOptionalArgs() {
- return new Jersey3DiscoveryClientOptionalArgs();
- }
-
- @Bean
- public PeerAwareInstanceRegistry peerAwareInstanceRegistry(ServerCodecs serverCodecs,
- EurekaServerHttpClientFactory eurekaServerHttpClientFactory) {
- this.eurekaClient.getApplications(); // force initialization
- return new InstanceRegistry(this.eurekaServerConfig, this.eurekaClientConfig, serverCodecs, this.eurekaClient,
- eurekaServerHttpClientFactory,
- this.instanceRegistryProperties.getExpectedNumberOfClientsSendingRenews(),
- this.instanceRegistryProperties.getDefaultOpenForTrafficCount());
- }
-
- @Bean
- @ConditionalOnMissingBean
- public PeerEurekaNodes peerEurekaNodes(PeerAwareInstanceRegistry registry, ServerCodecs serverCodecs,
- ReplicationClientAdditionalFilters replicationClientAdditionalFilters) {
- return new RefreshablePeerEurekaNodes(registry, this.eurekaServerConfig, this.eurekaClientConfig, serverCodecs,
- this.applicationInfoManager, replicationClientAdditionalFilters);
- }
-
- @Bean
- @ConditionalOnMissingBean
- public EurekaServerContext eurekaServerContext(ServerCodecs serverCodecs, PeerAwareInstanceRegistry registry,
- PeerEurekaNodes peerEurekaNodes) {
- return new DefaultEurekaServerContext(this.eurekaServerConfig, serverCodecs, registry, peerEurekaNodes,
- this.applicationInfoManager);
- }
-
- @Bean
- public EurekaServerBootstrap eurekaServerBootstrap(PeerAwareInstanceRegistry registry,
- EurekaServerContext serverContext) {
- return new EurekaServerBootstrap(this.applicationInfoManager, this.eurekaClientConfig, this.eurekaServerConfig,
- registry, serverContext);
- }
-
- /**
- * Register the Jersey filter.
- * @param eurekaJerseyApp an {@link Application} for the filter to be registered
- * @return a jersey {@link FilterRegistrationBean}
- */
- @Bean
- public FilterRegistrationBean jerseyFilterRegistration(ResourceConfig eurekaJerseyApp) {
- FilterRegistrationBean bean = new FilterRegistrationBean<>();
- ServletContainer servletContainer = new ServletContainer(eurekaJerseyApp);
- bean.setFilter(servletContainer);
- bean.setOrder(Ordered.LOWEST_PRECEDENCE);
- bean.setUrlPatterns(Collections.singletonList(EurekaConstants.DEFAULT_PREFIX + "/*"));
-
- return bean;
- }
-
- @Bean
- public FilterRegistrationBean eurekaVersionFilterRegistration(ServerProperties serverProperties,
- Environment env) {
- final String contextPath = serverProperties.getServlet().getContextPath();
- String regex = EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN;
- if (StringUtils.hasText(contextPath)) {
- regex = contextPath + regex;
- }
- String debugResponseHeader = env.getProperty("eureka.server.version.filter.debug.response-header");
- boolean addDebugResponseHeader = StringUtils.hasText(debugResponseHeader);
- Pattern staticPattern = Pattern.compile(regex);
- FilterRegistrationBean bean = new FilterRegistrationBean<>();
- bean.setFilter(new OncePerRequestFilter() {
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
- FilterChain filterChain) throws ServletException, IOException {
- HttpServletRequest req = request;
- String requestURI = request.getRequestURI();
- if (!requestURI.startsWith(EurekaConstants.DEFAULT_PREFIX + "/v2")
- // don't forward static requests (images, js, etc...) to /v2
- && !staticPattern.matcher(requestURI).matches()) {
-
- String prefix = EurekaConstants.DEFAULT_PREFIX;
- if (StringUtils.hasText(contextPath)) {
- prefix = contextPath + prefix;
- }
- String updatedPath = EurekaConstants.DEFAULT_PREFIX + "/v2" + requestURI.substring(prefix.length());
- if (StringUtils.hasText(contextPath)) {
- updatedPath = contextPath + updatedPath;
- }
- final String computedPath = updatedPath;
- // only used if a special debug property is set, so in prod this is
- // always skipped.
- if (addDebugResponseHeader) {
- response.addHeader(debugResponseHeader, computedPath);
- }
- HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request) {
- @Override
- public String getRequestURI() {
- return computedPath;
- }
-
- @Override
- public String getServletPath() {
- return computedPath;
- }
- };
- req = wrapper;
- }
- filterChain.doFilter(req, response);
- }
- });
- bean.setOrder(0);
- bean.setUrlPatterns(Collections.singletonList(EurekaConstants.DEFAULT_PREFIX + "/*"));
-
- return bean;
- }
-
- /**
- * Construct a Jersey {@link jakarta.ws.rs.core.Application} with all the resources
- * required by the Eureka server.
- * @param environment an {@link Environment} instance to retrieve classpath resources
- * @param resourceLoader a {@link ResourceLoader} instance to get classloader from
- * @return created {@link Application} object
- */
- @Bean
- public ResourceConfig jerseyApplication(Environment environment, ResourceLoader resourceLoader,
- BeanFactory beanFactory) {
-
- ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false,
- environment);
-
- // Filter to include only classes that have a particular annotation.
- //
- provider.addIncludeFilter(new AnnotationTypeFilter(Path.class));
- provider.addIncludeFilter(new AnnotationTypeFilter(Provider.class));
-
- // Find classes in Eureka packages (or subpackages)
- //
- Set> classes = new HashSet<>();
- for (String basePackage : EUREKA_PACKAGES) {
- Set beans = provider.findCandidateComponents(basePackage);
- for (BeanDefinition bd : beans) {
- Class cls = ClassUtils.resolveClassName(bd.getBeanClassName(), resourceLoader.getClassLoader());
- classes.add(cls);
- }
- }
-
- // https://javaee.github.io/hk2/spring-bridge
-
- // Construct the Jersey ResourceConfig
- ResourceConfig rc = new ResourceConfig(classes).property(
- // Skip static content used by the webapp
- ServletProperties.FILTER_STATIC_CONTENT_REGEX, EurekaConstants.DEFAULT_PREFIX + STATIC_CONTENT_PATTERN);
-
- rc.register(new ContainerLifecycleListener() {
- @Override
- public void onStartup(Container container) {
- ServiceLocator serviceLocator = container.getApplicationHandler().getInjectionManager()
- .getInstance(ServiceLocator.class);
- SpringBridge.getSpringBridge().initializeSpringBridge(serviceLocator);
- serviceLocator.getService(SpringIntoHK2Bridge.class).bridgeSpringBeanFactory(beanFactory);
- }
-
- @Override
- public void onReload(Container container) {
-
- }
-
- @Override
- public void onShutdown(Container container) {
-
- }
- });
-
- return rc;
- }
-
- @Bean
- @ConditionalOnBean(name = "httpTraceFilter")
- public FilterRegistrationBean traceFilterRegistration(@Qualifier("httpTraceFilter") Filter filter) {
- FilterRegistrationBean bean = new FilterRegistrationBean<>();
- bean.setFilter(filter);
- bean.setOrder(Ordered.LOWEST_PRECEDENCE - 10);
- return bean;
- }
-
- @Configuration(proxyBeanMethods = false)
- protected static class EurekaServerConfigBeanConfiguration {
-
- @Bean
- @ConditionalOnMissingBean
- public EurekaServerConfig eurekaServerConfig(EurekaClientConfig clientConfig) {
- EurekaServerConfigBean server = new EurekaServerConfigBean();
- if (clientConfig.shouldRegisterWithEureka()) {
- // Set a sensible default if we are supposed to replicate
- server.setRegistrySyncRetries(5);
- }
- return server;
- }
-
- }
-
- /**
- * {@link PeerEurekaNodes} which updates peers when /refresh is invoked. Peers are
- * updated only if eureka.client.use-dns-for-fetching-service-urls is
- * false and one of following properties have changed.
- *
- *
- *
- * eureka.client.availability-zoneseureka.client.regioneureka.client.service-url.<zone>
- */
- static class RefreshablePeerEurekaNodes extends PeerEurekaNodes
- implements ApplicationListener {
-
- /* for testing */ ReplicationClientAdditionalFilters replicationClientAdditionalFilters;
-
- RefreshablePeerEurekaNodes(final PeerAwareInstanceRegistry registry, final EurekaServerConfig serverConfig,
- final EurekaClientConfig clientConfig, final ServerCodecs serverCodecs,
- final ApplicationInfoManager applicationInfoManager,
- final ReplicationClientAdditionalFilters replicationClientAdditionalFilters) {
- super(registry, serverConfig, clientConfig, serverCodecs, applicationInfoManager);
- this.replicationClientAdditionalFilters = replicationClientAdditionalFilters;
- }
-
- @Override
- protected PeerEurekaNode createPeerEurekaNode(String peerEurekaNodeUrl) {
- Jersey3ReplicationClient replicationClient = createReplicationClient(serverConfig, serverCodecs,
- peerEurekaNodeUrl, this.replicationClientAdditionalFilters.getFilters());
-
- String targetHost = hostFromUrl(peerEurekaNodeUrl);
- if (targetHost == null) {
- targetHost = "host";
- }
- return new PeerEurekaNode(registry, targetHost, peerEurekaNodeUrl, replicationClient, serverConfig);
- }
-
- // FIXME: 4.0 update Jersey3ReplicationClient.createReplicationClient to handle
- // additional filters
- private static Jersey3ReplicationClient createReplicationClient(EurekaServerConfig config,
- ServerCodecs serverCodecs, String serviceUrl, Collection additionalFilters) {
- String name = Jersey3ReplicationClient.class.getSimpleName() + ": " + serviceUrl + "apps/: ";
-
- EurekaJersey3Client jerseyClient;
- try {
- String hostname;
- try {
- hostname = new URL(serviceUrl).getHost();
- }
- catch (MalformedURLException e) {
- hostname = serviceUrl;
- }
-
- String jerseyClientName = "Discovery-PeerNodeClient-" + hostname;
- EurekaJersey3ClientImpl.EurekaJersey3ClientBuilder clientBuilder = new EurekaJersey3ClientImpl.EurekaJersey3ClientBuilder()
- .withClientName(jerseyClientName).withUserAgent("Java-EurekaClient-Replication")
- .withEncoderWrapper(serverCodecs.getFullJsonCodec())
- .withDecoderWrapper(serverCodecs.getFullJsonCodec())
- .withConnectionTimeout(config.getPeerNodeConnectTimeoutMs())
- .withReadTimeout(config.getPeerNodeReadTimeoutMs())
- .withMaxConnectionsPerHost(config.getPeerNodeTotalConnectionsPerHost())
- .withMaxTotalConnections(config.getPeerNodeTotalConnections())
- .withConnectionIdleTimeout(config.getPeerNodeConnectionIdleTimeoutSeconds());
-
- if (serviceUrl.startsWith("https://") && "true"
- .equals(System.getProperty("com.netflix.eureka.shouldSSLConnectionsUseSystemSocketFactory"))) {
- clientBuilder.withSystemSSLConfiguration();
- }
- jerseyClient = clientBuilder.build();
- }
- catch (Throwable e) {
- throw new RuntimeException("Cannot Create new Replica Node :" + name, e);
- }
-
- String ip = null;
- try {
- ip = InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e) {
- log.warn("Cannot find localhost ip", e);
- }
-
- Client jerseyApacheClient = jerseyClient.getClient();
- jerseyApacheClient.register(new Jersey3DynamicGZIPContentEncodingFilter(config));
-
- for (ClientRequestFilter filter : additionalFilters) {
- jerseyApacheClient.register(filter);
- }
-
- EurekaServerIdentity identity = new EurekaServerIdentity(ip);
- jerseyApacheClient.register(new EurekaIdentityHeaderFilter(identity));
-
- return new Jersey3ReplicationClient(jerseyClient, serviceUrl);
- }
-
- @Override
- public void onApplicationEvent(final EnvironmentChangeEvent event) {
- if (shouldUpdate(event.getKeys())) {
- updatePeerEurekaNodes(resolvePeerUrls());
- }
- }
-
- /*
- * Check whether specific properties have changed.
- */
- protected boolean shouldUpdate(final Set changedKeys) {
- assert changedKeys != null;
-
- // if eureka.client.use-dns-for-fetching-service-urls is true, then
- // service-url will not be fetched from environment.
- if (this.clientConfig.shouldUseDnsForFetchingServiceUrls()) {
- return false;
- }
-
- if (changedKeys.contains("eureka.client.region")) {
- return true;
- }
-
- for (final String key : changedKeys) {
- // property keys are not expected to be null.
- if (key.startsWith("eureka.client.service-url.")
- || key.startsWith("eureka.client.availability-zones.")) {
- return true;
- }
- }
- return false;
- }
-
- }
-
- class CloudServerCodecs extends DefaultServerCodecs {
-
- CloudServerCodecs(EurekaServerConfig serverConfig) {
- super(getFullJson(serverConfig), CodecWrappers.getCodec(CodecWrappers.JacksonJsonMini.class),
- getFullXml(serverConfig), CodecWrappers.getCodec(CodecWrappers.JacksonXmlMini.class));
- }
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java
deleted file mode 100644
index 8535b721d..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.converters.JsonXStream;
-import com.netflix.discovery.converters.XmlXStream;
-import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.EurekaServerContext;
-import com.netflix.eureka.EurekaServerContextHolder;
-import com.netflix.eureka.V1AwareInstanceInfoConverter;
-import com.netflix.eureka.aws.AwsBinder;
-import com.netflix.eureka.aws.AwsBinderDelegate;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
-import com.netflix.eureka.util.EurekaMonitors;
-import com.thoughtworks.xstream.XStream;
-import jakarta.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Spencer Gibb
- * @author Weix Sun
- */
-public class EurekaServerBootstrap {
-
- private static final Log log = LogFactory.getLog(EurekaServerBootstrap.class);
-
- protected EurekaServerConfig eurekaServerConfig;
-
- protected ApplicationInfoManager applicationInfoManager;
-
- protected EurekaClientConfig eurekaClientConfig;
-
- protected PeerAwareInstanceRegistry registry;
-
- protected volatile EurekaServerContext serverContext;
-
- protected volatile AwsBinder awsBinder;
-
- public EurekaServerBootstrap(ApplicationInfoManager applicationInfoManager, EurekaClientConfig eurekaClientConfig,
- EurekaServerConfig eurekaServerConfig, PeerAwareInstanceRegistry registry,
- EurekaServerContext serverContext) {
- this.applicationInfoManager = applicationInfoManager;
- this.eurekaClientConfig = eurekaClientConfig;
- this.eurekaServerConfig = eurekaServerConfig;
- this.registry = registry;
- this.serverContext = serverContext;
- }
-
- public void contextInitialized(ServletContext context) {
- try {
- initEurekaServerContext();
-
- context.setAttribute(EurekaServerContext.class.getName(), this.serverContext);
- }
- catch (Throwable e) {
- log.error("Cannot bootstrap eureka server :", e);
- throw new RuntimeException("Cannot bootstrap eureka server :", e);
- }
- }
-
- public void contextDestroyed(ServletContext context) {
- try {
- log.info("Shutting down Eureka Server..");
- context.removeAttribute(EurekaServerContext.class.getName());
-
- destroyEurekaServerContext();
- destroyEurekaEnvironment();
-
- }
- catch (Throwable e) {
- log.error("Error shutting down eureka", e);
- }
- log.info("Eureka Service is now shutdown...");
- }
-
- protected void initEurekaServerContext() throws Exception {
- // For backward compatibility
- JsonXStream.getInstance().registerConverter(new V1AwareInstanceInfoConverter(), XStream.PRIORITY_VERY_HIGH);
- XmlXStream.getInstance().registerConverter(new V1AwareInstanceInfoConverter(), XStream.PRIORITY_VERY_HIGH);
-
- if (isAws(this.applicationInfoManager.getInfo())) {
- this.awsBinder = new AwsBinderDelegate(this.eurekaServerConfig, this.eurekaClientConfig, this.registry,
- this.applicationInfoManager);
- this.awsBinder.start();
- }
-
- EurekaServerContextHolder.initialize(this.serverContext);
-
- log.info("Initialized server context");
-
- // Copy registry from neighboring eureka node
- int registryCount = this.registry.syncUp();
- this.registry.openForTraffic(this.applicationInfoManager, registryCount);
-
- // Register all monitoring statistics.
- EurekaMonitors.registerAllStats();
- }
-
- /**
- * Server context shutdown hook. Override for custom logic
- * @throws Exception - calling {@link AwsBinder#shutdown()} or
- * {@link EurekaServerContext#shutdown()} may result in an exception
- */
- protected void destroyEurekaServerContext() throws Exception {
- EurekaMonitors.shutdown();
- if (this.awsBinder != null) {
- this.awsBinder.shutdown();
- }
- if (this.serverContext != null) {
- this.serverContext.shutdown();
- }
- }
-
- /**
- * Users can override to clean up the environment themselves.
- * @throws Exception - shutting down Eureka servers may result in an exception
- */
- protected void destroyEurekaEnvironment() throws Exception {
- }
-
- protected boolean isAws(InstanceInfo selfInstanceInfo) {
- boolean result = DataCenterInfo.Name.Amazon == selfInstanceInfo.getDataCenterInfo().getName();
- log.info("isAws returned " + result);
- return result;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java
deleted file mode 100644
index 0c2789023..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.aws.AwsBindingStrategy;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.env.PropertyResolver;
-import org.springframework.core.style.ToStringCreator;
-
-/**
- * @author Dave Syer
- * @author Gregor Zurowski
- */
-@ConfigurationProperties(EurekaServerConfigBean.PREFIX)
-public class EurekaServerConfigBean implements EurekaServerConfig {
-
- /**
- * Eureka server configuration properties prefix.
- */
- public static final String PREFIX = "eureka.server";
-
- private static final int MINUTES = 60 * 1000;
-
- @Autowired(required = false)
- PropertyResolver propertyResolver;
-
- private String aWSAccessId;
-
- private String aWSSecretKey;
-
- private int eIPBindRebindRetries = 3;
-
- private int eIPBindingRetryIntervalMs = 5 * MINUTES;
-
- private int eIPBindingRetryIntervalMsWhenUnbound = 1 * MINUTES;
-
- private boolean enableSelfPreservation = true;
-
- private double renewalPercentThreshold = 0.85;
-
- private int renewalThresholdUpdateIntervalMs = 15 * MINUTES;
-
- private int peerEurekaNodesUpdateIntervalMs = 10 * MINUTES;
-
- private int numberOfReplicationRetries = 5;
-
- private int peerEurekaStatusRefreshTimeIntervalMs = 30 * 1000;
-
- private int waitTimeInMsWhenSyncEmpty = 5 * MINUTES;
-
- private int peerNodeConnectTimeoutMs = 200;
-
- private int peerNodeReadTimeoutMs = 200;
-
- private int peerNodeTotalConnections = 1000;
-
- private int peerNodeTotalConnectionsPerHost = 500;
-
- private int peerNodeConnectionIdleTimeoutSeconds = 30;
-
- private long retentionTimeInMSInDeltaQueue = 3 * MINUTES;
-
- private long deltaRetentionTimerIntervalInMs = 30 * 1000;
-
- private long evictionIntervalTimerInMs = 60 * 1000;
-
- private int aSGQueryTimeoutMs = 300;
-
- private long aSGUpdateIntervalMs = 5 * MINUTES;
-
- private long aSGCacheExpiryTimeoutMs = 10 * MINUTES; // defaults to longer than the
-
- // asg update interval
-
- private long responseCacheAutoExpirationInSeconds = 180;
-
- private long responseCacheUpdateIntervalMs = 30 * 1000;
-
- private boolean useReadOnlyResponseCache = true;
-
- private boolean disableDelta;
-
- private long maxIdleThreadInMinutesAgeForStatusReplication = 10;
-
- private int minThreadsForStatusReplication = 1;
-
- private int maxThreadsForStatusReplication = 1;
-
- private int maxElementsInStatusReplicationPool = 10000;
-
- private boolean syncWhenTimestampDiffers = true;
-
- private int registrySyncRetries = 0;
-
- private long registrySyncRetryWaitMs = 30 * 1000;
-
- private int maxElementsInPeerReplicationPool = 10000;
-
- private long maxIdleThreadAgeInMinutesForPeerReplication = 15;
-
- private int minThreadsForPeerReplication = 5;
-
- private int maxThreadsForPeerReplication = 20;
-
- private int maxTimeForReplication = 30000;
-
- private boolean primeAwsReplicaConnections = true;
-
- private boolean disableDeltaForRemoteRegions;
-
- private int remoteRegionConnectTimeoutMs = 1000;
-
- private int remoteRegionReadTimeoutMs = 1000;
-
- private int remoteRegionTotalConnections = 1000;
-
- private int remoteRegionTotalConnectionsPerHost = 500;
-
- private int remoteRegionConnectionIdleTimeoutSeconds = 30;
-
- private boolean gZipContentFromRemoteRegion = true;
-
- private Map remoteRegionUrlsWithName = new HashMap<>();
-
- private String[] remoteRegionUrls;
-
- private Map> remoteRegionAppWhitelist = new HashMap<>();
-
- private int remoteRegionRegistryFetchInterval = 30;
-
- private int remoteRegionFetchThreadPoolSize = 20;
-
- private String remoteRegionTrustStore = "";
-
- private String remoteRegionTrustStorePassword = "changeit";
-
- private boolean disableTransparentFallbackToOtherRegion;
-
- private boolean batchReplication;
-
- private boolean rateLimiterEnabled = false;
-
- private boolean rateLimiterThrottleStandardClients = false;
-
- private Set rateLimiterPrivilegedClients = Collections.emptySet();
-
- private int rateLimiterBurstSize = 10;
-
- private int rateLimiterRegistryFetchAverageRate = 500;
-
- private int rateLimiterFullFetchAverageRate = 100;
-
- private boolean logIdentityHeaders = true;
-
- private String listAutoScalingGroupsRoleName = "ListAutoScalingGroups";
-
- private boolean enableReplicatedRequestCompression = false;
-
- private String jsonCodecName;
-
- private String xmlCodecName;
-
- private int route53BindRebindRetries = 3;
-
- private int route53BindingRetryIntervalMs = 5 * MINUTES;
-
- private long route53DomainTTL = 30;
-
- private AwsBindingStrategy bindingStrategy = AwsBindingStrategy.EIP;
-
- private int minAvailableInstancesForPeerReplication = -1;
-
- private int initialCapacityOfResponseCache = 1000;
-
- private int expectedClientRenewalIntervalSeconds = 30;
-
- private boolean useAwsAsgApi = true;
-
- private String myUrl;
-
- @Override
- public boolean shouldEnableSelfPreservation() {
- return this.enableSelfPreservation;
- }
-
- @Override
- public boolean shouldDisableDelta() {
- return this.disableDelta;
- }
-
- @Override
- public boolean shouldSyncWhenTimestampDiffers() {
- return this.syncWhenTimestampDiffers;
- }
-
- @Override
- public boolean shouldPrimeAwsReplicaConnections() {
- return this.primeAwsReplicaConnections;
- }
-
- @Override
- public boolean shouldDisableDeltaForRemoteRegions() {
- return this.disableDeltaForRemoteRegions;
- }
-
- @Override
- public boolean shouldGZipContentFromRemoteRegion() {
- return this.gZipContentFromRemoteRegion;
- }
-
- @Override
- public Set getRemoteRegionAppWhitelist(String regionName) {
- return this.remoteRegionAppWhitelist.get(regionName == null ? "global" : regionName.trim().toLowerCase());
- }
-
- @Override
- public boolean disableTransparentFallbackToOtherRegion() {
- return this.disableTransparentFallbackToOtherRegion;
- }
-
- @Override
- public boolean shouldBatchReplication() {
- return this.batchReplication;
- }
-
- @Override
- public String getMyUrl() {
- return this.myUrl;
- }
-
- public void setMyUrl(String myUrl) {
- this.myUrl = myUrl;
- }
-
- @Override
- public boolean shouldLogIdentityHeaders() {
- return this.logIdentityHeaders;
- }
-
- @Override
- public String getJsonCodecName() {
- return this.jsonCodecName;
- }
-
- @Override
- public String getXmlCodecName() {
- return this.xmlCodecName;
- }
-
- @Override
- public boolean shouldUseReadOnlyResponseCache() {
- return this.useReadOnlyResponseCache;
- }
-
- @Override
- public boolean shouldEnableReplicatedRequestCompression() {
- return this.enableReplicatedRequestCompression;
- }
-
- @Override
- public String getExperimental(String name) {
- if (this.propertyResolver != null) {
- return this.propertyResolver.getProperty(PREFIX + ".experimental." + name, String.class, null);
- }
- return null;
- }
-
- @Override
- public int getInitialCapacityOfResponseCache() {
- return this.initialCapacityOfResponseCache;
- }
-
- public void setInitialCapacityOfResponseCache(int initialCapacityOfResponseCache) {
- this.initialCapacityOfResponseCache = initialCapacityOfResponseCache;
- }
-
- @Override
- public int getHealthStatusMinNumberOfAvailablePeers() {
- return this.minAvailableInstancesForPeerReplication;
- }
-
- public PropertyResolver getPropertyResolver() {
- return propertyResolver;
- }
-
- public void setPropertyResolver(PropertyResolver propertyResolver) {
- this.propertyResolver = propertyResolver;
- }
-
- public String getAWSAccessId() {
- return aWSAccessId;
- }
-
- public void setAWSAccessId(String aWSAccessId) {
- this.aWSAccessId = aWSAccessId;
- }
-
- public String getAWSSecretKey() {
- return aWSSecretKey;
- }
-
- public void setAWSSecretKey(String aWSSecretKey) {
- this.aWSSecretKey = aWSSecretKey;
- }
-
- public int getEIPBindRebindRetries() {
- return eIPBindRebindRetries;
- }
-
- public void setEIPBindRebindRetries(int eIPBindRebindRetries) {
- this.eIPBindRebindRetries = eIPBindRebindRetries;
- }
-
- public int getEIPBindingRetryIntervalMs() {
- return eIPBindingRetryIntervalMs;
- }
-
- public void setEIPBindingRetryIntervalMs(int eIPBindingRetryIntervalMs) {
- this.eIPBindingRetryIntervalMs = eIPBindingRetryIntervalMs;
- }
-
- public int getEIPBindingRetryIntervalMsWhenUnbound() {
- return eIPBindingRetryIntervalMsWhenUnbound;
- }
-
- public void setEIPBindingRetryIntervalMsWhenUnbound(int eIPBindingRetryIntervalMsWhenUnbound) {
- this.eIPBindingRetryIntervalMsWhenUnbound = eIPBindingRetryIntervalMsWhenUnbound;
- }
-
- public boolean isEnableSelfPreservation() {
- return enableSelfPreservation;
- }
-
- public void setEnableSelfPreservation(boolean enableSelfPreservation) {
- this.enableSelfPreservation = enableSelfPreservation;
- }
-
- @Override
- public double getRenewalPercentThreshold() {
- return renewalPercentThreshold;
- }
-
- public void setRenewalPercentThreshold(double renewalPercentThreshold) {
- this.renewalPercentThreshold = renewalPercentThreshold;
- }
-
- @Override
- public int getRenewalThresholdUpdateIntervalMs() {
- return renewalThresholdUpdateIntervalMs;
- }
-
- @Override
- public int getExpectedClientRenewalIntervalSeconds() {
- return this.expectedClientRenewalIntervalSeconds;
- }
-
- public void setExpectedClientRenewalIntervalSeconds(int expectedClientRenewalIntervalSeconds) {
- this.expectedClientRenewalIntervalSeconds = expectedClientRenewalIntervalSeconds;
- }
-
- public void setRenewalThresholdUpdateIntervalMs(int renewalThresholdUpdateIntervalMs) {
- this.renewalThresholdUpdateIntervalMs = renewalThresholdUpdateIntervalMs;
- }
-
- @Override
- public int getPeerEurekaNodesUpdateIntervalMs() {
- return peerEurekaNodesUpdateIntervalMs;
- }
-
- public void setPeerEurekaNodesUpdateIntervalMs(int peerEurekaNodesUpdateIntervalMs) {
- this.peerEurekaNodesUpdateIntervalMs = peerEurekaNodesUpdateIntervalMs;
- }
-
- @Override
- public int getNumberOfReplicationRetries() {
- return numberOfReplicationRetries;
- }
-
- public void setNumberOfReplicationRetries(int numberOfReplicationRetries) {
- this.numberOfReplicationRetries = numberOfReplicationRetries;
- }
-
- @Override
- public int getPeerEurekaStatusRefreshTimeIntervalMs() {
- return peerEurekaStatusRefreshTimeIntervalMs;
- }
-
- public void setPeerEurekaStatusRefreshTimeIntervalMs(int peerEurekaStatusRefreshTimeIntervalMs) {
- this.peerEurekaStatusRefreshTimeIntervalMs = peerEurekaStatusRefreshTimeIntervalMs;
- }
-
- @Override
- public int getWaitTimeInMsWhenSyncEmpty() {
- return waitTimeInMsWhenSyncEmpty;
- }
-
- public void setWaitTimeInMsWhenSyncEmpty(int waitTimeInMsWhenSyncEmpty) {
- this.waitTimeInMsWhenSyncEmpty = waitTimeInMsWhenSyncEmpty;
- }
-
- @Override
- public int getPeerNodeConnectTimeoutMs() {
- return peerNodeConnectTimeoutMs;
- }
-
- public void setPeerNodeConnectTimeoutMs(int peerNodeConnectTimeoutMs) {
- this.peerNodeConnectTimeoutMs = peerNodeConnectTimeoutMs;
- }
-
- @Override
- public int getPeerNodeReadTimeoutMs() {
- return peerNodeReadTimeoutMs;
- }
-
- public void setPeerNodeReadTimeoutMs(int peerNodeReadTimeoutMs) {
- this.peerNodeReadTimeoutMs = peerNodeReadTimeoutMs;
- }
-
- @Override
- public int getPeerNodeTotalConnections() {
- return peerNodeTotalConnections;
- }
-
- public void setPeerNodeTotalConnections(int peerNodeTotalConnections) {
- this.peerNodeTotalConnections = peerNodeTotalConnections;
- }
-
- @Override
- public int getPeerNodeTotalConnectionsPerHost() {
- return peerNodeTotalConnectionsPerHost;
- }
-
- public void setPeerNodeTotalConnectionsPerHost(int peerNodeTotalConnectionsPerHost) {
- this.peerNodeTotalConnectionsPerHost = peerNodeTotalConnectionsPerHost;
- }
-
- @Override
- public int getPeerNodeConnectionIdleTimeoutSeconds() {
- return peerNodeConnectionIdleTimeoutSeconds;
- }
-
- public void setPeerNodeConnectionIdleTimeoutSeconds(int peerNodeConnectionIdleTimeoutSeconds) {
- this.peerNodeConnectionIdleTimeoutSeconds = peerNodeConnectionIdleTimeoutSeconds;
- }
-
- @Override
- public long getRetentionTimeInMSInDeltaQueue() {
- return retentionTimeInMSInDeltaQueue;
- }
-
- public void setRetentionTimeInMSInDeltaQueue(long retentionTimeInMSInDeltaQueue) {
- this.retentionTimeInMSInDeltaQueue = retentionTimeInMSInDeltaQueue;
- }
-
- @Override
- public long getDeltaRetentionTimerIntervalInMs() {
- return deltaRetentionTimerIntervalInMs;
- }
-
- public void setDeltaRetentionTimerIntervalInMs(long deltaRetentionTimerIntervalInMs) {
- this.deltaRetentionTimerIntervalInMs = deltaRetentionTimerIntervalInMs;
- }
-
- @Override
- public long getEvictionIntervalTimerInMs() {
- return evictionIntervalTimerInMs;
- }
-
- @Override
- public boolean shouldUseAwsAsgApi() {
- return this.useAwsAsgApi;
- }
-
- public void setUseAwsAsgApi(boolean useAwsAsgApi) {
- this.useAwsAsgApi = useAwsAsgApi;
- }
-
- public void setEvictionIntervalTimerInMs(long evictionIntervalTimerInMs) {
- this.evictionIntervalTimerInMs = evictionIntervalTimerInMs;
- }
-
- public int getASGQueryTimeoutMs() {
- return aSGQueryTimeoutMs;
- }
-
- public void setASGQueryTimeoutMs(int aSGQueryTimeoutMs) {
- this.aSGQueryTimeoutMs = aSGQueryTimeoutMs;
- }
-
- public long getASGUpdateIntervalMs() {
- return aSGUpdateIntervalMs;
- }
-
- public void setASGUpdateIntervalMs(long aSGUpdateIntervalMs) {
- this.aSGUpdateIntervalMs = aSGUpdateIntervalMs;
- }
-
- public long getASGCacheExpiryTimeoutMs() {
- return aSGCacheExpiryTimeoutMs;
- }
-
- public void setASGCacheExpiryTimeoutMs(long aSGCacheExpiryTimeoutMs) {
- this.aSGCacheExpiryTimeoutMs = aSGCacheExpiryTimeoutMs;
- }
-
- @Override
- public long getResponseCacheAutoExpirationInSeconds() {
- return responseCacheAutoExpirationInSeconds;
- }
-
- public void setResponseCacheAutoExpirationInSeconds(long responseCacheAutoExpirationInSeconds) {
- this.responseCacheAutoExpirationInSeconds = responseCacheAutoExpirationInSeconds;
- }
-
- @Override
- public long getResponseCacheUpdateIntervalMs() {
- return responseCacheUpdateIntervalMs;
- }
-
- public void setResponseCacheUpdateIntervalMs(long responseCacheUpdateIntervalMs) {
- this.responseCacheUpdateIntervalMs = responseCacheUpdateIntervalMs;
- }
-
- public boolean isUseReadOnlyResponseCache() {
- return useReadOnlyResponseCache;
- }
-
- public void setUseReadOnlyResponseCache(boolean useReadOnlyResponseCache) {
- this.useReadOnlyResponseCache = useReadOnlyResponseCache;
- }
-
- public boolean isDisableDelta() {
- return disableDelta;
- }
-
- public void setDisableDelta(boolean disableDelta) {
- this.disableDelta = disableDelta;
- }
-
- @Override
- public long getMaxIdleThreadInMinutesAgeForStatusReplication() {
- return maxIdleThreadInMinutesAgeForStatusReplication;
- }
-
- public void setMaxIdleThreadInMinutesAgeForStatusReplication(long maxIdleThreadInMinutesAgeForStatusReplication) {
- this.maxIdleThreadInMinutesAgeForStatusReplication = maxIdleThreadInMinutesAgeForStatusReplication;
- }
-
- @Override
- public int getMinThreadsForStatusReplication() {
- return minThreadsForStatusReplication;
- }
-
- public void setMinThreadsForStatusReplication(int minThreadsForStatusReplication) {
- this.minThreadsForStatusReplication = minThreadsForStatusReplication;
- }
-
- @Override
- public int getMaxThreadsForStatusReplication() {
- return maxThreadsForStatusReplication;
- }
-
- public void setMaxThreadsForStatusReplication(int maxThreadsForStatusReplication) {
- this.maxThreadsForStatusReplication = maxThreadsForStatusReplication;
- }
-
- @Override
- public int getMaxElementsInStatusReplicationPool() {
- return maxElementsInStatusReplicationPool;
- }
-
- public void setMaxElementsInStatusReplicationPool(int maxElementsInStatusReplicationPool) {
- this.maxElementsInStatusReplicationPool = maxElementsInStatusReplicationPool;
- }
-
- public boolean isSyncWhenTimestampDiffers() {
- return syncWhenTimestampDiffers;
- }
-
- public void setSyncWhenTimestampDiffers(boolean syncWhenTimestampDiffers) {
- this.syncWhenTimestampDiffers = syncWhenTimestampDiffers;
- }
-
- @Override
- public int getRegistrySyncRetries() {
- return registrySyncRetries;
- }
-
- public void setRegistrySyncRetries(int registrySyncRetries) {
- this.registrySyncRetries = registrySyncRetries;
- }
-
- @Override
- public long getRegistrySyncRetryWaitMs() {
- return registrySyncRetryWaitMs;
- }
-
- public void setRegistrySyncRetryWaitMs(long registrySyncRetryWaitMs) {
- this.registrySyncRetryWaitMs = registrySyncRetryWaitMs;
- }
-
- @Override
- public int getMaxElementsInPeerReplicationPool() {
- return maxElementsInPeerReplicationPool;
- }
-
- public void setMaxElementsInPeerReplicationPool(int maxElementsInPeerReplicationPool) {
- this.maxElementsInPeerReplicationPool = maxElementsInPeerReplicationPool;
- }
-
- @Override
- public long getMaxIdleThreadAgeInMinutesForPeerReplication() {
- return maxIdleThreadAgeInMinutesForPeerReplication;
- }
-
- public void setMaxIdleThreadAgeInMinutesForPeerReplication(long maxIdleThreadAgeInMinutesForPeerReplication) {
- this.maxIdleThreadAgeInMinutesForPeerReplication = maxIdleThreadAgeInMinutesForPeerReplication;
- }
-
- @Override
- public int getMinThreadsForPeerReplication() {
- return minThreadsForPeerReplication;
- }
-
- public void setMinThreadsForPeerReplication(int minThreadsForPeerReplication) {
- this.minThreadsForPeerReplication = minThreadsForPeerReplication;
- }
-
- @Override
- public int getMaxThreadsForPeerReplication() {
- return maxThreadsForPeerReplication;
- }
-
- public void setMaxThreadsForPeerReplication(int maxThreadsForPeerReplication) {
- this.maxThreadsForPeerReplication = maxThreadsForPeerReplication;
- }
-
- @Override
- public int getMaxTimeForReplication() {
- return maxTimeForReplication;
- }
-
- public void setMaxTimeForReplication(int maxTimeForReplication) {
- this.maxTimeForReplication = maxTimeForReplication;
- }
-
- public boolean isPrimeAwsReplicaConnections() {
- return primeAwsReplicaConnections;
- }
-
- public void setPrimeAwsReplicaConnections(boolean primeAwsReplicaConnections) {
- this.primeAwsReplicaConnections = primeAwsReplicaConnections;
- }
-
- public boolean isDisableDeltaForRemoteRegions() {
- return disableDeltaForRemoteRegions;
- }
-
- public void setDisableDeltaForRemoteRegions(boolean disableDeltaForRemoteRegions) {
- this.disableDeltaForRemoteRegions = disableDeltaForRemoteRegions;
- }
-
- @Override
- public int getRemoteRegionConnectTimeoutMs() {
- return remoteRegionConnectTimeoutMs;
- }
-
- public void setRemoteRegionConnectTimeoutMs(int remoteRegionConnectTimeoutMs) {
- this.remoteRegionConnectTimeoutMs = remoteRegionConnectTimeoutMs;
- }
-
- @Override
- public int getRemoteRegionReadTimeoutMs() {
- return remoteRegionReadTimeoutMs;
- }
-
- public void setRemoteRegionReadTimeoutMs(int remoteRegionReadTimeoutMs) {
- this.remoteRegionReadTimeoutMs = remoteRegionReadTimeoutMs;
- }
-
- @Override
- public int getRemoteRegionTotalConnections() {
- return remoteRegionTotalConnections;
- }
-
- public void setRemoteRegionTotalConnections(int remoteRegionTotalConnections) {
- this.remoteRegionTotalConnections = remoteRegionTotalConnections;
- }
-
- @Override
- public int getRemoteRegionTotalConnectionsPerHost() {
- return remoteRegionTotalConnectionsPerHost;
- }
-
- public void setRemoteRegionTotalConnectionsPerHost(int remoteRegionTotalConnectionsPerHost) {
- this.remoteRegionTotalConnectionsPerHost = remoteRegionTotalConnectionsPerHost;
- }
-
- @Override
- public int getRemoteRegionConnectionIdleTimeoutSeconds() {
- return remoteRegionConnectionIdleTimeoutSeconds;
- }
-
- public void setRemoteRegionConnectionIdleTimeoutSeconds(int remoteRegionConnectionIdleTimeoutSeconds) {
- this.remoteRegionConnectionIdleTimeoutSeconds = remoteRegionConnectionIdleTimeoutSeconds;
- }
-
- public boolean isgZipContentFromRemoteRegion() {
- return gZipContentFromRemoteRegion;
- }
-
- public void setgZipContentFromRemoteRegion(boolean gZipContentFromRemoteRegion) {
- this.gZipContentFromRemoteRegion = gZipContentFromRemoteRegion;
- }
-
- @Override
- public Map getRemoteRegionUrlsWithName() {
- return remoteRegionUrlsWithName;
- }
-
- public void setRemoteRegionUrlsWithName(Map remoteRegionUrlsWithName) {
- this.remoteRegionUrlsWithName = remoteRegionUrlsWithName;
- }
-
- @Override
- public String[] getRemoteRegionUrls() {
- return remoteRegionUrls;
- }
-
- public void setRemoteRegionUrls(String[] remoteRegionUrls) {
- this.remoteRegionUrls = remoteRegionUrls;
- }
-
- public Map> getRemoteRegionAppWhitelist() {
- return remoteRegionAppWhitelist;
- }
-
- public void setRemoteRegionAppWhitelist(Map> remoteRegionAppWhitelist) {
- this.remoteRegionAppWhitelist = remoteRegionAppWhitelist;
- }
-
- @Override
- public int getRemoteRegionRegistryFetchInterval() {
- return remoteRegionRegistryFetchInterval;
- }
-
- public void setRemoteRegionRegistryFetchInterval(int remoteRegionRegistryFetchInterval) {
- this.remoteRegionRegistryFetchInterval = remoteRegionRegistryFetchInterval;
- }
-
- @Override
- public int getRemoteRegionFetchThreadPoolSize() {
- return remoteRegionFetchThreadPoolSize;
- }
-
- public void setRemoteRegionFetchThreadPoolSize(int remoteRegionFetchThreadPoolSize) {
- this.remoteRegionFetchThreadPoolSize = remoteRegionFetchThreadPoolSize;
- }
-
- @Override
- public String getRemoteRegionTrustStore() {
- return remoteRegionTrustStore;
- }
-
- public void setRemoteRegionTrustStore(String remoteRegionTrustStore) {
- this.remoteRegionTrustStore = remoteRegionTrustStore;
- }
-
- @Override
- public String getRemoteRegionTrustStorePassword() {
- return remoteRegionTrustStorePassword;
- }
-
- public void setRemoteRegionTrustStorePassword(String remoteRegionTrustStorePassword) {
- this.remoteRegionTrustStorePassword = remoteRegionTrustStorePassword;
- }
-
- public boolean isDisableTransparentFallbackToOtherRegion() {
- return disableTransparentFallbackToOtherRegion;
- }
-
- public void setDisableTransparentFallbackToOtherRegion(boolean disableTransparentFallbackToOtherRegion) {
- this.disableTransparentFallbackToOtherRegion = disableTransparentFallbackToOtherRegion;
- }
-
- public boolean isBatchReplication() {
- return batchReplication;
- }
-
- public void setBatchReplication(boolean batchReplication) {
- this.batchReplication = batchReplication;
- }
-
- @Override
- public boolean isRateLimiterEnabled() {
- return rateLimiterEnabled;
- }
-
- public void setRateLimiterEnabled(boolean rateLimiterEnabled) {
- this.rateLimiterEnabled = rateLimiterEnabled;
- }
-
- @Override
- public boolean isRateLimiterThrottleStandardClients() {
- return rateLimiterThrottleStandardClients;
- }
-
- public void setRateLimiterThrottleStandardClients(boolean rateLimiterThrottleStandardClients) {
- this.rateLimiterThrottleStandardClients = rateLimiterThrottleStandardClients;
- }
-
- @Override
- public Set getRateLimiterPrivilegedClients() {
- return rateLimiterPrivilegedClients;
- }
-
- public void setRateLimiterPrivilegedClients(Set rateLimiterPrivilegedClients) {
- this.rateLimiterPrivilegedClients = rateLimiterPrivilegedClients;
- }
-
- @Override
- public int getRateLimiterBurstSize() {
- return rateLimiterBurstSize;
- }
-
- public void setRateLimiterBurstSize(int rateLimiterBurstSize) {
- this.rateLimiterBurstSize = rateLimiterBurstSize;
- }
-
- @Override
- public int getRateLimiterRegistryFetchAverageRate() {
- return rateLimiterRegistryFetchAverageRate;
- }
-
- public void setRateLimiterRegistryFetchAverageRate(int rateLimiterRegistryFetchAverageRate) {
- this.rateLimiterRegistryFetchAverageRate = rateLimiterRegistryFetchAverageRate;
- }
-
- @Override
- public int getRateLimiterFullFetchAverageRate() {
- return rateLimiterFullFetchAverageRate;
- }
-
- public void setRateLimiterFullFetchAverageRate(int rateLimiterFullFetchAverageRate) {
- this.rateLimiterFullFetchAverageRate = rateLimiterFullFetchAverageRate;
- }
-
- public boolean isLogIdentityHeaders() {
- return logIdentityHeaders;
- }
-
- public void setLogIdentityHeaders(boolean logIdentityHeaders) {
- this.logIdentityHeaders = logIdentityHeaders;
- }
-
- @Override
- public String getListAutoScalingGroupsRoleName() {
- return listAutoScalingGroupsRoleName;
- }
-
- public void setListAutoScalingGroupsRoleName(String listAutoScalingGroupsRoleName) {
- this.listAutoScalingGroupsRoleName = listAutoScalingGroupsRoleName;
- }
-
- public boolean isEnableReplicatedRequestCompression() {
- return enableReplicatedRequestCompression;
- }
-
- public void setEnableReplicatedRequestCompression(boolean enableReplicatedRequestCompression) {
- this.enableReplicatedRequestCompression = enableReplicatedRequestCompression;
- }
-
- public void setJsonCodecName(String jsonCodecName) {
- this.jsonCodecName = jsonCodecName;
- }
-
- public void setXmlCodecName(String xmlCodecName) {
- this.xmlCodecName = xmlCodecName;
- }
-
- @Override
- public int getRoute53BindRebindRetries() {
- return route53BindRebindRetries;
- }
-
- public void setRoute53BindRebindRetries(int route53BindRebindRetries) {
- this.route53BindRebindRetries = route53BindRebindRetries;
- }
-
- @Override
- public int getRoute53BindingRetryIntervalMs() {
- return route53BindingRetryIntervalMs;
- }
-
- public void setRoute53BindingRetryIntervalMs(int route53BindingRetryIntervalMs) {
- this.route53BindingRetryIntervalMs = route53BindingRetryIntervalMs;
- }
-
- @Override
- public long getRoute53DomainTTL() {
- return route53DomainTTL;
- }
-
- public void setRoute53DomainTTL(long route53DomainTTL) {
- this.route53DomainTTL = route53DomainTTL;
- }
-
- @Override
- public AwsBindingStrategy getBindingStrategy() {
- return bindingStrategy;
- }
-
- public void setBindingStrategy(AwsBindingStrategy bindingStrategy) {
- this.bindingStrategy = bindingStrategy;
- }
-
- public int getMinAvailableInstancesForPeerReplication() {
- return minAvailableInstancesForPeerReplication;
- }
-
- public void setMinAvailableInstancesForPeerReplication(int minAvailableInstancesForPeerReplication) {
- this.minAvailableInstancesForPeerReplication = minAvailableInstancesForPeerReplication;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaServerConfigBean that = (EurekaServerConfigBean) o;
- return aSGCacheExpiryTimeoutMs == that.aSGCacheExpiryTimeoutMs && aSGQueryTimeoutMs == that.aSGQueryTimeoutMs
- && aSGUpdateIntervalMs == that.aSGUpdateIntervalMs && Objects.equals(aWSAccessId, that.aWSAccessId)
- && Objects.equals(aWSSecretKey, that.aWSSecretKey) && batchReplication == that.batchReplication
- && bindingStrategy == that.bindingStrategy
- && deltaRetentionTimerIntervalInMs == that.deltaRetentionTimerIntervalInMs
- && disableDelta == that.disableDelta
- && disableDeltaForRemoteRegions == that.disableDeltaForRemoteRegions
- && disableTransparentFallbackToOtherRegion == that.disableTransparentFallbackToOtherRegion
- && eIPBindingRetryIntervalMs == that.eIPBindingRetryIntervalMs
- && eIPBindingRetryIntervalMsWhenUnbound == that.eIPBindingRetryIntervalMsWhenUnbound
- && eIPBindRebindRetries == that.eIPBindRebindRetries
- && enableReplicatedRequestCompression == that.enableReplicatedRequestCompression
- && enableSelfPreservation == that.enableSelfPreservation
- && evictionIntervalTimerInMs == that.evictionIntervalTimerInMs
- && gZipContentFromRemoteRegion == that.gZipContentFromRemoteRegion
- && Objects.equals(jsonCodecName, that.jsonCodecName)
- && Objects.equals(listAutoScalingGroupsRoleName, that.listAutoScalingGroupsRoleName)
- && logIdentityHeaders == that.logIdentityHeaders
- && maxElementsInPeerReplicationPool == that.maxElementsInPeerReplicationPool
- && maxElementsInStatusReplicationPool == that.maxElementsInStatusReplicationPool
- && maxIdleThreadAgeInMinutesForPeerReplication == that.maxIdleThreadAgeInMinutesForPeerReplication
- && maxIdleThreadInMinutesAgeForStatusReplication == that.maxIdleThreadInMinutesAgeForStatusReplication
- && maxThreadsForPeerReplication == that.maxThreadsForPeerReplication
- && maxThreadsForStatusReplication == that.maxThreadsForStatusReplication
- && maxTimeForReplication == that.maxTimeForReplication
- && minAvailableInstancesForPeerReplication == that.minAvailableInstancesForPeerReplication
- && minThreadsForPeerReplication == that.minThreadsForPeerReplication
- && minThreadsForStatusReplication == that.minThreadsForStatusReplication
- && numberOfReplicationRetries == that.numberOfReplicationRetries
- && peerEurekaNodesUpdateIntervalMs == that.peerEurekaNodesUpdateIntervalMs
- && peerEurekaStatusRefreshTimeIntervalMs == that.peerEurekaStatusRefreshTimeIntervalMs
- && peerNodeConnectionIdleTimeoutSeconds == that.peerNodeConnectionIdleTimeoutSeconds
- && peerNodeConnectTimeoutMs == that.peerNodeConnectTimeoutMs
- && peerNodeReadTimeoutMs == that.peerNodeReadTimeoutMs
- && peerNodeTotalConnections == that.peerNodeTotalConnections
- && peerNodeTotalConnectionsPerHost == that.peerNodeTotalConnectionsPerHost
- && primeAwsReplicaConnections == that.primeAwsReplicaConnections
- && Objects.equals(propertyResolver, that.propertyResolver)
- && rateLimiterBurstSize == that.rateLimiterBurstSize && rateLimiterEnabled == that.rateLimiterEnabled
- && rateLimiterFullFetchAverageRate == that.rateLimiterFullFetchAverageRate
- && Objects.equals(rateLimiterPrivilegedClients, that.rateLimiterPrivilegedClients)
- && rateLimiterRegistryFetchAverageRate == that.rateLimiterRegistryFetchAverageRate
- && rateLimiterThrottleStandardClients == that.rateLimiterThrottleStandardClients
- && registrySyncRetries == that.registrySyncRetries
- && registrySyncRetryWaitMs == that.registrySyncRetryWaitMs
- && Objects.equals(remoteRegionAppWhitelist, that.remoteRegionAppWhitelist)
- && remoteRegionConnectionIdleTimeoutSeconds == that.remoteRegionConnectionIdleTimeoutSeconds
- && remoteRegionConnectTimeoutMs == that.remoteRegionConnectTimeoutMs
- && remoteRegionFetchThreadPoolSize == that.remoteRegionFetchThreadPoolSize
- && remoteRegionReadTimeoutMs == that.remoteRegionReadTimeoutMs
- && remoteRegionRegistryFetchInterval == that.remoteRegionRegistryFetchInterval
- && remoteRegionTotalConnections == that.remoteRegionTotalConnections
- && remoteRegionTotalConnectionsPerHost == that.remoteRegionTotalConnectionsPerHost
- && Objects.equals(remoteRegionTrustStore, that.remoteRegionTrustStore)
- && Objects.equals(remoteRegionTrustStorePassword, that.remoteRegionTrustStorePassword)
- && Arrays.equals(remoteRegionUrls, that.remoteRegionUrls)
- && Objects.equals(remoteRegionUrlsWithName, that.remoteRegionUrlsWithName)
- && Double.compare(that.renewalPercentThreshold, renewalPercentThreshold) == 0
- && renewalThresholdUpdateIntervalMs == that.renewalThresholdUpdateIntervalMs
- && responseCacheAutoExpirationInSeconds == that.responseCacheAutoExpirationInSeconds
- && responseCacheUpdateIntervalMs == that.responseCacheUpdateIntervalMs
- && retentionTimeInMSInDeltaQueue == that.retentionTimeInMSInDeltaQueue
- && route53BindingRetryIntervalMs == that.route53BindingRetryIntervalMs
- && route53BindRebindRetries == that.route53BindRebindRetries
- && route53DomainTTL == that.route53DomainTTL
- && syncWhenTimestampDiffers == that.syncWhenTimestampDiffers
- && useReadOnlyResponseCache == that.useReadOnlyResponseCache
- && waitTimeInMsWhenSyncEmpty == that.waitTimeInMsWhenSyncEmpty
- && Objects.equals(xmlCodecName, that.xmlCodecName)
- && initialCapacityOfResponseCache == that.initialCapacityOfResponseCache
- && expectedClientRenewalIntervalSeconds == that.expectedClientRenewalIntervalSeconds
- && useAwsAsgApi == that.useAwsAsgApi && Objects.equals(myUrl, that.myUrl);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(aSGCacheExpiryTimeoutMs, aSGQueryTimeoutMs, aSGUpdateIntervalMs, aWSAccessId, aWSSecretKey,
- batchReplication, bindingStrategy, deltaRetentionTimerIntervalInMs, disableDelta,
- disableDeltaForRemoteRegions, disableTransparentFallbackToOtherRegion, eIPBindRebindRetries,
- eIPBindingRetryIntervalMs, eIPBindingRetryIntervalMsWhenUnbound, enableReplicatedRequestCompression,
- enableSelfPreservation, evictionIntervalTimerInMs, gZipContentFromRemoteRegion, jsonCodecName,
- listAutoScalingGroupsRoleName, logIdentityHeaders, maxElementsInPeerReplicationPool,
- maxElementsInStatusReplicationPool, maxIdleThreadAgeInMinutesForPeerReplication,
- maxIdleThreadInMinutesAgeForStatusReplication, maxThreadsForPeerReplication,
- maxThreadsForStatusReplication, maxTimeForReplication, minAvailableInstancesForPeerReplication,
- minThreadsForPeerReplication, minThreadsForStatusReplication, numberOfReplicationRetries,
- peerEurekaNodesUpdateIntervalMs, peerEurekaStatusRefreshTimeIntervalMs, peerNodeConnectTimeoutMs,
- peerNodeConnectionIdleTimeoutSeconds, peerNodeReadTimeoutMs, peerNodeTotalConnections,
- peerNodeTotalConnectionsPerHost, primeAwsReplicaConnections, propertyResolver, rateLimiterBurstSize,
- rateLimiterEnabled, rateLimiterFullFetchAverageRate, rateLimiterPrivilegedClients,
- rateLimiterRegistryFetchAverageRate, rateLimiterThrottleStandardClients, registrySyncRetries,
- registrySyncRetryWaitMs, remoteRegionAppWhitelist, remoteRegionConnectTimeoutMs,
- remoteRegionConnectionIdleTimeoutSeconds, remoteRegionFetchThreadPoolSize, remoteRegionReadTimeoutMs,
- remoteRegionRegistryFetchInterval, remoteRegionTotalConnections, remoteRegionTotalConnectionsPerHost,
- remoteRegionTrustStore, remoteRegionTrustStorePassword, Arrays.hashCode(remoteRegionUrls),
- remoteRegionUrlsWithName, renewalPercentThreshold, renewalThresholdUpdateIntervalMs,
- responseCacheAutoExpirationInSeconds, responseCacheUpdateIntervalMs, retentionTimeInMSInDeltaQueue,
- route53BindRebindRetries, route53BindingRetryIntervalMs, route53DomainTTL, syncWhenTimestampDiffers,
- useReadOnlyResponseCache, waitTimeInMsWhenSyncEmpty, xmlCodecName, initialCapacityOfResponseCache,
- expectedClientRenewalIntervalSeconds, useAwsAsgApi, myUrl);
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this).append("aSGCacheExpiryTimeoutMs", this.aSGCacheExpiryTimeoutMs)
- .append("aSGQueryTimeoutMs", this.aSGQueryTimeoutMs)
- .append("aSGUpdateIntervalMs", this.aSGUpdateIntervalMs).append("aWSAccessId", this.aWSAccessId)
- .append("aWSSecretKey", this.aWSSecretKey).append("batchReplication", this.batchReplication)
- .append("bindingStrategy", this.bindingStrategy)
- .append("deltaRetentionTimerIntervalInMs", this.deltaRetentionTimerIntervalInMs)
- .append("disableDelta", this.disableDelta)
- .append("disableDeltaForRemoteRegions", this.disableDeltaForRemoteRegions)
- .append("disableTransparentFallbackToOtherRegion", this.disableTransparentFallbackToOtherRegion)
- .append("eIPBindRebindRetries", this.eIPBindRebindRetries)
- .append("eIPBindingRetryIntervalMs", this.eIPBindingRetryIntervalMs)
- .append("eIPBindingRetryIntervalMsWhenUnbound", this.eIPBindingRetryIntervalMsWhenUnbound)
- .append("enableReplicatedRequestCompression", this.enableReplicatedRequestCompression)
- .append("enableSelfPreservation", this.enableSelfPreservation)
- .append("evictionIntervalTimerInMs", this.evictionIntervalTimerInMs)
- .append("gZipContentFromRemoteRegion", this.gZipContentFromRemoteRegion)
- .append("jsonCodecName", this.jsonCodecName)
- .append("listAutoScalingGroupsRoleName", this.listAutoScalingGroupsRoleName)
- .append("logIdentityHeaders", this.logIdentityHeaders)
- .append("maxElementsInPeerReplicationPool", this.maxElementsInPeerReplicationPool)
- .append("maxElementsInStatusReplicationPool", this.maxElementsInStatusReplicationPool)
- .append("maxIdleThreadAgeInMinutesForPeerReplication", this.maxIdleThreadAgeInMinutesForPeerReplication)
- .append("maxIdleThreadInMinutesAgeForStatusReplication",
- this.maxIdleThreadInMinutesAgeForStatusReplication)
- .append("maxThreadsForPeerReplication", this.maxThreadsForPeerReplication)
- .append("maxThreadsForStatusReplication", this.maxThreadsForStatusReplication)
- .append("maxTimeForReplication", this.maxTimeForReplication)
- .append("minAvailableInstancesForPeerReplication", this.minAvailableInstancesForPeerReplication)
- .append("minThreadsForPeerReplication", this.minThreadsForPeerReplication)
- .append("minThreadsForStatusReplication", this.minThreadsForStatusReplication)
- .append("numberOfReplicationRetries", this.numberOfReplicationRetries)
- .append("peerEurekaNodesUpdateIntervalMs", this.peerEurekaNodesUpdateIntervalMs)
- .append("peerEurekaStatusRefreshTimeIntervalMs", this.peerEurekaStatusRefreshTimeIntervalMs)
- .append("peerNodeConnectTimeoutMs", this.peerNodeConnectTimeoutMs)
- .append("peerNodeConnectionIdleTimeoutSeconds", this.peerNodeConnectionIdleTimeoutSeconds)
- .append("peerNodeReadTimeoutMs", this.peerNodeReadTimeoutMs)
- .append("peerNodeTotalConnections", this.peerNodeTotalConnections)
- .append("peerNodeTotalConnectionsPerHost", this.peerNodeTotalConnectionsPerHost)
- .append("primeAwsReplicaConnections", this.primeAwsReplicaConnections)
- .append("propertyResolver", this.propertyResolver)
- .append("rateLimiterBurstSize", this.rateLimiterBurstSize)
- .append("rateLimiterEnabled", this.rateLimiterEnabled)
- .append("rateLimiterFullFetchAverageRate", this.rateLimiterFullFetchAverageRate)
- .append("rateLimiterPrivilegedClients", this.rateLimiterPrivilegedClients)
- .append("rateLimiterRegistryFetchAverageRate", this.rateLimiterRegistryFetchAverageRate)
- .append("rateLimiterThrottleStandardClients", this.rateLimiterThrottleStandardClients)
- .append("registrySyncRetries", this.registrySyncRetries)
- .append("registrySyncRetryWaitMs", this.registrySyncRetryWaitMs)
- .append("remoteRegionAppWhitelist", this.remoteRegionAppWhitelist)
- .append("remoteRegionConnectTimeoutMs", this.remoteRegionConnectTimeoutMs)
- .append("remoteRegionConnectionIdleTimeoutSeconds", this.remoteRegionConnectionIdleTimeoutSeconds)
- .append("remoteRegionFetchThreadPoolSize", this.remoteRegionFetchThreadPoolSize)
- .append("remoteRegionReadTimeoutMs", this.remoteRegionReadTimeoutMs)
- .append("remoteRegionRegistryFetchInterval", this.remoteRegionRegistryFetchInterval)
- .append("remoteRegionTotalConnections", this.remoteRegionTotalConnections)
- .append("remoteRegionTotalConnectionsPerHost", this.remoteRegionTotalConnectionsPerHost)
- .append("remoteRegionTrustStore", this.remoteRegionTrustStore)
- .append("remoteRegionTrustStorePassword", this.remoteRegionTrustStorePassword)
- .append("remoteRegionUrls", this.remoteRegionUrls)
- .append("remoteRegionUrlsWithName", this.remoteRegionUrlsWithName)
- .append("renewalPercentThreshold", this.renewalPercentThreshold)
- .append("renewalThresholdUpdateIntervalMs", this.renewalThresholdUpdateIntervalMs)
- .append("responseCacheAutoExpirationInSeconds", this.responseCacheAutoExpirationInSeconds)
- .append("responseCacheUpdateIntervalMs", this.responseCacheUpdateIntervalMs)
- .append("retentionTimeInMSInDeltaQueue", this.retentionTimeInMSInDeltaQueue)
- .append("route53BindRebindRetries", this.route53BindRebindRetries)
- .append("route53BindingRetryIntervalMs", this.route53BindingRetryIntervalMs)
- .append("route53DomainTTL", this.route53DomainTTL)
- .append("syncWhenTimestampDiffers", this.syncWhenTimestampDiffers)
- .append("useReadOnlyResponseCache", this.useReadOnlyResponseCache)
- .append("waitTimeInMsWhenSyncEmpty", this.waitTimeInMsWhenSyncEmpty)
- .append("xmlCodecName", this.xmlCodecName)
- .append("initialCapacityOfResponseCache", this.initialCapacityOfResponseCache)
- .append("expectedClientRenewalIntervalSeconds", this.expectedClientRenewalIntervalSeconds)
- .append("useAwsAsgApi", this.useAwsAsgApi).append("myUrl", this.myUrl).toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
deleted file mode 100644
index 0af1cfbab..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import com.netflix.eureka.EurekaServerConfig;
-import jakarta.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaRegistryAvailableEvent;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaServerStartedEvent;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.web.context.ServletContextAware;
-
-/**
- * @author Dave Syer
- */
-@Configuration(proxyBeanMethods = false)
-public class EurekaServerInitializerConfiguration implements ServletContextAware, SmartLifecycle, Ordered {
-
- private static final Log log = LogFactory.getLog(EurekaServerInitializerConfiguration.class);
-
- @Autowired
- private EurekaServerConfig eurekaServerConfig;
-
- private ServletContext servletContext;
-
- @Autowired
- private ApplicationContext applicationContext;
-
- @Autowired
- private EurekaServerBootstrap eurekaServerBootstrap;
-
- private boolean running;
-
- private final int order = 1;
-
- @Override
- public void setServletContext(ServletContext servletContext) {
- this.servletContext = servletContext;
- }
-
- @Override
- public void start() {
- new Thread(() -> {
- try {
- // TODO: is this class even needed now?
- eurekaServerBootstrap.contextInitialized(EurekaServerInitializerConfiguration.this.servletContext);
- log.info("Started Eureka Server");
-
- publish(new EurekaRegistryAvailableEvent(getEurekaServerConfig()));
- EurekaServerInitializerConfiguration.this.running = true;
- publish(new EurekaServerStartedEvent(getEurekaServerConfig()));
- }
- catch (Exception ex) {
- // Help!
- log.error("Could not initialize Eureka servlet context", ex);
- }
- }).start();
- }
-
- private EurekaServerConfig getEurekaServerConfig() {
- return this.eurekaServerConfig;
- }
-
- private void publish(ApplicationEvent event) {
- this.applicationContext.publishEvent(event);
- }
-
- @Override
- public void stop() {
- this.running = false;
- eurekaServerBootstrap.contextDestroyed(this.servletContext);
- }
-
- @Override
- public boolean isRunning() {
- return this.running;
- }
-
- @Override
- public int getPhase() {
- return 0;
- }
-
- @Override
- public boolean isAutoStartup() {
- return true;
- }
-
- @Override
- public int getOrder() {
- return this.order;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java
deleted file mode 100644
index 2fde952ee..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017-2022 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.netflix.eureka.server;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Responsible for adding in a marker bean to activate
- * {@link EurekaServerAutoConfiguration}.
- *
- * @author Biju Kunjummen
- */
-@Configuration(proxyBeanMethods = false)
-public class EurekaServerMarkerConfiguration {
-
- @Bean
- public Marker eurekaServerMarkerBean() {
- return new Marker();
- }
-
- class Marker {
-
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
deleted file mode 100644
index ff903e50b..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.Application;
-import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.lease.Lease;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl;
-import com.netflix.eureka.resources.ServerCodecs;
-import com.netflix.eureka.transport.EurekaServerHttpClientFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCanceledEvent;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRegisteredEvent;
-import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRenewedEvent;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Spencer Gibb
- */
-public class InstanceRegistry extends PeerAwareInstanceRegistryImpl implements ApplicationContextAware {
-
- private static final Log log = LogFactory.getLog(InstanceRegistry.class);
-
- private ApplicationContext ctxt;
-
- private final int defaultOpenForTrafficCount;
-
- public InstanceRegistry(EurekaServerConfig serverConfig, EurekaClientConfig clientConfig, ServerCodecs serverCodecs,
- EurekaClient eurekaClient, EurekaServerHttpClientFactory eurekaServerHttpClientFactory,
- int expectedNumberOfClientsSendingRenews, int defaultOpenForTrafficCount) {
- super(serverConfig, clientConfig, serverCodecs, eurekaClient, eurekaServerHttpClientFactory);
-
- this.expectedNumberOfClientsSendingRenews = expectedNumberOfClientsSendingRenews;
- this.defaultOpenForTrafficCount = defaultOpenForTrafficCount;
- }
-
- @Override
- public void setApplicationContext(ApplicationContext context) throws BeansException {
- this.ctxt = context;
- }
-
- /**
- * If
- * {@link PeerAwareInstanceRegistryImpl#openForTraffic(ApplicationInfoManager, int)}
- * is called with a zero argument, it means that leases are not automatically
- * cancelled if the instance hasn't sent any renewals recently. This happens for a
- * standalone server. It seems like a bad default, so we set it to the smallest
- * non-zero value we can, so that any instances that subsequently register can bump up
- * the threshold.
- */
- @Override
- public void openForTraffic(ApplicationInfoManager applicationInfoManager, int count) {
- super.openForTraffic(applicationInfoManager, count == 0 ? this.defaultOpenForTrafficCount : count);
- }
-
- @Override
- public void register(InstanceInfo info, int leaseDuration, boolean isReplication) {
- handleRegistration(info, leaseDuration, isReplication);
- super.register(info, leaseDuration, isReplication);
- }
-
- @Override
- public void register(final InstanceInfo info, final boolean isReplication) {
- handleRegistration(info, resolveInstanceLeaseDuration(info), isReplication);
- super.register(info, isReplication);
- }
-
- @Override
- public boolean cancel(String appName, String serverId, boolean isReplication) {
- handleCancelation(appName, serverId, isReplication);
- return super.cancel(appName, serverId, isReplication);
- }
-
- @Override
- public boolean renew(final String appName, final String serverId, boolean isReplication) {
- log("renew " + appName + " serverId " + serverId + ", isReplication {}" + isReplication);
- Application application = getApplication(appName);
- if (application != null) {
- InstanceInfo instanceInfo = application.getByInstanceId(serverId);
- if (instanceInfo != null) {
- publishEvent(new EurekaInstanceRenewedEvent(this, appName, serverId, instanceInfo, isReplication));
- }
- }
- return super.renew(appName, serverId, isReplication);
- }
-
- @Override
- protected boolean internalCancel(String appName, String id, boolean isReplication) {
- handleCancelation(appName, id, isReplication);
- return super.internalCancel(appName, id, isReplication);
- }
-
- private void handleCancelation(String appName, String id, boolean isReplication) {
- log("cancel " + appName + ", serverId " + id + ", isReplication " + isReplication);
- publishEvent(new EurekaInstanceCanceledEvent(this, appName, id, isReplication));
- }
-
- private void handleRegistration(InstanceInfo info, int leaseDuration, boolean isReplication) {
- log("register " + info.getAppName() + ", vip " + info.getVIPAddress() + ", leaseDuration " + leaseDuration
- + ", isReplication " + isReplication);
- publishEvent(new EurekaInstanceRegisteredEvent(this, info, leaseDuration, isReplication));
- }
-
- private void log(String message) {
- if (log.isDebugEnabled()) {
- log.debug(message);
- }
- }
-
- private void publishEvent(ApplicationEvent applicationEvent) {
- this.ctxt.publishEvent(applicationEvent);
- }
-
- private int resolveInstanceLeaseDuration(final InstanceInfo info) {
- int leaseDuration = Lease.DEFAULT_DURATION_IN_SECS;
- if (info.getLeaseInfo() != null && info.getLeaseInfo().getDurationInSecs() > 0) {
- leaseDuration = info.getLeaseInfo().getDurationInSecs();
- }
- return leaseDuration;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java
deleted file mode 100644
index cbac21450..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryProperties.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import static org.springframework.cloud.netflix.eureka.server.InstanceRegistryProperties.PREFIX;
-
-/**
- * @author Spencer Gibb
- */
-@ConfigurationProperties(PREFIX)
-public class InstanceRegistryProperties {
-
- /**
- * Prefix for Eureka instance registry properties.
- */
- public static final String PREFIX = "eureka.instance.registry";
-
- /*
- * Default number of expected client, defaults to 1. Setting
- * expectedNumberOfClientsSendingRenews to non-zero to ensure that even an isolated
- * server can adjust its eviction policy to the number of registrations (when it's
- * zero, even a successful registration won't reset the rate threshold in
- * InstanceRegistry.register()).
- */
- @Value("${eureka.server.expectedNumberOfRenewsPerMin:1}") // for backwards
- // compatibility
- private int expectedNumberOfClientsSendingRenews = 1;
-
- /**
- * Value used in determining when leases are cancelled, default to 1 for standalone.
- * Should be set to 0 for peer replicated eurekas
- */
- @Value("${eureka.server.defaultOpenForTrafficCount:1}") // for backwards compatibility
- private int defaultOpenForTrafficCount = 1;
-
- public int getExpectedNumberOfClientsSendingRenews() {
- return expectedNumberOfClientsSendingRenews;
- }
-
- public void setExpectedNumberOfClientsSendingRenews(int expectedNumberOfClientsSendingRenews) {
- this.expectedNumberOfClientsSendingRenews = expectedNumberOfClientsSendingRenews;
- }
-
- public int getDefaultOpenForTrafficCount() {
- return defaultOpenForTrafficCount;
- }
-
- public void setDefaultOpenForTrafficCount(int defaultOpenForTrafficCount) {
- this.defaultOpenForTrafficCount = defaultOpenForTrafficCount;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/ReplicationClientAdditionalFilters.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/ReplicationClientAdditionalFilters.java
deleted file mode 100644
index 26b044717..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/ReplicationClientAdditionalFilters.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-
-import jakarta.ws.rs.client.ClientRequestFilter;
-
-/**
- * @author Yuxin Bai
- */
-public class ReplicationClientAdditionalFilters {
-
- private final Collection filters;
-
- public ReplicationClientAdditionalFilters(Collection filters) {
- this.filters = new LinkedHashSet<>(filters);
- }
-
- public Collection getFilters() {
- return this.filters;
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
deleted file mode 100644
index c4f01ff6f..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server.event;
-
-import java.util.Objects;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Spencer Gibb
- * @author Gregor Zurowski
- */
-@SuppressWarnings("serial")
-public class EurekaInstanceCanceledEvent extends ApplicationEvent {
-
- private String appName;
-
- private String serverId;
-
- private boolean replication;
-
- public EurekaInstanceCanceledEvent(Object source, String appName, String serverId, boolean replication) {
- super(source);
- this.appName = appName;
- this.serverId = serverId;
- this.replication = replication;
- }
-
- public String getAppName() {
- return appName;
- }
-
- public void setAppName(String appName) {
- this.appName = appName;
- }
-
- public String getServerId() {
- return serverId;
- }
-
- public void setServerId(String serverId) {
- this.serverId = serverId;
- }
-
- public boolean isReplication() {
- return replication;
- }
-
- public void setReplication(boolean replication) {
- this.replication = replication;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaInstanceCanceledEvent that = (EurekaInstanceCanceledEvent) o;
- return this.replication == that.replication && Objects.equals(this.appName, that.appName)
- && Objects.equals(this.serverId, that.serverId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(appName, serverId, replication);
- }
-
- @Override
- public String toString() {
- return new StringBuilder("EurekaInstanceCanceledEvent{").append("appName='").append(appName).append("', ")
- .append("serverId='").append(serverId).append("', ").append("replication=").append(replication)
- .append("}").toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
deleted file mode 100644
index c6776b7e8..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server.event;
-
-import java.util.Objects;
-
-import com.netflix.appinfo.InstanceInfo;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Spencer Gibb
- * @author Gregor Zurowski
- */
-@SuppressWarnings("serial")
-public class EurekaInstanceRegisteredEvent extends ApplicationEvent {
-
- private InstanceInfo instanceInfo;
-
- private int leaseDuration;
-
- private boolean replication;
-
- public EurekaInstanceRegisteredEvent(Object source, InstanceInfo instanceInfo, int leaseDuration,
- boolean replication) {
- super(source);
- this.instanceInfo = instanceInfo;
- this.leaseDuration = leaseDuration;
- this.replication = replication;
- }
-
- public InstanceInfo getInstanceInfo() {
- return instanceInfo;
- }
-
- public void setInstanceInfo(InstanceInfo instanceInfo) {
- this.instanceInfo = instanceInfo;
- }
-
- public int getLeaseDuration() {
- return leaseDuration;
- }
-
- public void setLeaseDuration(int leaseDuration) {
- this.leaseDuration = leaseDuration;
- }
-
- public boolean isReplication() {
- return replication;
- }
-
- public void setReplication(boolean replication) {
- this.replication = replication;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaInstanceRegisteredEvent that = (EurekaInstanceRegisteredEvent) o;
- return this.leaseDuration == that.leaseDuration && this.replication == that.replication
- && Objects.equals(this.instanceInfo, that.instanceInfo);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(instanceInfo, leaseDuration, replication);
- }
-
- @Override
- public String toString() {
- return new StringBuilder("EurekaInstanceRegisteredEvent{").append("instanceInfo=").append(instanceInfo)
- .append(", ").append("leaseDuration=").append(leaseDuration).append(", ").append("replication=")
- .append(replication).append("}").toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java
deleted file mode 100644
index 2999d7a5e..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server.event;
-
-import java.util.Objects;
-
-import com.netflix.appinfo.InstanceInfo;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Spencer Gibb
- * @author Gregor Zurowski
- */
-@SuppressWarnings("serial")
-public class EurekaInstanceRenewedEvent extends ApplicationEvent {
-
- private String appName;
-
- private String serverId;
-
- private InstanceInfo instanceInfo;
-
- private boolean replication;
-
- public EurekaInstanceRenewedEvent(Object source, String appName, String serverId, InstanceInfo instanceInfo,
- boolean replication) {
- super(source);
- this.appName = appName;
- this.serverId = serverId;
- this.instanceInfo = instanceInfo;
- this.replication = replication;
- }
-
- public String getAppName() {
- return appName;
- }
-
- public void setAppName(String appName) {
- this.appName = appName;
- }
-
- public String getServerId() {
- return serverId;
- }
-
- public void setServerId(String serverId) {
- this.serverId = serverId;
- }
-
- public InstanceInfo getInstanceInfo() {
- return instanceInfo;
- }
-
- public void setInstanceInfo(InstanceInfo instanceInfo) {
- this.instanceInfo = instanceInfo;
- }
-
- public boolean isReplication() {
- return replication;
- }
-
- public void setReplication(boolean replication) {
- this.replication = replication;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EurekaInstanceRenewedEvent that = (EurekaInstanceRenewedEvent) o;
- return Objects.equals(appName, that.appName) && Objects.equals(serverId, that.serverId)
- && Objects.equals(instanceInfo, that.instanceInfo) && replication == that.replication;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(appName, serverId, instanceInfo, replication);
- }
-
- @Override
- public String toString() {
- return new StringBuilder("EurekaInstanceRenewedEvent{").append("appName='").append(appName).append("', ")
- .append("serverId='").append(serverId).append("', ").append("instanceInfo=").append(instanceInfo)
- .append(", ").append("replication=").append(replication).append("}").toString();
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java
deleted file mode 100644
index 06a8832fd..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server.event;
-
-import com.netflix.eureka.EurekaServerConfig;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Dave Syer
- */
-@SuppressWarnings("serial")
-public class EurekaRegistryAvailableEvent extends ApplicationEvent {
-
- /**
- * @param eurekaServerConfig {@link EurekaServerConfig} event source
- */
- public EurekaRegistryAvailableEvent(EurekaServerConfig eurekaServerConfig) {
- super(eurekaServerConfig);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java
deleted file mode 100644
index 7c158bd7b..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2013-2022 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.netflix.eureka.server.event;
-
-import com.netflix.eureka.EurekaServerConfig;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * @author Dave Syer
- */
-@SuppressWarnings("serial")
-public class EurekaServerStartedEvent extends ApplicationEvent {
-
- /**
- * @param eurekaServerConfig {@link EurekaServerConfig} event source
- */
- public EurekaServerStartedEvent(EurekaServerConfig eurekaServerConfig) {
- super(eurekaServerConfig);
- }
-
-}
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-netflix-eureka-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index e6f8989cd..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/eureka/server.properties b/spring-cloud-netflix-eureka-server/src/main/resources/eureka/server.properties
deleted file mode 100644
index c08e1571a..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/resources/eureka/server.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-server.servlet.encoding.force=false
-
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.eot b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.eot
deleted file mode 100644
index 0caea9169..000000000
Binary files a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.eot and /dev/null differ
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.svg b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.svg
deleted file mode 100644
index 51fb329e3..000000000
--- a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/montserrat-webfont.svg
+++ /dev/null
@@ -1,1283 +0,0 @@
-
-
-