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

Refactor and add javadocs.

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2021-07-28 11:50:48 +02:00
parent de32d2b68c
commit bc42390206
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java
View File

@@ -48,6 +48,7 @@ import org.springframework.web.util.UriComponentsBuilder;
* @author Spencer Gibb
* @author Olga Maciaszek-Sharma
* @author Zhiguo Chen
* @author Sabyasachi Bhattacharya
*/
public final class ServiceInstanceListSupplierBuilder {
@@ -311,7 +312,7 @@ public final class ServiceInstanceListSupplierBuilder {
}));
}
private String getUri(ServiceInstance serviceInstance, String healthCheckPath) {
static String getUri(ServiceInstance serviceInstance, String healthCheckPath) {
if (StringUtils.hasText(healthCheckPath)) {
String path = healthCheckPath.startsWith("/") ? healthCheckPath : "/" + healthCheckPath;
return serviceInstance.getUri().toString() + path;

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

@@ -62,6 +62,7 @@ import static org.springframework.cloud.loadbalancer.core.ServiceInstanceListSup
* @author Olga Maciaszek-Sharma
* @author Roman Matiushchenko
* @author Roman Chigvintsev
* @author Sabyasachi Bhattacharya
*/
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = HealthCheckServiceInstanceListSupplierTests.TestApplication.class,

12
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSuppliersTestUtils.java
View File

@@ -23,15 +23,17 @@ import reactor.core.publisher.Mono;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.http.HttpStatus;
import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.util.UriComponentsBuilder;
import static org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplierBuilder.getUri;
/**
* A utility class for {@link ServiceInstanceListSupplier} tests.
*
* @author Olga Maciaszek-Sharma
* @author Sabyasachi Bhattacharya
* @since 3.0.0
*/
final class ServiceInstanceListSuppliersTestUtils {
@@ -59,12 +61,4 @@ final class ServiceInstanceListSuppliersTestUtils {
});
}
private static String getUri(ServiceInstance serviceInstance, String healthCheckPath) {
if (StringUtils.hasText(healthCheckPath)) {
String path = healthCheckPath.startsWith("/") ? healthCheckPath : "/" + healthCheckPath;
return serviceInstance.getUri().toString() + path;
}
return serviceInstance.getUri().toString();
}
}