SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow overriding getScheme on DefaultServiceInstance. (#1168)"

Browse Source 
This reverts commit 5015b13f22.
This commit is contained in:
Olga Maciaszek-Sharma
2022-11-08 18:19:56 +01:00
parent e41b59d140
commit 5b7e03b133
5 changed files with 9 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.cloud.client;
import java.net.URI;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -29,20 +28,15 @@ import java.util.Objects;
* @author Tim Ysewyn
* @author Charu Covindane
* @author Neil Powell
* @author Olga Maciaszek-Sharma
*/
public class DefaultServiceInstance implements ServiceInstance {
private final List<String> secureSchemes = List.of("https", "wss");
private String instanceId;
private String serviceId;
private String host;
private String scheme;
private int port;
private boolean secure;
@@ -61,27 +55,12 @@ public class DefaultServiceInstance implements ServiceInstance {
*/
public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure,
Map<String, String> metadata) {
this(instanceId, serviceId, host, port, secure, metadata, secure ? "https" : "http");
}
/**
* @param instanceId the id of the instance.
* @param serviceId the id of the service.
* @param host the host where the service instance can be found.
* @param port the port on which the service is running.
* @param secure indicates whether or not the connection needs to be secure.
* @param metadata a map containing metadata.
* @param scheme the protocol used to connect to the service instance.
*/
public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure,
Map<String, String> metadata, String scheme) {
this.instanceId = instanceId;
this.serviceId = serviceId;
this.host = host;
this.port = port;
this.secure = secure;
this.metadata = metadata;
this.scheme = scheme;
}
/**
@@ -98,19 +77,6 @@ public class DefaultServiceInstance implements ServiceInstance {
public DefaultServiceInstance() {
}
/**
* @param instanceId the id of the instance.
* @param serviceId the id of the service.
* @param host the host where the service instance can be found.
* @param port the port on which the service is running.
* @param secure indicates whether or not the connection needs to be secure.
* @param scheme the protocol used to connect to the service instance.
*/
public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure,
String scheme) {
this(instanceId, serviceId, host, port, secure, new LinkedHashMap<>(), scheme);
}
/**
* Creates a URI from the given ServiceInstance's host:port.
* @param instance the ServiceInstance.
@@ -118,7 +84,7 @@ public class DefaultServiceInstance implements ServiceInstance {
* if port not set.
*/
public static URI getUri(ServiceInstance instance) {
String scheme = instance.getScheme();
String scheme = (instance.isSecure()) ? "https" : "http";
int port = instance.getPort();
if (port <= 0) {
port = (instance.isSecure()) ? 443 : 80;
@@ -182,8 +148,8 @@ public class DefaultServiceInstance implements ServiceInstance {
this.uri = uri;
this.host = this.uri.getHost();
this.port = this.uri.getPort();
scheme = this.uri.getScheme();
if (secureSchemes.contains(scheme)) {
String scheme = this.uri.getScheme();
if ("https".equals(scheme)) {
this.secure = true;
}
}
@@ -213,9 +179,4 @@ public class DefaultServiceInstance implements ServiceInstance {
return Objects.hash(instanceId, serviceId, host, port, secure, metadata);
}
@Override
public String getScheme() {
return scheme;
}
}

6
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,8 +87,4 @@ public class SimpleDiscoveryProperties implements InitializingBean {
local = new DefaultServiceInstance(null, serviceId, host, port, false);
}
public void setInstance(String serviceId, String host, int port, String scheme) {
local = new DefaultServiceInstance(null, serviceId, host, port, false, scheme);
}
}

11
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import static org.assertj.core.api.BDDAssertions.then;
* Tests for mapping properties to instances in {@link SimpleDiscoveryClient}.
*
* @author Biju Kunjummen
* @author Olga Maciaszek-Sharma
*/
@SpringBootTest(properties = { "spring.application.name=service0",
@@ -74,14 +73,6 @@ public class SimpleDiscoveryClientPropertiesMappingTests {
then(s1.getPort()).isEqualTo(8080);
then(s1.getUri()).isEqualTo(URI.create("http://s11:8080"));
then(s1.isSecure()).isEqualTo(false);
then(s1.getScheme()).isEqualTo("http");
ServiceInstance s2 = this.discoveryClient.getInstances("service1").get(1);
then(s2.getHost()).isEqualTo("s12");
then(s2.getPort()).isEqualTo(8443);
then(s2.getUri()).isEqualTo(URI.create("https://s12:8443"));
then(s2.isSecure()).isEqualTo(true);
then(s2.getScheme()).isEqualTo("https");
}
@Test

13
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java
View File

@@ -34,7 +34,6 @@ import static org.assertj.core.api.BDDAssertions.then;
* @author Biju Kunjummen
* @author Charu Covindane
* @author Neil Powell
* @author Olga Maciaszek-Sharma
*/
public class SimpleDiscoveryClientTests {
@@ -48,8 +47,7 @@ public class SimpleDiscoveryClientTests {
DefaultServiceInstance service1Inst1 = new DefaultServiceInstance(null, null, "host1", 8080, false);
DefaultServiceInstance service1Inst2 = new DefaultServiceInstance(null, null, "host2", 0, true);
DefaultServiceInstance service1Inst3 = new DefaultServiceInstance(null, null, "host3", 0, false);
DefaultServiceInstance service1Inst4 = new DefaultServiceInstance(null, null, "host4", 8443, true);
map.put("service1", Arrays.asList(service1Inst1, service1Inst2, service1Inst3, service1Inst4));
map.put("service1", Arrays.asList(service1Inst1, service1Inst2, service1Inst3));
simpleDiscoveryProperties.setInstances(map);
simpleDiscoveryProperties.afterPropertiesSet();
this.simpleDiscoveryClient = new SimpleDiscoveryClient(simpleDiscoveryProperties);
@@ -58,7 +56,7 @@ public class SimpleDiscoveryClientTests {
@Test
public void shouldBeAbleToRetrieveServiceDetailsByName() {
List<ServiceInstance> instances = this.simpleDiscoveryClient.getInstances("service1");
then(instances.size()).isEqualTo(4);
then(instances.size()).isEqualTo(3);
then(instances.get(0).getServiceId()).isEqualTo("service1");
then(instances.get(0).getHost()).isEqualTo("host1");
then(instances.get(0).getPort()).isEqualTo(8080);
@@ -79,13 +77,6 @@ public class SimpleDiscoveryClientTests {
then(instances.get(2).getUri()).isEqualTo(URI.create("http://host3:80"));
then(instances.get(2).isSecure()).isEqualTo(false);
then(instances.get(2).getMetadata()).isNotNull();
then(instances.get(3).getServiceId()).isEqualTo("service1");
then(instances.get(3).getHost()).isEqualTo("host4");
then(instances.get(3).getPort()).isEqualTo(8443);
then(instances.get(3).getUri()).isEqualTo(URI.create("https://host4:8443"));
then(instances.get(3).isSecure()).isEqualTo(true);
then(instances.get(3).getMetadata()).isNotNull();
}
}

2
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java
View File

@@ -156,7 +156,7 @@ class HealthCheckServiceInstanceListSupplierTests {
String serviceId = "ignored-service";
properties.getHealthCheck().getPath().put("ignored-service", "/health");
ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", serviceId, "127.0.0.1", port,
false, "http");
false);
listSupplier = new HealthCheckServiceInstanceListSupplier(
ServiceInstanceListSuppliers.from(serviceId, serviceInstance),
buildLoadBalancerClientFactory(serviceId, properties), healthCheckFunction(restTemplate));