diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java index 1bfdd132..58d318dc 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java @@ -61,14 +61,12 @@ public class CommonsClientAutoConfiguration { @Bean @ConditionalOnDiscoveryHealthIndicatorEnabled public DiscoveryClientHealthIndicator discoveryClientHealthIndicator( - ObjectProvider discoveryClient, - DiscoveryClientHealthIndicatorProperties properties) { + ObjectProvider discoveryClient, DiscoveryClientHealthIndicatorProperties properties) { return new DiscoveryClientHealthIndicator(discoveryClient, properties); } @Bean - @ConditionalOnProperty( - value = "spring.cloud.discovery.client.composite-indicator.enabled", + @ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true) @ConditionalOnBean({ DiscoveryHealthIndicator.class }) public DiscoveryCompositeHealthContributor discoveryCompositeHealthContributor( @@ -78,8 +76,7 @@ public class CommonsClientAutoConfiguration { @Bean public HasFeatures commonsFeatures() { - return HasFeatures.abstractFeatures(DiscoveryClient.class, - LoadBalancerClient.class); + return HasFeatures.abstractFeatures(DiscoveryClient.class, LoadBalancerClient.class); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnBlockingDiscoveryEnabled.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnBlockingDiscoveryEnabled.java index efdd7704..e6a495a0 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnBlockingDiscoveryEnabled.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnBlockingDiscoveryEnabled.java @@ -36,8 +36,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@ConditionalOnProperty(value = "spring.cloud.discovery.blocking.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.discovery.blocking.enabled", matchIfMissing = true) public @interface ConditionalOnBlockingDiscoveryEnabled { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnDiscoveryHealthIndicatorEnabled.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnDiscoveryHealthIndicatorEnabled.java index 2d9bd868..918f1d6a 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnDiscoveryHealthIndicatorEnabled.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnDiscoveryHealthIndicatorEnabled.java @@ -36,8 +36,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@ConditionalOnProperty(value = "spring.cloud.discovery.client.health-indicator.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.discovery.client.health-indicator.enabled", matchIfMissing = true) public @interface ConditionalOnDiscoveryHealthIndicatorEnabled { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnReactiveDiscoveryEnabled.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnReactiveDiscoveryEnabled.java index 0869843b..540658da 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnReactiveDiscoveryEnabled.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnReactiveDiscoveryEnabled.java @@ -39,8 +39,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Documented @Inherited @ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient") -@ConditionalOnProperty(value = "spring.cloud.discovery.reactive.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.discovery.reactive.enabled", matchIfMissing = true) public @interface ConditionalOnReactiveDiscoveryEnabled { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java index 7f92c17e..2ed54b9f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java @@ -49,8 +49,8 @@ public class DefaultServiceInstance implements ServiceInstance { * @param secure indicates whether or not the connection needs to be secure. * @param metadata a map containing metadata. */ - public DefaultServiceInstance(String instanceId, String serviceId, String host, - int port, boolean secure, Map metadata) { + public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure, + Map metadata) { this.instanceId = instanceId; this.serviceId = serviceId; this.host = host; @@ -66,8 +66,7 @@ public class DefaultServiceInstance implements ServiceInstance { * @param port the port on which the service is running. * @param secure indicates whether or not the connection needs to be secure. */ - public DefaultServiceInstance(String instanceId, String serviceId, String host, - int port, boolean secure) { + public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure) { this(instanceId, serviceId, host, port, secure, new LinkedHashMap<>()); } @@ -93,8 +92,7 @@ public class DefaultServiceInstance implements ServiceInstance { * @deprecated - use other constructors */ @Deprecated - public DefaultServiceInstance(String serviceId, String host, int port, - boolean secure) { + public DefaultServiceInstance(String serviceId, String host, int port, boolean secure) { this(serviceId, host, port, secure, new LinkedHashMap<>()); } @@ -105,8 +103,7 @@ public class DefaultServiceInstance implements ServiceInstance { */ public static URI getUri(ServiceInstance instance) { String scheme = (instance.isSecure()) ? "https" : "http"; - String uri = String.format("%s://%s:%s", scheme, instance.getHost(), - instance.getPort()); + String uri = String.format("%s://%s:%s", scheme, instance.getHost(), instance.getPort()); return URI.create(uri); } @@ -147,10 +144,9 @@ public class DefaultServiceInstance implements ServiceInstance { @Override public String toString() { - return "DefaultServiceInstance{" + "instanceId='" + this.instanceId + '\'' - + ", serviceId='" + this.serviceId + '\'' + ", host='" + this.host + '\'' - + ", port=" + this.port + ", secure=" + this.secure + ", metadata=" - + this.metadata + '}'; + return "DefaultServiceInstance{" + "instanceId='" + this.instanceId + '\'' + ", serviceId='" + this.serviceId + + '\'' + ", host='" + this.host + '\'' + ", port=" + this.port + ", secure=" + this.secure + + ", metadata=" + this.metadata + '}'; } @Override @@ -162,17 +158,14 @@ public class DefaultServiceInstance implements ServiceInstance { return false; } DefaultServiceInstance that = (DefaultServiceInstance) o; - return this.port == that.port && this.secure == that.secure - && Objects.equals(this.instanceId, that.instanceId) - && Objects.equals(this.serviceId, that.serviceId) - && Objects.equals(this.host, that.host) + return this.port == that.port && this.secure == that.secure && Objects.equals(this.instanceId, that.instanceId) + && Objects.equals(this.serviceId, that.serviceId) && Objects.equals(this.host, that.host) && Objects.equals(this.metadata, that.metadata); } @Override public int hashCode() { - return Objects.hash(this.instanceId, this.serviceId, this.host, this.port, - this.secure, this.metadata); + return Objects.hash(this.instanceId, this.serviceId, this.host, this.port, this.secure, this.metadata); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java index cf61c6cb..92a88210 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java @@ -34,8 +34,7 @@ import org.springframework.core.env.MapPropertySource; /** * @author Spencer Gibb */ -public class HostInfoEnvironmentPostProcessor - implements EnvironmentPostProcessor, Ordered { +public class HostInfoEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { // Before ConfigFileApplicationListener private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1; @@ -46,22 +45,19 @@ public class HostInfoEnvironmentPostProcessor } @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { InetUtils.HostInfo hostInfo = getFirstNonLoopbackHostInfo(environment); LinkedHashMap map = new LinkedHashMap<>(); map.put("spring.cloud.client.hostname", hostInfo.getHostname()); map.put("spring.cloud.client.ip-address", hostInfo.getIpAddress()); - MapPropertySource propertySource = new MapPropertySource( - "springCloudClientHostInfo", map); + MapPropertySource propertySource = new MapPropertySource("springCloudClientHostInfo", map); environment.getPropertySources().addLast(propertySource); } private HostInfo getFirstNonLoopbackHostInfo(ConfigurableEnvironment environment) { InetUtilsProperties target = new InetUtilsProperties(); ConfigurationPropertySources.attach(environment); - Binder.get(environment).bind(InetUtilsProperties.PREFIX, - Bindable.ofInstance(target)); + Binder.get(environment).bind(InetUtilsProperties.PREFIX, Bindable.ofInstance(target)); try (InetUtils utils = new InetUtils(target)) { return utils.findFirstNonLoopbackHostInfo(); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java index 88033bca..baf71c58 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java @@ -52,8 +52,7 @@ public class ReactiveCommonsClientAutoConfiguration { protected static class ReactiveDiscoveryLoadBalancerConfiguration { @Bean - @ConditionalOnProperty( - value = "spring.cloud.discovery.client.composite-indicator.enabled", + @ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true) @ConditionalOnBean({ ReactiveDiscoveryHealthIndicator.class }) public ReactiveDiscoveryCompositeHealthContributor reactiveDiscoveryClients( @@ -63,8 +62,7 @@ public class ReactiveCommonsClientAutoConfiguration { @Bean public HasFeatures reactiveCommonsFeatures() { - return HasFeatures.abstractFeatures(ReactiveDiscoveryClient.class, - ReactiveLoadBalancer.class); + return HasFeatures.abstractFeatures(ReactiveDiscoveryClient.class, ReactiveLoadBalancer.class); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java index 094cbc4f..6ccd313c 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java @@ -82,10 +82,8 @@ public class FeaturesEndpoint implements ApplicationContextAware { private void addFeature(Features features, NamedFeature feature) { Class type = feature.getType(); - features.getEnabled() - .add(new Feature(feature.getName(), type.getCanonicalName(), - type.getPackage().getImplementationVersion(), - type.getPackage().getImplementationVendor())); + features.getEnabled().add(new Feature(feature.getName(), type.getCanonicalName(), + type.getPackage().getImplementationVersion(), type.getPackage().getImplementationVendor())); } static class Features { @@ -139,9 +137,8 @@ public class FeaturesEndpoint implements ApplicationContextAware { @Override public String toString() { - return "Feature{" + "type='" + this.type + '\'' + ", name='" + this.name - + '\'' + ", version='" + this.version + '\'' + ", vendor='" - + this.vendor + '\'' + '}'; + return "Feature{" + "type='" + this.type + '\'' + ", name='" + this.name + '\'' + ", version='" + + this.version + '\'' + ", vendor='" + this.vendor + '\'' + '}'; } @Override @@ -155,20 +152,16 @@ public class FeaturesEndpoint implements ApplicationContextAware { Feature feature = (Feature) o; - if (this.type != null ? !this.type.equals(feature.type) - : feature.type != null) { + if (this.type != null ? !this.type.equals(feature.type) : feature.type != null) { return false; } - if (this.name != null ? !this.name.equals(feature.name) - : feature.name != null) { + if (this.name != null ? !this.name.equals(feature.name) : feature.name != null) { return false; } - if (this.version != null ? !this.version.equals(feature.version) - : feature.version != null) { + if (this.version != null ? !this.version.equals(feature.version) : feature.version != null) { return false; } - return this.vendor != null ? this.vendor.equals(feature.vendor) - : feature.vendor == null; + return this.vendor != null ? this.vendor.equals(feature.vendor) : feature.vendor == null; } @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/HasFeatures.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/HasFeatures.java index e453fe8f..2d7faedd 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/HasFeatures.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/HasFeatures.java @@ -30,30 +30,25 @@ public class HasFeatures { private final List namedFeatures = new ArrayList<>(); - public HasFeatures(List> abstractFeatures, - List namedFeatures) { + public HasFeatures(List> abstractFeatures, List namedFeatures) { this.abstractFeatures.addAll(abstractFeatures); this.namedFeatures.addAll(namedFeatures); } public static HasFeatures abstractFeatures(Class... abstractFeatures) { - return new HasFeatures(Arrays.asList(abstractFeatures), - Collections.emptyList()); + return new HasFeatures(Arrays.asList(abstractFeatures), Collections.emptyList()); } public static HasFeatures namedFeatures(NamedFeature... namedFeatures) { - return new HasFeatures(Collections.>emptyList(), - Arrays.asList(namedFeatures)); + return new HasFeatures(Collections.>emptyList(), Arrays.asList(namedFeatures)); } public static HasFeatures namedFeature(String name, Class type) { return namedFeatures(new NamedFeature(name, type)); } - public static HasFeatures namedFeatures(String name1, Class type1, String name2, - Class type2) { - return namedFeatures(new NamedFeature(name1, type1), - new NamedFeature(name2, type2)); + public static HasFeatures namedFeatures(String name1, Class type1, String name2, Class type2) { + return namedFeatures(new NamedFeature(name1, type1), new NamedFeature(name2, type2)); } public List> getAbstractFeatures() { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/Customizer.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/Customizer.java index 67d5a508..e46c218d 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/Customizer.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/Customizer.java @@ -39,8 +39,7 @@ public interface Customizer { * @param the type of the identifier of the target * @return a wrapped customizer */ - static Customizer once(Customizer customizer, - Function keyMapper) { + static Customizer once(Customizer customizer, Function keyMapper) { final ConcurrentMap customized = new ConcurrentHashMap<>(); return t -> { final K key = keyMapper.apply(t); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java index e0846fff..6c86d2e1 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreakerImportSelector.java @@ -26,13 +26,11 @@ import org.springframework.core.annotation.Order; * @author Spencer Gibb */ @Order(Ordered.LOWEST_PRECEDENCE - 100) -public class EnableCircuitBreakerImportSelector - extends SpringFactoryImportSelector { +public class EnableCircuitBreakerImportSelector extends SpringFactoryImportSelector { @Override protected boolean isEnabled() { - return getEnvironment().getProperty("spring.cloud.circuit.breaker.enabled", - Boolean.class, Boolean.TRUE); + return getEnvironment().getProperty("spring.cloud.circuit.breaker.enabled", Boolean.class, Boolean.TRUE); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java index 25958db6..4e65623b 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelector.java @@ -34,22 +34,20 @@ import org.springframework.core.type.AnnotationMetadata; * @author Spencer Gibb */ @Order(Ordered.LOWEST_PRECEDENCE - 100) -public class EnableDiscoveryClientImportSelector - extends SpringFactoryImportSelector { +public class EnableDiscoveryClientImportSelector extends SpringFactoryImportSelector { @Override public String[] selectImports(AnnotationMetadata metadata) { String[] imports = super.selectImports(metadata); - AnnotationAttributes attributes = AnnotationAttributes.fromMap( - metadata.getAnnotationAttributes(getAnnotationClass().getName(), true)); + AnnotationAttributes attributes = AnnotationAttributes + .fromMap(metadata.getAnnotationAttributes(getAnnotationClass().getName(), true)); boolean autoRegister = attributes.getBoolean("autoRegister"); if (autoRegister) { List importsList = new ArrayList<>(Arrays.asList(imports)); - importsList.add( - "org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration"); + importsList.add("org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration"); imports = importsList.toArray(new String[0]); } else { @@ -58,8 +56,7 @@ public class EnableDiscoveryClientImportSelector ConfigurableEnvironment configEnv = (ConfigurableEnvironment) env; LinkedHashMap map = new LinkedHashMap<>(); map.put("spring.cloud.service-registry.auto-registration.enabled", false); - MapPropertySource propertySource = new MapPropertySource( - "springCloudDiscoveryClient", map); + MapPropertySource propertySource = new MapPropertySource("springCloudDiscoveryClient", map); configEnv.getPropertySources().addLast(propertySource); } @@ -70,8 +67,7 @@ public class EnableDiscoveryClientImportSelector @Override protected boolean isEnabled() { - return getEnvironment().getProperty("spring.cloud.discovery.enabled", - Boolean.class, Boolean.TRUE); + return getEnvironment().getProperty("spring.cloud.discovery.enabled", Boolean.class, Boolean.TRUE); } @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java index 4a24c142..eb2a61b3 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java @@ -33,8 +33,7 @@ public final class ManagementServerPortUtils { static final boolean hasActuator; static { - boolean hasEndpointClass = hasClass( - "org.springframework.boot.actuate.endpoint.annotation.Endpoint"); + boolean hasEndpointClass = hasClass("org.springframework.boot.actuate.endpoint.annotation.Endpoint"); boolean hasManagementServerPropertiesClass = hasClass( "org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties"); hasActuator = hasEndpointClass && hasManagementServerPropertiesClass; @@ -77,8 +76,7 @@ public final class ManagementServerPortUtils { return null; } try { - ManagementServerProperties properties = beanFactory - .getBean(ManagementServerProperties.class); + ManagementServerProperties properties = beanFactory.getBean(ManagementServerProperties.class); return properties.getPort(); } catch (NoSuchBeanDefinitionException ex) { @@ -123,8 +121,7 @@ public final class ManagementServerPortUtils { ManagementServerProperties managementServerProperties; try { - managementServerProperties = beanFactory - .getBean(ManagementServerProperties.class); + managementServerProperties = beanFactory.getBean(ManagementServerProperties.class); } catch (NoSuchBeanDefinitionException ex) { managementServerProperties = new ManagementServerProperties(); @@ -138,10 +135,8 @@ public final class ManagementServerPortUtils { // Current context is not a webapp return DIFFERENT; } - return ((port == null) - || (serverProperties.getPort() == null && port.equals(8080)) - || (port != 0 && port.equals(serverProperties.getPort())) ? SAME - : DIFFERENT); + return ((port == null) || (serverProperties.getPort() == null && port.equals(8080)) + || (port != 0 && port.equals(serverProperties.getPort())) ? SAME : DIFFERENT); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java index c74af79f..4cc47d5d 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java @@ -37,8 +37,7 @@ public class CompositeDiscoveryClientAutoConfiguration { @Bean @Primary - public CompositeDiscoveryClient compositeDiscoveryClient( - List discoveryClients) { + public CompositeDiscoveryClient compositeDiscoveryClient(List discoveryClients) { return new CompositeDiscoveryClient(discoveryClients); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClient.java index 1e366140..fed89acd 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClient.java @@ -36,8 +36,7 @@ public class ReactiveCompositeDiscoveryClient implements ReactiveDiscoveryClient private final List discoveryClients; - public ReactiveCompositeDiscoveryClient( - List discoveryClients) { + public ReactiveCompositeDiscoveryClient(List discoveryClients) { AnnotationAwareOrderComparator.sort(discoveryClients); this.discoveryClients = discoveryClients; } @@ -64,8 +63,7 @@ public class ReactiveCompositeDiscoveryClient implements ReactiveDiscoveryClient if (discoveryClients == null || discoveryClients.isEmpty()) { return Flux.empty(); } - return Flux.fromIterable(discoveryClients) - .flatMap(ReactiveDiscoveryClient::getServices); + return Flux.fromIterable(discoveryClients).flatMap(ReactiveDiscoveryClient::getServices); } List getDiscoveryClients() { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicator.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicator.java index 8701379c..057787dd 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicator.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicator.java @@ -33,8 +33,8 @@ import org.springframework.core.Ordered; /** * @author Spencer Gibb */ -public class DiscoveryClientHealthIndicator implements DiscoveryHealthIndicator, Ordered, - ApplicationListener> { +public class DiscoveryClientHealthIndicator + implements DiscoveryHealthIndicator, Ordered, ApplicationListener> { private final ObjectProvider discoveryClient; @@ -67,10 +67,8 @@ public class DiscoveryClientHealthIndicator implements DiscoveryHealthIndicator, try { DiscoveryClient client = this.discoveryClient.getIfAvailable(); List services = client.getServices(); - String description = (this.properties.isIncludeDescription()) - ? client.description() : ""; - builder.status(new Status("UP", description)).withDetail("services", - services); + String description = (this.properties.isIncludeDescription()) ? client.description() : ""; + builder.status(new Status("UP", description)).withDetail("services", services); } catch (Exception e) { this.log.error("Error", e); @@ -78,8 +76,7 @@ public class DiscoveryClientHealthIndicator implements DiscoveryHealthIndicator, } } else { - builder.status(new Status(Status.UNKNOWN.getCode(), - "Discovery Client not initialized")); + builder.status(new Status(Status.UNKNOWN.getCode(), "Discovery Client not initialized")); } return builder.build(); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java index 6e59f2cb..d73d133c 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorProperties.java @@ -46,8 +46,7 @@ public class DiscoveryClientHealthIndicatorProperties { @Override public String toString() { - final StringBuffer sb = new StringBuffer( - "DiscoveryClientHealthIndicatorProperties{"); + final StringBuffer sb = new StringBuffer("DiscoveryClientHealthIndicatorProperties{"); sb.append("enabled=").append(this.enabled); sb.append(", includeDescription=").append(this.includeDescription); sb.append('}'); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java index 8c1d4e3b..3d15e9a9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java @@ -39,11 +39,10 @@ public class DiscoveryCompositeHealthContributor implements CompositeHealthContr private Map indicators; - public DiscoveryCompositeHealthContributor( - Collection indicators) { + public DiscoveryCompositeHealthContributor(Collection indicators) { Assert.notNull(indicators, "'indicators' must not be null"); - this.indicators = indicators.stream().collect( - Collectors.toMap(DiscoveryHealthIndicator::getName, Function.identity())); + this.indicators = indicators.stream() + .collect(Collectors.toMap(DiscoveryHealthIndicator::getName, Function.identity())); } @Override @@ -56,8 +55,7 @@ public class DiscoveryCompositeHealthContributor implements CompositeHealthContr return this.indicators.values().stream().map(this::asNamedContributor).iterator(); } - private NamedContributor asNamedContributor( - DiscoveryHealthIndicator indicator) { + private NamedContributor asNamedContributor(DiscoveryHealthIndicator indicator) { return new NamedContributor() { @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicator.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicator.java index 2988eaad..24c01153 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicator.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicator.java @@ -39,15 +39,13 @@ import static java.util.Collections.emptyList; * @author Tim Ysewyn */ public class ReactiveDiscoveryClientHealthIndicator - implements ReactiveDiscoveryHealthIndicator, Ordered, - ApplicationListener> { + implements ReactiveDiscoveryHealthIndicator, Ordered, ApplicationListener> { private final ReactiveDiscoveryClient discoveryClient; private final DiscoveryClientHealthIndicatorProperties properties; - private final Log log = LogFactory - .getLog(ReactiveDiscoveryClientHealthIndicator.class); + private final Log log = LogFactory.getLog(ReactiveDiscoveryClientHealthIndicator.class); private AtomicBoolean discoveryInitialized = new AtomicBoolean(false); @@ -72,8 +70,8 @@ public class ReactiveDiscoveryClientHealthIndicator return doHealthCheck(); } else { - return Mono.just(Health.status(new Status(Status.UNKNOWN.getCode(), - "Discovery Client not initialized")).build()); + return Mono.just( + Health.status(new Status(Status.UNKNOWN.getCode(), "Discovery Client not initialized")).build()); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributor.java index ebf3403a..5c4bf745 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributor.java @@ -33,16 +33,14 @@ import org.springframework.util.Assert; * * @author Tim Ysewyn */ -public class ReactiveDiscoveryCompositeHealthContributor - implements CompositeReactiveHealthContributor { +public class ReactiveDiscoveryCompositeHealthContributor implements CompositeReactiveHealthContributor { private Map indicators; - public ReactiveDiscoveryCompositeHealthContributor( - Collection indicators) { + public ReactiveDiscoveryCompositeHealthContributor(Collection indicators) { Assert.notNull(indicators, "'indicators' must not be null"); - this.indicators = indicators.stream().collect(Collectors - .toMap(ReactiveDiscoveryHealthIndicator::getName, Function.identity())); + this.indicators = indicators.stream() + .collect(Collectors.toMap(ReactiveDiscoveryHealthIndicator::getName, Function.identity())); } @Override @@ -55,8 +53,7 @@ public class ReactiveDiscoveryCompositeHealthContributor return indicators.values().stream().map(this::asNamedContributor).iterator(); } - private NamedContributor asNamedContributor( - ReactiveDiscoveryHealthIndicator indicator) { + private NamedContributor asNamedContributor(ReactiveDiscoveryHealthIndicator indicator) { return new NamedContributor() { @Override @@ -72,8 +69,7 @@ public class ReactiveDiscoveryCompositeHealthContributor }; } - private ReactiveHealthIndicator asHealthIndicator( - ReactiveDiscoveryHealthIndicator indicator) { + private ReactiveHealthIndicator asHealthIndicator(ReactiveDiscoveryHealthIndicator indicator) { return (indicator != null) ? indicator::health : null; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java index 4ee5be0d..f7773b02 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java @@ -49,8 +49,7 @@ import org.springframework.core.env.Environment; @EnableConfigurationProperties @ConditionalOnMissingBean(DiscoveryClient.class) @Deprecated -public class NoopDiscoveryClientAutoConfiguration - implements ApplicationListener { +public class NoopDiscoveryClientAutoConfiguration implements ApplicationListener { private final Log log = LogFactory.getLog(NoopDiscoveryClientAutoConfiguration.class); @@ -79,8 +78,7 @@ public class NoopDiscoveryClientAutoConfiguration } int port = findPort(); this.serviceInstance = new DefaultServiceInstance( - this.environment.getProperty("spring.application.name", "application"), - host, port, false); + this.environment.getProperty("spring.application.name", "application"), host, port, false); } private int findPort() { @@ -97,8 +95,7 @@ public class NoopDiscoveryClientAutoConfiguration else { // Apparently spring-web is not on the classpath if (this.log.isDebugEnabled()) { - this.log.debug( - "Could not locate port in embedded container (spring-web not available)"); + this.log.debug("Could not locate port in embedded container (spring-web not available)"); } } return port; @@ -121,8 +118,7 @@ public class NoopDiscoveryClientAutoConfiguration } @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(name = { - "org.springframework.web.context.support.GenericWebApplicationContext", + @ConditionalOnClass(name = { "org.springframework.web.context.support.GenericWebApplicationContext", "org.springframework.boot.context.embedded.EmbeddedWebApplicationContext" }) protected static class Boot15PortFinderConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java index 41a17ce3..f63d5ad4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java @@ -46,8 +46,8 @@ public class SimpleDiscoveryClient implements DiscoveryClient { @Override public List getInstances(String serviceId) { List serviceInstances = new ArrayList<>(); - List serviceInstanceForService = this.simpleDiscoveryProperties - .getInstances().get(serviceId); + List serviceInstanceForService = this.simpleDiscoveryProperties.getInstances() + .get(serviceId); if (serviceInstanceForService != null) { serviceInstances.addAll(serviceInstanceForService); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java index 2e4188c8..417a12ff 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java @@ -39,10 +39,8 @@ import org.springframework.core.annotation.Order; * @author Biju Kunjummen */ @Configuration(proxyBeanMethods = false) -@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class, - CommonsClientAutoConfiguration.class }) -public class SimpleDiscoveryClientAutoConfiguration - implements ApplicationListener { +@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) +public class SimpleDiscoveryClientAutoConfiguration implements ApplicationListener { private ServerProperties server; @@ -67,10 +65,8 @@ public class SimpleDiscoveryClientAutoConfiguration public SimpleDiscoveryProperties simpleDiscoveryProperties( @Value("${spring.application.name:application}") String serviceId) { simple.getLocal().setServiceId(serviceId); - simple.getLocal() - .setUri(URI.create( - "http://" + this.inet.findFirstNonLoopbackHostInfo().getHostname() - + ":" + findPort())); + simple.getLocal().setUri( + URI.create("http://" + this.inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + findPort())); return simple; } @@ -84,8 +80,7 @@ public class SimpleDiscoveryClientAutoConfiguration if (port > 0) { return port; } - if (this.server != null && this.server.getPort() != null - && this.server.getPort() > 0) { + if (this.server != null && this.server.getPort() != null && this.server.getPort() > 0) { return this.server.getPort(); } return 8080; @@ -95,10 +90,8 @@ public class SimpleDiscoveryClientAutoConfiguration public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEvent) { this.port = webServerInitializedEvent.getWebServer().getPort(); if (this.port > 0) { - simple.getLocal() - .setUri(URI.create("http://" - + this.inet.findFirstNonLoopbackHostInfo().getHostname() + ":" - + this.port)); + simple.getLocal().setUri( + URI.create("http://" + this.inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + this.port)); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClient.java index c3029937..d961137e 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClient.java @@ -31,8 +31,7 @@ public class SimpleReactiveDiscoveryClient implements ReactiveDiscoveryClient { private SimpleReactiveDiscoveryProperties simpleDiscoveryProperties; - public SimpleReactiveDiscoveryClient( - SimpleReactiveDiscoveryProperties simpleDiscoveryProperties) { + public SimpleReactiveDiscoveryClient(SimpleReactiveDiscoveryProperties simpleDiscoveryProperties) { this.simpleDiscoveryProperties = simpleDiscoveryProperties; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java index cbc8acd7..d845def1 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java @@ -52,8 +52,7 @@ import org.springframework.core.annotation.Order; @EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class) @AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class) @AutoConfigureAfter(ReactiveCompositeDiscoveryClientAutoConfiguration.class) -public class SimpleReactiveDiscoveryClientAutoConfiguration - implements ApplicationListener { +public class SimpleReactiveDiscoveryClientAutoConfiguration implements ApplicationListener { @Autowired(required = false) private ServerProperties server; @@ -71,8 +70,8 @@ public class SimpleReactiveDiscoveryClientAutoConfiguration @Bean public SimpleReactiveDiscoveryProperties simpleReactiveDiscoveryProperties() { simple.getLocal().setServiceId(serviceId); - simple.getLocal().setUri(URI.create("http://" - + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + findPort())); + simple.getLocal() + .setUri(URI.create("http://" + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + findPort())); return simple; } @@ -96,8 +95,8 @@ public class SimpleReactiveDiscoveryClientAutoConfiguration public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEvent) { port = webServerInitializedEvent.getWebServer().getPort(); if (port > 0) { - simple.getLocal().setUri(URI.create("http://" - + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + port)); + simple.getLocal() + .setUri(URI.create("http://" + inet.findFirstNonLoopbackHostInfo().getHostname() + ":" + port)); } } @@ -110,8 +109,7 @@ public class SimpleReactiveDiscoveryClientAutoConfiguration public ReactiveDiscoveryClientHealthIndicator simpleReactiveDiscoveryClientHealthIndicator( DiscoveryClientHealthIndicatorProperties properties, SimpleReactiveDiscoveryClient simpleReactiveDiscoveryClient) { - return new ReactiveDiscoveryClientHealthIndicator( - simpleReactiveDiscoveryClient, properties); + return new ReactiveDiscoveryClientHealthIndicator(simpleReactiveDiscoveryClient, properties); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java index 59ddeec6..e69ebda7 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java @@ -52,8 +52,7 @@ public class CloudHypermediaAutoConfiguration { @Bean @ConditionalOnMissingBean public RemoteResourceRefresher discoveredResourceRefresher() { - return new RemoteResourceRefresher(this.discoveredResources, - this.properties.getRefresh().getFixedDelay(), + return new RemoteResourceRefresher(this.discoveredResources, this.properties.getRefresh().getFixedDelay(), this.properties.getRefresh().getInitialDelay()); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/DiscoveredResource.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/DiscoveredResource.java index 55166fe3..6c0fc6b9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/DiscoveredResource.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/DiscoveredResource.java @@ -48,8 +48,7 @@ public class DiscoveredResource implements RemoteResource { private Link link = null; - public DiscoveredResource(ServiceInstanceProvider provider, - TraversalDefinition traversal) { + public DiscoveredResource(ServiceInstanceProvider provider, TraversalDefinition traversal) { this.provider = provider; this.traversal = traversal; } @@ -73,8 +72,7 @@ public class DiscoveredResource implements RemoteResource { * {@link RestTemplate} in that case. */ public void setRestOperations(RestOperations restOperations) { - this.restOperations = restOperations == null ? new RestTemplate() - : restOperations; + this.restOperations = restOperations == null ? new RestTemplate() : restOperations; } @Override @@ -133,8 +131,7 @@ public class DiscoveredResource implements RemoteResource { URI uri = service.getUri(); String serviceId = service.getServiceId(); - this.log.debug("Discovered {} system at {}. Discovering resource…", serviceId, - uri); + this.log.debug("Discovered {} system at {}. Discovering resource…", serviceId, uri); Traverson traverson = new Traverson(uri, MediaTypes.HAL_JSON); Link link = this.traversal.buildTraversal(traverson).asTemplatedLink(); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/RemoteResourceRefresher.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/RemoteResourceRefresher.java index 8e07aa25..e173c61b 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/RemoteResourceRefresher.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/RemoteResourceRefresher.java @@ -36,8 +36,7 @@ public class RemoteResourceRefresher extends ContextLifecycleScheduledTaskRegist private final int initialDelay; - public RemoteResourceRefresher(List discoveredResources, - int fixedDelay, int initialDelay) { + public RemoteResourceRefresher(List discoveredResources, int fixedDelay, int initialDelay) { this.discoveredResources = discoveredResources; this.fixedDelay = fixedDelay; this.initialDelay = initialDelay; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java index 96e9c99d..961b668f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java @@ -64,8 +64,7 @@ public class AsyncLoadBalancerAutoConfiguration { static class LoadBalancerInterceptorConfig { @Bean - public AsyncLoadBalancerInterceptor asyncLoadBalancerInterceptor( - LoadBalancerClient loadBalancerClient) { + public AsyncLoadBalancerInterceptor asyncLoadBalancerInterceptor(LoadBalancerClient loadBalancerClient) { return new AsyncLoadBalancerInterceptor(loadBalancerClient); } @@ -73,8 +72,7 @@ public class AsyncLoadBalancerAutoConfiguration { public AsyncRestTemplateCustomizer asyncRestTemplateCustomizer( final AsyncLoadBalancerInterceptor loadBalancerInterceptor) { return restTemplate -> { - List list = new ArrayList<>( - restTemplate.getInterceptors()); + List list = new ArrayList<>(restTemplate.getInterceptors()); list.add(loadBalancerInterceptor); restTemplate.setInterceptors(list); }; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerInterceptor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerInterceptor.java index bec6036e..2be38a1f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerInterceptor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerInterceptor.java @@ -38,22 +38,19 @@ public class AsyncLoadBalancerInterceptor implements AsyncClientHttpRequestInter } @Override - public ListenableFuture intercept(final HttpRequest request, - final byte[] body, final AsyncClientHttpRequestExecution execution) - throws IOException { + public ListenableFuture intercept(final HttpRequest request, final byte[] body, + final AsyncClientHttpRequestExecution execution) throws IOException { final URI originalUri = request.getURI(); String serviceName = originalUri.getHost(); - return this.loadBalancer.execute(serviceName, - new LoadBalancerRequest>() { - @Override - public ListenableFuture apply( - final ServiceInstance instance) throws Exception { - HttpRequest serviceRequest = new ServiceRequestWrapper(request, - instance, AsyncLoadBalancerInterceptor.this.loadBalancer); - return execution.executeAsync(serviceRequest, body); - } + return this.loadBalancer.execute(serviceName, new LoadBalancerRequest>() { + @Override + public ListenableFuture apply(final ServiceInstance instance) throws Exception { + HttpRequest serviceRequest = new ServiceRequestWrapper(request, instance, + AsyncLoadBalancerInterceptor.this.loadBalancer); + return execution.executeAsync(serviceRequest, body); + } - }); + }); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java index f2a9193f..057892d2 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeException.java @@ -41,8 +41,8 @@ public class ClientHttpResponseStatusCodeException extends RetryableStatusCodeEx * @throws IOException Thrown if the {@link ClientHttpResponse} response code cannot * be retrieved. */ - public ClientHttpResponseStatusCodeException(String serviceId, - ClientHttpResponse response, byte[] body) throws IOException { + public ClientHttpResponseStatusCodeException(String serviceId, ClientHttpResponse response, byte[] body) + throws IOException { super(serviceId, response.getRawStatusCode(), response, null); this.response = new ClientHttpResponseWrapper(response, body); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/CompletionContext.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/CompletionContext.java index 5571b3f0..975e63a1 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/CompletionContext.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/CompletionContext.java @@ -43,18 +43,15 @@ public class CompletionContext { this(status, null, response, null); } - public CompletionContext(Status status, Throwable throwable, - Response loadBalancerResponse) { + public CompletionContext(Status status, Throwable throwable, Response loadBalancerResponse) { this(status, throwable, loadBalancerResponse, null); } - public CompletionContext(Status status, Response loadBalancerResponse, - RES clientResponse) { + public CompletionContext(Status status, Response loadBalancerResponse, RES clientResponse) { this(status, null, loadBalancerResponse, clientResponse); } - public CompletionContext(Status status, Throwable throwable, - Response loadBalancerResponse, RES clientResponse) { + public CompletionContext(Status status, Throwable throwable, Response loadBalancerResponse, RES clientResponse) { this.status = status; this.throwable = throwable; this.loadBalancerResponse = loadBalancerResponse; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java index e9ea5dad..e116d854 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java @@ -56,8 +56,7 @@ public class InterceptorRetryPolicy implements RetryPolicy { LoadBalancedRetryContext lbContext = (LoadBalancedRetryContext) context; if (lbContext.getRetryCount() == 0 && lbContext.getServiceInstance() == null) { // We haven't even tried to make the request yet so return true so we do - lbContext.setServiceInstance( - this.serviceInstanceChooser.choose(this.serviceName)); + lbContext.setServiceInstance(this.serviceInstanceChooser.choose(this.serviceName)); return true; } return this.policy.canRetryNextServer(lbContext); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryFactory.java index e05a520c..18385391 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryFactory.java @@ -33,8 +33,7 @@ public interface LoadBalancedRetryFactory { * @param serviceInstanceChooser Used to get the next server from a load balancer. * @return A retry policy for the service. */ - default LoadBalancedRetryPolicy createRetryPolicy(String service, - ServiceInstanceChooser serviceInstanceChooser) { + default LoadBalancedRetryPolicy createRetryPolicy(String service, ServiceInstanceChooser serviceInstanceChooser) { return null; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java index 1079c2ac..feb937e3 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java @@ -72,8 +72,7 @@ public class LoadBalancerAutoConfiguration { @Bean @ConditionalOnMissingBean - public LoadBalancerRequestFactory loadBalancerRequestFactory( - LoadBalancerClient loadBalancerClient) { + public LoadBalancerRequestFactory loadBalancerRequestFactory(LoadBalancerClient loadBalancerClient) { return new LoadBalancerRequestFactory(loadBalancerClient, this.transformers); } @@ -82,19 +81,16 @@ public class LoadBalancerAutoConfiguration { static class LoadBalancerInterceptorConfig { @Bean - public LoadBalancerInterceptor loadBalancerInterceptor( - LoadBalancerClient loadBalancerClient, + public LoadBalancerInterceptor loadBalancerInterceptor(LoadBalancerClient loadBalancerClient, LoadBalancerRequestFactory requestFactory) { return new LoadBalancerInterceptor(loadBalancerClient, requestFactory); } @Bean @ConditionalOnMissingBean - public RestTemplateCustomizer restTemplateCustomizer( - final LoadBalancerInterceptor loadBalancerInterceptor) { + public RestTemplateCustomizer restTemplateCustomizer(final LoadBalancerInterceptor loadBalancerInterceptor) { return restTemplate -> { - List list = new ArrayList<>( - restTemplate.getInterceptors()); + List list = new ArrayList<>(restTemplate.getInterceptors()); list.add(loadBalancerInterceptor); restTemplate.setInterceptors(list); }; @@ -128,16 +124,12 @@ public class LoadBalancerAutoConfiguration { @Bean @ConditionalOnMissingBean - public RetryLoadBalancerInterceptor loadBalancerInterceptor( - LoadBalancerClient loadBalancerClient, - LoadBalancerRetryProperties retryProperties, - LoadBalancerRequestFactory requestFactory, - LoadBalancedRetryFactory loadBalancedRetryFactory, - LoadBalancerProperties properties, + public RetryLoadBalancerInterceptor loadBalancerInterceptor(LoadBalancerClient loadBalancerClient, + LoadBalancerRetryProperties retryProperties, LoadBalancerRequestFactory requestFactory, + LoadBalancedRetryFactory loadBalancedRetryFactory, LoadBalancerProperties properties, ReactiveLoadBalancer.Factory loadBalancerFactory) { - return new RetryLoadBalancerInterceptor(loadBalancerClient, retryProperties, - requestFactory, loadBalancedRetryFactory, properties, - loadBalancerFactory); + return new RetryLoadBalancerInterceptor(loadBalancerClient, retryProperties, requestFactory, + loadBalancedRetryFactory, properties, loadBalancerFactory); } @Bean @@ -145,8 +137,7 @@ public class LoadBalancerAutoConfiguration { public RestTemplateCustomizer restTemplateCustomizer( final RetryLoadBalancerInterceptor loadBalancerInterceptor) { return restTemplate -> { - List list = new ArrayList<>( - restTemplate.getInterceptors()); + List list = new ArrayList<>(restTemplate.getInterceptors()); list.add(loadBalancerInterceptor); restTemplate.setInterceptors(list); }; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerClient.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerClient.java index f2fda30c..33ac91c1 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerClient.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerClient.java @@ -53,8 +53,7 @@ public interface LoadBalancerClient extends ServiceInstanceChooser { * @return The result of the LoadBalancerRequest callback on the selected * ServiceInstance. */ - T execute(String serviceId, ServiceInstance serviceInstance, - LoadBalancerRequest request) throws IOException; + T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) throws IOException; /** * Creates a proper URI with a real host and port for systems to utilize. Some systems diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerInterceptor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerInterceptor.java index 295a327e..06db38a9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerInterceptor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerInterceptor.java @@ -37,8 +37,7 @@ public class LoadBalancerInterceptor implements ClientHttpRequestInterceptor { private LoadBalancerRequestFactory requestFactory; - public LoadBalancerInterceptor(LoadBalancerClient loadBalancer, - LoadBalancerRequestFactory requestFactory) { + public LoadBalancerInterceptor(LoadBalancerClient loadBalancer, LoadBalancerRequestFactory requestFactory) { this.loadBalancer = loadBalancer; this.requestFactory = requestFactory; } @@ -53,10 +52,8 @@ public class LoadBalancerInterceptor implements ClientHttpRequestInterceptor { final ClientHttpRequestExecution execution) throws IOException { final URI originalUri = request.getURI(); String serviceName = originalUri.getHost(); - Assert.state(serviceName != null, - "Request URI does not contain a valid hostname: " + originalUri); - return this.loadBalancer.execute(serviceName, - this.requestFactory.createRequest(request, body, execution)); + Assert.state(serviceName != null, "Request URI does not contain a valid hostname: " + originalUri); + return this.loadBalancer.execute(serviceName, this.requestFactory.createRequest(request, body, execution)); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycle.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycle.java index 12346554..4db50ed6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycle.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycle.java @@ -34,8 +34,7 @@ public interface LoadBalancerLifecycle { * @param serverTypeClass The type of Server that the LoadBalancer retrieves * @return true if the lifecycle should be used to process given classes */ - default boolean supports(Class requestContextClass, Class responseClass, - Class serverTypeClass) { + default boolean supports(Class requestContextClass, Class responseClass, Class serverTypeClass) { return true; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycleValidator.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycleValidator.java index 5f62facf..b51c81f4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycleValidator.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerLifecycleValidator.java @@ -36,14 +36,13 @@ public final class LoadBalancerLifecycleValidator { @SuppressWarnings("rawtypes") public static Set getSupportedLifecycleProcessors( - Map lifecycleProcessors, - Class requestContextClass, Class clientResponseClass, Class serverTypeClass) { + Map lifecycleProcessors, Class requestContextClass, + Class clientResponseClass, Class serverTypeClass) { if (lifecycleProcessors == null) { return new HashSet<>(); } return lifecycleProcessors.values().stream() - .filter(lifecycle -> lifecycle.supports(requestContextClass, - clientResponseClass, serverTypeClass)) + .filter(lifecycle -> lifecycle.supports(requestContextClass, clientResponseClass, serverTypeClass)) .collect(Collectors.toSet()); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactory.java index fe0ead72..2e45bd63 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactory.java @@ -46,16 +46,13 @@ public class LoadBalancerRequestFactory { this.loadBalancer = loadBalancer; } - public LoadBalancerRequest createRequest( - final HttpRequest request, final byte[] body, + public LoadBalancerRequest createRequest(final HttpRequest request, final byte[] body, final ClientHttpRequestExecution execution) { return instance -> { - HttpRequest serviceRequest = new ServiceRequestWrapper(request, instance, - this.loadBalancer); + HttpRequest serviceRequest = new ServiceRequestWrapper(request, instance, this.loadBalancer); if (this.transformers != null) { for (LoadBalancerRequestTransformer transformer : this.transformers) { - serviceRequest = transformer.transformRequest(serviceRequest, - instance); + serviceRequest = transformer.transformRequest(serviceRequest, instance); } } return execution.execute(serviceRequest, body); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java index 27b62cb0..9b8838f1 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriTools.java @@ -53,12 +53,9 @@ public final class LoadBalancerUriTools { // https://github.com/spring-cloud/spring-cloud-gateway/blob/master/spring-cloud-gateway-core/ // src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java private static boolean containsEncodedParts(URI uri) { - boolean encoded = (uri.getRawQuery() != null - && uri.getRawQuery().contains(PERCENTAGE_SIGN)) - || (uri.getRawPath() != null - && uri.getRawPath().contains(PERCENTAGE_SIGN)) - || (uri.getRawFragment() != null - && uri.getRawFragment().contains(PERCENTAGE_SIGN)); + boolean encoded = (uri.getRawQuery() != null && uri.getRawQuery().contains(PERCENTAGE_SIGN)) + || (uri.getRawPath() != null && uri.getRawPath().contains(PERCENTAGE_SIGN)) + || (uri.getRawFragment() != null && uri.getRawFragment().contains(PERCENTAGE_SIGN)); // Verify if it is really fully encoded. Treat partial encoded as unencoded. if (encoded) { try { @@ -107,15 +104,12 @@ public final class LoadBalancerUriTools { } boolean encoded = containsEncodedParts(original); - return UriComponentsBuilder.fromUri(original).scheme(scheme).host(host).port(port) - .build(encoded).toUri(); + return UriComponentsBuilder.fromUri(original).scheme(scheme).host(host).port(port).build(encoded).toUri(); } private static String computeScheme(URI original, ServiceInstance serviceInstance) { - String originalOrDefault = Optional.ofNullable(original.getScheme()) - .orElse(DEFAULT_SCHEME); - if (serviceInstance.isSecure() - && INSECURE_SCHEME_MAPPINGS.containsKey(originalOrDefault)) { + String originalOrDefault = Optional.ofNullable(original.getScheme()).orElse(DEFAULT_SCHEME); + if (serviceInstance.isSecure() && INSECURE_SCHEME_MAPPINGS.containsKey(originalOrDefault)) { return INSECURE_SCHEME_MAPPINGS.get(originalOrDefault); } return originalOrDefault; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java index 034af9d7..255e8721 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java @@ -56,11 +56,9 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto private final ReactiveLoadBalancer.Factory loadBalancerFactory; - public RetryLoadBalancerInterceptor(LoadBalancerClient loadBalancer, - LoadBalancerRetryProperties retryProperties, - LoadBalancerRequestFactory requestFactory, - LoadBalancedRetryFactory lbRetryFactory, LoadBalancerProperties properties, - ReactiveLoadBalancer.Factory loadBalancerFactory) { + public RetryLoadBalancerInterceptor(LoadBalancerClient loadBalancer, LoadBalancerRetryProperties retryProperties, + LoadBalancerRequestFactory requestFactory, LoadBalancedRetryFactory lbRetryFactory, + LoadBalancerProperties properties, ReactiveLoadBalancer.Factory loadBalancerFactory) { this.loadBalancer = loadBalancer; this.retryProperties = retryProperties; this.requestFactory = requestFactory; @@ -74,10 +72,8 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto final ClientHttpRequestExecution execution) throws IOException { final URI originalUri = request.getURI(); final String serviceName = originalUri.getHost(); - Assert.state(serviceName != null, - "Request URI does not contain a valid hostname: " + originalUri); - final LoadBalancedRetryPolicy retryPolicy = lbRetryFactory - .createRetryPolicy(serviceName, loadBalancer); + Assert.state(serviceName != null, "Request URI does not contain a valid hostname: " + originalUri); + final LoadBalancedRetryPolicy retryPolicy = lbRetryFactory.createRetryPolicy(serviceName, loadBalancer); RetryTemplate template = createRetryTemplate(serviceName, request, retryPolicy); return template.execute(context -> { ServiceInstance serviceInstance = null; @@ -87,33 +83,27 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto } Set supportedLifecycleProcessors = LoadBalancerLifecycleValidator .getSupportedLifecycleProcessors( - loadBalancerFactory.getInstances(serviceName, - LoadBalancerLifecycle.class), - HttpRequestContext.class, ClientHttpResponse.class, - ServiceInstance.class); + loadBalancerFactory.getInstances(serviceName, LoadBalancerLifecycle.class), + HttpRequestContext.class, ClientHttpResponse.class, ServiceInstance.class); String hint = getHint(serviceName); - DefaultRequest lbRequest = new DefaultRequest<>( - new HttpRequestContext(request, hint)); - supportedLifecycleProcessors - .forEach(lifecycle -> lifecycle.onStart(lbRequest)); + DefaultRequest lbRequest = new DefaultRequest<>(new HttpRequestContext(request, hint)); + supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStart(lbRequest)); if (serviceInstance == null) { serviceInstance = loadBalancer.choose(serviceName, lbRequest); } Response lbResponse = new DefaultResponse(serviceInstance); if (serviceInstance == null) { - supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onComplete( - new CompletionContext( + supportedLifecycleProcessors.forEach( + lifecycle -> lifecycle.onComplete(new CompletionContext( CompletionContext.Status.DISCARD, lbResponse))); } - ClientHttpResponse response = RetryLoadBalancerInterceptor.this.loadBalancer - .execute(serviceName, serviceInstance, - requestFactory.createRequest(request, body, execution)); + ClientHttpResponse response = RetryLoadBalancerInterceptor.this.loadBalancer.execute(serviceName, + serviceInstance, requestFactory.createRequest(request, body, execution)); int statusCode = response.getRawStatusCode(); if (retryPolicy != null && retryPolicy.retryableStatusCode(statusCode)) { byte[] bodyCopy = StreamUtils.copyToByteArray(response.getBody()); response.close(); - throw new ClientHttpResponseStatusCodeException(serviceName, response, - bodyCopy); + throw new ClientHttpResponseStatusCodeException(serviceName, response, bodyCopy); } return response; }, new LoadBalancedRecoveryCallback() { @@ -121,8 +111,7 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto // LoadBalancedRecoveryCallback are // the same. In most cases they would be different. @Override - protected ClientHttpResponse createResponse(ClientHttpResponse response, - URI uri) { + protected ClientHttpResponse createResponse(ClientHttpResponse response, URI uri) { return response; } }); @@ -132,16 +121,14 @@ public class RetryLoadBalancerInterceptor implements ClientHttpRequestIntercepto LoadBalancedRetryPolicy retryPolicy) { RetryTemplate template = new RetryTemplate(); BackOffPolicy backOffPolicy = lbRetryFactory.createBackOffPolicy(serviceName); - template.setBackOffPolicy( - backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy); + template.setBackOffPolicy(backOffPolicy == null ? new NoBackOffPolicy() : backOffPolicy); template.setThrowLastExceptionOnExhausted(true); RetryListener[] retryListeners = lbRetryFactory.createRetryListeners(serviceName); if (retryListeners != null && retryListeners.length != 0) { template.setListeners(retryListeners); } - template.setRetryPolicy(!retryProperties.isEnabled() || retryPolicy == null - ? new NeverRetryPolicy() : new InterceptorRetryPolicy(request, - retryPolicy, loadBalancer, serviceName)); + template.setRetryPolicy(!retryProperties.isEnabled() || retryPolicy == null ? new NeverRetryPolicy() + : new InterceptorRetryPolicy(request, retryPolicy, loadBalancer, serviceName)); return template; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryableStatusCodeException.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryableStatusCodeException.java index b28aa847..78997822 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryableStatusCodeException.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryableStatusCodeException.java @@ -32,8 +32,7 @@ public class RetryableStatusCodeException extends IOException { private final URI uri; - public RetryableStatusCodeException(String serviceId, int statusCode, Object response, - URI uri) { + public RetryableStatusCodeException(String serviceId, int statusCode, Object response, URI uri) { super(String.format(MESSAGE, serviceId, statusCode)); this.response = response; this.uri = uri; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ServiceRequestWrapper.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ServiceRequestWrapper.java index 1e2d7d12..e3bdff0e 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ServiceRequestWrapper.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/ServiceRequestWrapper.java @@ -31,8 +31,7 @@ public class ServiceRequestWrapper extends HttpRequestWrapper { private final LoadBalancerClient loadBalancer; - public ServiceRequestWrapper(HttpRequest request, ServiceInstance instance, - LoadBalancerClient loadBalancer) { + public ServiceRequestWrapper(HttpRequest request, ServiceInstance instance, LoadBalancerClient loadBalancer) { super(request); this.instance = instance; this.loadBalancer = loadBalancer; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java index 8b7b3d57..4e419770 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/DeferringLoadBalancerExchangeFilterFunction.java @@ -40,8 +40,7 @@ public class DeferringLoadBalancerExchangeFilterFunction exchangeFilterFunctionProvider) { + public DeferringLoadBalancerExchangeFilterFunction(ObjectProvider exchangeFilterFunctionProvider) { this.exchangeFilterFunctionProvider = exchangeFilterFunctionProvider; } @@ -56,8 +55,7 @@ public class DeferringLoadBalancerExchangeFilterFunction reactorDeferringLoadBalancerExchangeFilterFunction( ObjectProvider exchangeFilterFunctionProvider) { - return new DeferringLoadBalancerExchangeFilterFunction<>( - exchangeFilterFunctionProvider); + return new DeferringLoadBalancerExchangeFilterFunction<>(exchangeFilterFunctionProvider); } } - static final class OnAnyLoadBalancerImplementationPresentCondition - extends AnyNestedCondition { + static final class OnAnyLoadBalancerImplementationPresentCondition extends AnyNestedCondition { private OnAnyLoadBalancerImplementationPresentCondition() { super(ConfigurationPhase.REGISTER_BEAN); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientBuilderBeanPostProcessor.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientBuilderBeanPostProcessor.java index c1128254..bb8db3ff 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientBuilderBeanPostProcessor.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientBuilderBeanPostProcessor.java @@ -37,15 +37,13 @@ public class LoadBalancerWebClientBuilderBeanPostProcessor implements BeanPostPr private final ApplicationContext context; public LoadBalancerWebClientBuilderBeanPostProcessor( - DeferringLoadBalancerExchangeFilterFunction exchangeFilterFunction, - ApplicationContext context) { + DeferringLoadBalancerExchangeFilterFunction exchangeFilterFunction, ApplicationContext context) { this.exchangeFilterFunction = exchangeFilterFunction; this.context = context; } @Override - public Object postProcessBeforeInitialization(Object bean, String beanName) - throws BeansException { + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof WebClient.Builder) { if (context.findAnnotationOnBean(beanName, LoadBalanced.class) == null) { return bean; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java index 9a3f987d..3a994e2d 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java @@ -40,10 +40,8 @@ public class ReactorLoadBalancerClientAutoConfiguration { @ConditionalOnMissingBean @Bean public ReactorLoadBalancerExchangeFilterFunction loadBalancerExchangeFilterFunction( - ReactiveLoadBalancer.Factory loadBalancerFactory, - LoadBalancerProperties properties) { - return new ReactorLoadBalancerExchangeFilterFunction(loadBalancerFactory, - properties); + ReactiveLoadBalancer.Factory loadBalancerFactory, LoadBalancerProperties properties) { + return new ReactorLoadBalancerExchangeFilterFunction(loadBalancerFactory, properties); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java index da75399b..0615bed5 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunction.java @@ -49,41 +49,33 @@ import org.springframework.web.reactive.function.client.ExchangeFunction; @SuppressWarnings({ "rawtypes", "unchecked" }) public class ReactorLoadBalancerExchangeFilterFunction implements ExchangeFilterFunction { - private static final Log LOG = LogFactory - .getLog(ReactorLoadBalancerExchangeFilterFunction.class); + private static final Log LOG = LogFactory.getLog(ReactorLoadBalancerExchangeFilterFunction.class); private final ReactiveLoadBalancer.Factory loadBalancerFactory; private final LoadBalancerProperties properties; - public ReactorLoadBalancerExchangeFilterFunction( - ReactiveLoadBalancer.Factory loadBalancerFactory, + public ReactorLoadBalancerExchangeFilterFunction(ReactiveLoadBalancer.Factory loadBalancerFactory, LoadBalancerProperties properties) { this.loadBalancerFactory = loadBalancerFactory; this.properties = properties; } @Override - public Mono filter(ClientRequest clientRequest, - ExchangeFunction next) { + public Mono filter(ClientRequest clientRequest, ExchangeFunction next) { URI originalUrl = clientRequest.url(); String serviceId = originalUrl.getHost(); if (serviceId == null) { - String message = String.format( - "Request URI does not contain a valid hostname: %s", - originalUrl.toString()); + String message = String.format("Request URI does not contain a valid hostname: %s", originalUrl.toString()); if (LOG.isWarnEnabled()) { LOG.warn(message); } - return Mono.just( - ClientResponse.create(HttpStatus.BAD_REQUEST).body(message).build()); + return Mono.just(ClientResponse.create(HttpStatus.BAD_REQUEST).body(message).build()); } Set supportedLifecycleProcessors = LoadBalancerLifecycleValidator .getSupportedLifecycleProcessors( - loadBalancerFactory.getInstances(serviceId, - LoadBalancerLifecycle.class), - ClientRequestContext.class, ClientResponse.class, - ServiceInstance.class); + loadBalancerFactory.getInstances(serviceId, LoadBalancerLifecycle.class), + ClientRequestContext.class, ClientResponse.class, ServiceInstance.class); String hint = getHint(serviceId); DefaultRequest lbRequest = new DefaultRequest<>( new ClientRequestContext(clientRequest, hint)); @@ -95,31 +87,24 @@ public class ReactorLoadBalancerExchangeFilterFunction implements ExchangeFilter if (LOG.isWarnEnabled()) { LOG.warn(message); } - supportedLifecycleProcessors.forEach( - lifecycle -> lifecycle.onComplete(new CompletionContext<>( - CompletionContext.Status.DISCARD, lbResponse))); + supportedLifecycleProcessors.forEach(lifecycle -> lifecycle + .onComplete(new CompletionContext<>(CompletionContext.Status.DISCARD, lbResponse))); return Mono.just(ClientResponse.create(HttpStatus.SERVICE_UNAVAILABLE) .body(serviceInstanceUnavailableMessage(serviceId)).build()); } if (LOG.isDebugEnabled()) { - LOG.debug(String.format( - "Load balancer has retrieved the instance for service %s: %s", - serviceId, instance.getUri())); + LOG.debug(String.format("Load balancer has retrieved the instance for service %s: %s", serviceId, + instance.getUri())); } - ClientRequest newRequest = buildClientRequest(clientRequest, - reconstructURI(instance, originalUrl)); + ClientRequest newRequest = buildClientRequest(clientRequest, reconstructURI(instance, originalUrl)); return next.exchange(newRequest) - .doOnError(throwable -> supportedLifecycleProcessors - .forEach(lifecycle -> lifecycle.onComplete( - new CompletionContext( - CompletionContext.Status.FAILED, throwable, - lbResponse)))) - .doOnSuccess(clientResponse -> supportedLifecycleProcessors - .forEach(lifecycle -> lifecycle.onComplete( - new CompletionContext( - CompletionContext.Status.SUCCESS, lbResponse, - clientResponse)))); + .doOnError(throwable -> supportedLifecycleProcessors.forEach( + lifecycle -> lifecycle.onComplete(new CompletionContext( + CompletionContext.Status.FAILED, throwable, lbResponse)))) + .doOnSuccess(clientResponse -> supportedLifecycleProcessors.forEach( + lifecycle -> lifecycle.onComplete(new CompletionContext( + CompletionContext.Status.SUCCESS, lbResponse, clientResponse)))); }); } @@ -127,10 +112,8 @@ public class ReactorLoadBalancerExchangeFilterFunction implements ExchangeFilter return LoadBalancerUriTools.reconstructURI(instance, original); } - protected Mono> choose(String serviceId, - Request request) { - ReactiveLoadBalancer loadBalancer = loadBalancerFactory - .getInstance(serviceId); + protected Mono> choose(String serviceId, Request request) { + ReactiveLoadBalancer loadBalancer = loadBalancerFactory.getInstance(serviceId); if (loadBalancer == null) { return Mono.just(new EmptyResponse()); } @@ -142,11 +125,9 @@ public class ReactorLoadBalancerExchangeFilterFunction implements ExchangeFilter } private ClientRequest buildClientRequest(ClientRequest request, URI uri) { - return ClientRequest.create(request.method(), uri) - .headers(headers -> headers.addAll(request.headers())) + return ClientRequest.create(request.method(), uri).headers(headers -> headers.addAll(request.headers())) .cookies(cookies -> cookies.addAll(request.cookies())) - .attributes(attributes -> attributes.putAll(request.attributes())) - .body(request.body()).build(); + .attributes(attributes -> attributes.putAll(request.attributes())).body(request.body()).build(); } private String getHint(String serviceId) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java index 298b57ad..48f9c0aa 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java @@ -45,11 +45,9 @@ import org.springframework.core.env.Environment; * @author Spencer Gibb */ public abstract class AbstractAutoServiceRegistration - implements AutoServiceRegistration, ApplicationContextAware, - ApplicationListener { + implements AutoServiceRegistration, ApplicationContextAware, ApplicationListener { - private static final Log logger = LogFactory - .getLog(AbstractAutoServiceRegistration.class); + private static final Log logger = LogFactory.getLog(AbstractAutoServiceRegistration.class); private final ServiceRegistry serviceRegistry; @@ -92,8 +90,7 @@ public abstract class AbstractAutoServiceRegistration public void bind(WebServerInitializedEvent event) { ApplicationContext context = event.getApplicationContext(); if (context instanceof ConfigurableWebServerApplicationContext) { - if ("management".equals(((ConfigurableWebServerApplicationContext) context) - .getServerNamespace())) { + if ("management".equals(((ConfigurableWebServerApplicationContext) context).getServerNamespace())) { return; } } @@ -102,8 +99,7 @@ public abstract class AbstractAutoServiceRegistration } @Override - public void setApplicationContext(ApplicationContext applicationContext) - throws BeansException { + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.context = applicationContext; this.environment = this.context.getEnvironment(); } @@ -133,14 +129,12 @@ public abstract class AbstractAutoServiceRegistration // only initialize if nonSecurePort is greater than 0 and it isn't already running // because of containerPortInitializer below if (!this.running.get()) { - this.context.publishEvent( - new InstancePreRegisteredEvent(this, getRegistration())); + this.context.publishEvent(new InstancePreRegisteredEvent(this, getRegistration())); register(); if (shouldRegisterManagement()) { registerManagement(); } - this.context.publishEvent( - new InstanceRegisteredEvent<>(this, getConfiguration())); + this.context.publishEvent(new InstanceRegisteredEvent<>(this, getConfiguration())); this.running.compareAndSet(false, true); } @@ -152,8 +146,7 @@ public abstract class AbstractAutoServiceRegistration */ protected boolean shouldRegisterManagement() { if (this.properties == null || this.properties.isRegisterManagement()) { - return getManagementPort() != null - && ManagementServerPortUtils.isDifferent(this.context); + return getManagementPort() != null && ManagementServerPortUtils.isDifferent(this.context); } return false; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java index ff37f6fc..e28a04e8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java @@ -28,8 +28,7 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @Import(AutoServiceRegistrationConfiguration.class) -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) public class AutoServiceRegistrationAutoConfiguration { @Autowired(required = false) @@ -41,8 +40,8 @@ public class AutoServiceRegistrationAutoConfiguration { @PostConstruct protected void init() { if (this.autoServiceRegistration == null && this.properties.isFailFast()) { - throw new IllegalStateException("Auto Service Registration has " - + "been requested, but there is no AutoServiceRegistration bean"); + throw new IllegalStateException( + "Auto Service Registration has " + "been requested, but there is no AutoServiceRegistration bean"); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java index 6238da6f..9f9914b4 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java @@ -25,8 +25,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AutoServiceRegistrationProperties.class) -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) public class AutoServiceRegistrationConfiguration { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java index c9c9d2c1..951449fe 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java @@ -40,10 +40,8 @@ public class ServiceRegistryAutoConfiguration { @Bean @ConditionalOnAvailableEndpoint - public ServiceRegistryEndpoint serviceRegistryEndpoint( - ServiceRegistry serviceRegistry) { - ServiceRegistryEndpoint endpoint = new ServiceRegistryEndpoint( - serviceRegistry); + public ServiceRegistryEndpoint serviceRegistryEndpoint(ServiceRegistry serviceRegistry) { + ServiceRegistryEndpoint endpoint = new ServiceRegistryEndpoint(serviceRegistry); endpoint.setRegistration(this.registration); return endpoint; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpoint.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpoint.java index 1686db14..50d0c7aa 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpoint.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpoint.java @@ -51,8 +51,7 @@ public class ServiceRegistryEndpoint { Assert.notNull(status, "status may not by null"); if (this.registration == null) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body("no registration found"); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("no registration found"); } this.serviceRegistry.setStatus(this.registration, status); @@ -62,12 +61,10 @@ public class ServiceRegistryEndpoint { @ReadOperation public ResponseEntity getStatus() { if (this.registration == null) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body("no registration found"); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body("no registration found"); } - return ResponseEntity.ok() - .body(this.serviceRegistry.getStatus(this.registration)); + return ResponseEntity.ok().body(this.serviceRegistry.getStatus(this.registration)); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java index 608dab37..9c4fc0a8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java @@ -49,8 +49,7 @@ public interface ApacheHttpClientConnectionManagerFactory { * manager. * @return A new {@link HttpClientConnectionManager}. */ - HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, - int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, - TimeUnit timeUnit, RegistryBuilder registryBuilder); + HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, + int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registryBuilder); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java index 314947c3..b90beefb 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java @@ -44,34 +44,29 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; * @author Ryan Baxter * @author Michael Wirth */ -public class DefaultApacheHttpClientConnectionManagerFactory - implements ApacheHttpClientConnectionManagerFactory { +public class DefaultApacheHttpClientConnectionManagerFactory implements ApacheHttpClientConnectionManagerFactory { - private static final Log LOG = LogFactory - .getLog(DefaultApacheHttpClientConnectionManagerFactory.class); + private static final Log LOG = LogFactory.getLog(DefaultApacheHttpClientConnectionManagerFactory.class); - public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, - int maxTotalConnections, int maxConnectionsPerRoute) { - return newConnectionManager(disableSslValidation, maxTotalConnections, - maxConnectionsPerRoute, -1, TimeUnit.MILLISECONDS, null); + public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, + int maxConnectionsPerRoute) { + return newConnectionManager(disableSslValidation, maxTotalConnections, maxConnectionsPerRoute, -1, + TimeUnit.MILLISECONDS, null); } @Override - public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, - int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, - TimeUnit timeUnit, RegistryBuilder registryBuilder) { + public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, + int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registryBuilder) { if (registryBuilder == null) { - registryBuilder = RegistryBuilder.create() - .register(HTTP_SCHEME, PlainConnectionSocketFactory.INSTANCE); + registryBuilder = RegistryBuilder.create().register(HTTP_SCHEME, + PlainConnectionSocketFactory.INSTANCE); } if (disableSslValidation) { try { final SSLContext sslContext = SSLContext.getInstance("SSL"); - sslContext.init(null, - new TrustManager[] { new DisabledValidationTrustManager() }, - new SecureRandom()); - registryBuilder.register(HTTPS_SCHEME, new SSLConnectionSocketFactory( - sslContext, NoopHostnameVerifier.INSTANCE)); + sslContext.init(null, new TrustManager[] { new DisabledValidationTrustManager() }, new SecureRandom()); + registryBuilder.register(HTTPS_SCHEME, + new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE)); } catch (NoSuchAlgorithmException e) { LOG.warn("Error creating SSLContext", e); @@ -81,13 +76,12 @@ public class DefaultApacheHttpClientConnectionManagerFactory } } else { - registryBuilder.register("https", - SSLConnectionSocketFactory.getSocketFactory()); + registryBuilder.register("https", SSLConnectionSocketFactory.getSocketFactory()); } final Registry registry = registryBuilder.build(); - PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager( - registry, null, null, null, timeToLive, timeUnit); + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry, null, + null, null, timeToLive, timeUnit); connectionManager.setMaxTotal(maxTotalConnections); connectionManager.setDefaultMaxPerRoute(maxConnectionsPerRoute); @@ -97,13 +91,11 @@ public class DefaultApacheHttpClientConnectionManagerFactory class DisabledValidationTrustManager implements X509TrustManager { @Override - public void checkClientTrusted(X509Certificate[] x509Certificates, String s) - throws CertificateException { + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } @Override - public void checkServerTrusted(X509Certificate[] x509Certificates, String s) - throws CertificateException { + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java index ad2b4443..2ce7d208 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java @@ -38,8 +38,7 @@ public class DefaultApacheHttpClientFactory implements ApacheHttpClientFactory { */ @Override public HttpClientBuilder createBuilder() { - return this.builder.disableContentCompression().disableCookieManagement() - .useSystemProperties(); + return this.builder.disableContentCompression().disableCookieManagement().useSystemProperties(); } } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactory.java index a280bea2..f578dce9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactory.java @@ -25,12 +25,10 @@ import okhttp3.ConnectionPool; * * @author Ryan Baxter */ -public class DefaultOkHttpClientConnectionPoolFactory - implements OkHttpClientConnectionPoolFactory { +public class DefaultOkHttpClientConnectionPoolFactory implements OkHttpClientConnectionPoolFactory { @Override - public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, - TimeUnit timeUnit) { + public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit) { return new ConnectionPool(maxIdleConnections, keepAliveDuration, timeUnit); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java index 08f0d6e1..22da0053 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactory.java @@ -53,8 +53,7 @@ public class DefaultOkHttpClientFactory implements OkHttpClientFactory { SSLContext sslContext = SSLContext.getInstance("SSL"); sslContext.init(null, trustManagers, new java.security.SecureRandom()); SSLSocketFactory disabledSSLSocketFactory = sslContext.getSocketFactory(); - this.builder.sslSocketFactory(disabledSSLSocketFactory, - disabledTrustManager); + this.builder.sslSocketFactory(disabledSSLSocketFactory, disabledTrustManager); this.builder.hostnameVerifier(new TrustAllHostnames()); } catch (NoSuchAlgorithmException e) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java index 34eecf19..712e9c79 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java @@ -33,8 +33,7 @@ import org.springframework.context.annotation.Configuration; public class HttpClientConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", matchIfMissing = true) @ConditionalOnClass(HttpClient.class) static class ApacheHttpClientConfiguration { @@ -52,16 +51,14 @@ public class HttpClientConfiguration { @Bean @ConditionalOnMissingBean - public ApacheHttpClientFactory apacheHttpClientFactory( - HttpClientBuilder builder) { + public ApacheHttpClientFactory apacheHttpClientFactory(HttpClientBuilder builder) { return new DefaultApacheHttpClientFactory(builder); } } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled", matchIfMissing = true) @ConditionalOnClass(OkHttpClient.class) static class OkHttpClientConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientConnectionPoolFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientConnectionPoolFactory.java index 1945a386..62907d28 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientConnectionPoolFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientConnectionPoolFactory.java @@ -34,7 +34,6 @@ public interface OkHttpClientConnectionPoolFactory { * @param timeUnit The time unit for the keep-alive duration. * @return A new {@link ConnectionPool}. */ - ConnectionPool create(int maxIdleConnections, long keepAliveDuration, - TimeUnit timeUnit); + ConnectionPool create(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java index d5d62e3c..94b2586e 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/OkHttpClientFactory.java @@ -45,13 +45,11 @@ public interface OkHttpClientFactory { class DisableValidationTrustManager implements X509TrustManager { @Override - public void checkClientTrusted(X509Certificate[] x509Certificates, String s) - throws CertificateException { + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } @Override - public void checkServerTrusted(X509Certificate[] x509Certificates, String s) - throws CertificateException { + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java index 5dc80c1a..37e8c56a 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java @@ -39,8 +39,7 @@ public final class IdUtils { return getDefaultInstanceId(resolver, true); } - public static String getDefaultInstanceId(PropertyResolver resolver, - boolean includeHostname) { + public static String getDefaultInstanceId(PropertyResolver resolver, boolean includeHostname) { String vcapInstanceId = resolver.getProperty("vcap.application.instance_id"); if (StringUtils.hasText(vcapInstanceId)) { return vcapInstanceId; @@ -54,8 +53,7 @@ public final class IdUtils { String namePart = combineParts(hostname, SEPARATOR, appName); - String indexPart = resolver.getProperty("spring.application.instance_id", - resolver.getProperty("server.port")); + String indexPart = resolver.getProperty("spring.application.instance_id", resolver.getProperty("server.port")); return combineParts(namePart, SEPARATOR, indexPart); } @@ -77,8 +75,7 @@ public final class IdUtils { return DEFAULT_SERVICE_ID_STRING; } - public static String combineParts(String firstPart, String separator, - String secondPart) { + public static String combineParts(String firstPart, String separator, String secondPart) { String combined = null; if (firstPart != null && secondPart != null) { combined = firstPart + separator + secondPart; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java index f67df4ab..cd5e782a 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java @@ -75,8 +75,8 @@ public class InetUtils implements Closeable { InetAddress result = null; try { int lowest = Integer.MAX_VALUE; - for (Enumeration nics = NetworkInterface - .getNetworkInterfaces(); nics.hasMoreElements();) { + for (Enumeration nics = NetworkInterface.getNetworkInterfaces(); nics + .hasMoreElements();) { NetworkInterface ifc = nics.nextElement(); if (ifc.isUp()) { this.log.trace("Testing interface: " + ifc.getDisplayName()); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java index 36eee8b7..d8237adf 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/SpringFactoryImportSelector.java @@ -54,8 +54,8 @@ public abstract class SpringFactoryImportSelector @SuppressWarnings("unchecked") protected SpringFactoryImportSelector() { - this.annotationClass = (Class) GenericTypeResolver - .resolveTypeArgument(this.getClass(), SpringFactoryImportSelector.class); + this.annotationClass = (Class) GenericTypeResolver.resolveTypeArgument(this.getClass(), + SpringFactoryImportSelector.class); } @Override @@ -63,15 +63,15 @@ public abstract class SpringFactoryImportSelector if (!isEnabled()) { return new String[0]; } - AnnotationAttributes attributes = AnnotationAttributes.fromMap( - metadata.getAnnotationAttributes(this.annotationClass.getName(), true)); + AnnotationAttributes attributes = AnnotationAttributes + .fromMap(metadata.getAnnotationAttributes(this.annotationClass.getName(), true)); - Assert.notNull(attributes, "No " + getSimpleName() + " attributes found. Is " - + metadata.getClassName() + " annotated with @" + getSimpleName() + "?"); + Assert.notNull(attributes, "No " + getSimpleName() + " attributes found. Is " + metadata.getClassName() + + " annotated with @" + getSimpleName() + "?"); // Find all possible auto configuration classes, filtering duplicates - List factories = new ArrayList<>(new LinkedHashSet<>(SpringFactoriesLoader - .loadFactoryNames(this.annotationClass, this.beanClassLoader))); + List factories = new ArrayList<>(new LinkedHashSet<>( + SpringFactoriesLoader.loadFactoryNames(this.annotationClass, this.beanClassLoader))); if (factories.isEmpty() && !hasDefaultFactory()) { throw new IllegalStateException("Annotation @" + getSimpleName() diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityNotMetFailureAnalyzer.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityNotMetFailureAnalyzer.java index 85407358..ba50a484 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityNotMetFailureAnalyzer.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityNotMetFailureAnalyzer.java @@ -28,18 +28,17 @@ import org.springframework.boot.diagnostics.FailureAnalysis; * @author Marcin Grzejszczak * @since 1.3.6 */ -public final class CompatibilityNotMetFailureAnalyzer - extends AbstractFailureAnalyzer { +public final class CompatibilityNotMetFailureAnalyzer extends AbstractFailureAnalyzer { @Override - protected FailureAnalysis analyze(Throwable rootFailure, - CompatibilityNotMetException cause) { + protected FailureAnalysis analyze(Throwable rootFailure, CompatibilityNotMetException cause) { return new FailureAnalysis(getDescription(cause), getAction(cause), cause); } private String getDescription(CompatibilityNotMetException ex) { - return String.format("Your project setup is incompatible with our requirements " - + "due to following reasons:%s", descriptions(ex.results)); + return String.format( + "Your project setup is incompatible with our requirements " + "due to following reasons:%s", + descriptions(ex.results)); } private String descriptions(List results) { @@ -51,8 +50,7 @@ public final class CompatibilityNotMetFailureAnalyzer } private String getAction(CompatibilityNotMetException ex) { - return String.format("Consider applying the following actions:%s", - actions(ex.results)); + return String.format("Consider applying the following actions:%s", actions(ex.results)); } private String actions(List results) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java index 605f5bd2..08f00d6b 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java @@ -33,24 +33,20 @@ import org.springframework.context.annotation.Configuration; * @since 1.3.6 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled", matchIfMissing = true) @AutoConfigureOrder(0) @EnableConfigurationProperties(CompatibilityVerifierProperties.class) public class CompatibilityVerifierAutoConfiguration { @Bean - CompositeCompatibilityVerifier compositeCompatibilityVerifier( - List verifiers) { - CompositeCompatibilityVerifier verifier = new CompositeCompatibilityVerifier( - verifiers); + CompositeCompatibilityVerifier compositeCompatibilityVerifier(List verifiers) { + CompositeCompatibilityVerifier verifier = new CompositeCompatibilityVerifier(verifiers); verifier.verifyDependencies(); return verifier; } @Bean - SpringBootVersionVerifier springBootVersionVerifier( - CompatibilityVerifierProperties properties) { + SpringBootVersionVerifier springBootVersionVerifier(CompatibilityVerifierProperties properties) { return new SpringBootVersionVerifier(properties.getCompatibleBootVersions()); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompositeCompatibilityVerifier.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompositeCompatibilityVerifier.java index 8fb5e3c9..fb1127c6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompositeCompatibilityVerifier.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompositeCompatibilityVerifier.java @@ -28,8 +28,7 @@ import org.apache.commons.logging.LogFactory; */ class CompositeCompatibilityVerifier { - private static final Log log = LogFactory - .getLog(CompositeCompatibilityVerifier.class); + private static final Log log = LogFactory.getLog(CompositeCompatibilityVerifier.class); private final List verifiers; diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SSLContextFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SSLContextFactory.java index 381c59d3..fd907a56 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SSLContextFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SSLContextFactory.java @@ -69,8 +69,7 @@ public class SSLContextFactory { throw new KeyStoreException("Keystore not specified."); } if (!properties.getKeyStore().exists()) { - throw new KeyStoreException( - "Keystore not exists: " + properties.getKeyStore()); + throw new KeyStoreException("Keystore not exists: " + properties.getKeyStore()); } KeyStore result = KeyStore.getInstance(properties.getKeyStoreType()); @@ -93,8 +92,8 @@ public class SSLContextFactory { return result; } - private static void loadKeyStore(KeyStore keyStore, Resource keyStoreResource, - char[] keyStorePassword) throws IOException, GeneralSecurityException { + private static void loadKeyStore(KeyStore keyStore, Resource keyStoreResource, char[] keyStorePassword) + throws IOException, GeneralSecurityException { try (InputStream inputStream = keyStoreResource.getInputStream()) { keyStore.load(inputStream, keyStorePassword); } @@ -105,8 +104,7 @@ public class SSLContextFactory { return null; } if (!properties.getTrustStore().exists()) { - throw new KeyStoreException( - "KeyStore not exists: " + properties.getTrustStore()); + throw new KeyStoreException("KeyStore not exists: " + properties.getTrustStore()); } KeyStore result = KeyStore.getInstance(properties.getTrustStoreType()); diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java index c295c7b6..4a4224f8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java @@ -71,8 +71,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { public boolean isCompatible() { try { // deprecated 1.5 - Class.forName( - "org.springframework.boot.context.config.ResourceNotFoundException"); + Class.forName("org.springframework.boot.context.config.ResourceNotFoundException"); return true; } catch (ClassNotFoundException e) { @@ -179,8 +178,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { public boolean isCompatible() { try { // since 2.3 - Class.forName( - "org.springframework.boot.context.propertie.BoundConfigurationProperties"); + Class.forName("org.springframework.boot.context.propertie.BoundConfigurationProperties"); return true; } catch (ClassNotFoundException e) { @@ -194,20 +192,18 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { private String errorDescription() { String versionFromManifest = getVersionFromManifest(); if (StringUtils.hasText(versionFromManifest)) { - return String.format( - "Spring Boot [%s] is not compatible with this Spring Cloud release train", + return String.format("Spring Boot [%s] is not compatible with this Spring Cloud release train", versionFromManifest); } return "Spring Boot is not compatible with this Spring Cloud release train"; } private String action() { - return String.format( - "Change Spring Boot version to one of the following versions %s .\n" - + "You can find the latest Spring Boot versions here [%s]. \n" - + "If you want to learn more about the Spring Cloud Release train compatibility, you " - + "can visit this page [%s] and check the [Release Trains] section.\n" - + "If you want to disable this check, just set the property [spring.cloud.compatibility-verifier.enabled=false]", + return String.format("Change Spring Boot version to one of the following versions %s .\n" + + "You can find the latest Spring Boot versions here [%s]. \n" + + "If you want to learn more about the Spring Cloud Release train compatibility, you " + + "can visit this page [%s] and check the [Release Trains] section.\n" + + "If you want to disable this check, just set the property [spring.cloud.compatibility-verifier.enabled=false]", this.acceptedVersions, "https://spring.io/projects/spring-boot#learn", "https://spring.io/projects/spring-cloud#overview"); } diff --git a/spring-cloud-commons/src/main/java/reactor/core/publisher/CloudFlux.java b/spring-cloud-commons/src/main/java/reactor/core/publisher/CloudFlux.java index c9f4b39a..96b81d7e 100644 --- a/spring-cloud-commons/src/main/java/reactor/core/publisher/CloudFlux.java +++ b/spring-cloud-commons/src/main/java/reactor/core/publisher/CloudFlux.java @@ -54,8 +54,7 @@ public abstract class CloudFlux extends Flux { * @return a new {@link reactor.core.publisher.Flux} behaving like the fastest of its * sources */ - public static Flux firstNonEmpty( - Iterable> sources) { + public static Flux firstNonEmpty(Iterable> sources) { return onAssembly(new FluxFirstNonEmptyEmitting<>(sources)); } diff --git a/spring-cloud-commons/src/main/java/reactor/core/publisher/FluxFirstNonEmptyEmitting.java b/spring-cloud-commons/src/main/java/reactor/core/publisher/FluxFirstNonEmptyEmitting.java index d94caac1..937054e3 100644 --- a/spring-cloud-commons/src/main/java/reactor/core/publisher/FluxFirstNonEmptyEmitting.java +++ b/spring-cloud-commons/src/main/java/reactor/core/publisher/FluxFirstNonEmptyEmitting.java @@ -59,12 +59,10 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc Iterator> it; try { - it = Objects.requireNonNull(iterable.iterator(), - "The iterator returned is null"); + it = Objects.requireNonNull(iterable.iterator(), "The iterator returned is null"); } catch (Throwable e) { - Operators.error(actual, - Operators.onOperatorError(e, actual.currentContext())); + Operators.error(actual, Operators.onOperatorError(e, actual.currentContext())); return; } @@ -76,8 +74,7 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc b = it.hasNext(); } catch (Throwable e) { - Operators.error(actual, - Operators.onOperatorError(e, actual.currentContext())); + Operators.error(actual, Operators.onOperatorError(e, actual.currentContext())); return; } @@ -88,12 +85,10 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc Publisher p; try { - p = Objects.requireNonNull(it.next(), - "The Publisher returned by the iterator is null"); + p = Objects.requireNonNull(it.next(), "The Publisher returned by the iterator is null"); } catch (Throwable e) { - Operators.error(actual, - Operators.onOperatorError(e, actual.currentContext())); + Operators.error(actual, Operators.onOperatorError(e, actual.currentContext())); return; } @@ -118,8 +113,7 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc Publisher p = a[0]; if (p == null) { - Operators.error(actual, - new NullPointerException("The single source Publisher is null")); + Operators.error(actual, new NullPointerException("The single source Publisher is null")); } else { p.subscribe(actual); @@ -176,8 +170,7 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc return null; } - void subscribe(Publisher[] sources, int n, - CoreSubscriber actual) { + void subscribe(Publisher[] sources, int n, CoreSubscriber actual) { FirstNonEmptyEmittingSubscriber[] a = subscribers; for (int i = 0; i < n; i++) { @@ -195,8 +188,7 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc if (p == null) { if (WIP.compareAndSet(this, Integer.MIN_VALUE, -1)) { - actual.onError(new NullPointerException( - "The " + i + " th Publisher source is null")); + actual.onError(new NullPointerException("The " + i + " th Publisher source is null")); } return; } @@ -264,8 +256,8 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc } - static final class FirstNonEmptyEmittingSubscriber - extends Operators.DeferredSubscription implements InnerOperator { + static final class FirstNonEmptyEmittingSubscriber extends Operators.DeferredSubscription + implements InnerOperator { final RaceCoordinator parent; @@ -275,8 +267,7 @@ final class FluxFirstNonEmptyEmitting extends Flux implements SourceProduc boolean won; - FirstNonEmptyEmittingSubscriber(CoreSubscriber actual, - RaceCoordinator parent, int index) { + FirstNonEmptyEmittingSubscriber(CoreSubscriber actual, RaceCoordinator parent, int index) { this.actual = actual; this.parent = parent; this.index = index; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/AdhocTestSuite.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/AdhocTestSuite.java index 522adf11..a3558df4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/AdhocTestSuite.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/AdhocTestSuite.java @@ -30,8 +30,7 @@ import org.springframework.cloud.client.hypermedia.CloudHypermediaAutoConfigurat * @author Dave Syer */ @RunWith(Suite.class) -@SuiteClasses({ EnableDiscoveryClientMissingImplTests.class, - CloudHypermediaAutoConfigurationIntegrationTests.class }) +@SuiteClasses({ EnableDiscoveryClientMissingImplTests.class, CloudHypermediaAutoConfigurationIntegrationTests.class }) @Ignore public class AdhocTestSuite { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java index 7e55d1b8..12b97677 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java @@ -43,19 +43,14 @@ public class CommonsClientAutoConfigurationTests { ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(CommonsClientAutoConfiguration.class, - SimpleDiscoveryClientAutoConfiguration.class, - UtilAutoConfiguration.class)); + SimpleDiscoveryClientAutoConfiguration.class, UtilAutoConfiguration.class)); @Test public void beansCreatedNormally() { - applicationContextRunner - .withConfiguration( - AutoConfigurations.of(HealthEndpointAutoConfiguration.class)) - .withPropertyValues("management.endpoints.web.exposure.include=features") - .run(ctxt -> { + applicationContextRunner.withConfiguration(AutoConfigurations.of(HealthEndpointAutoConfiguration.class)) + .withPropertyValues("management.endpoints.web.exposure.include=features").run(ctxt -> { then(ctxt.getBean(DiscoveryClientHealthIndicator.class)).isNotNull(); - then(ctxt.getBean(DiscoveryCompositeHealthContributor.class)) - .isNotNull(); + then(ctxt.getBean(DiscoveryCompositeHealthContributor.class)).isNotNull(); then(ctxt.getBean(FeaturesEndpoint.class)).isNotNull(); then(ctxt.getBeansOfType(HasFeatures.class).values()).isNotEmpty(); }); @@ -63,14 +58,10 @@ public class CommonsClientAutoConfigurationTests { @Test public void disableAll() { - applicationContextRunner - .withPropertyValues("spring.cloud.discovery.enabled=false", - "management.endpoints.web.exposure.include=features") - .run(ctxt -> { - assertThat(ctxt) - .doesNotHaveBean(DiscoveryClientHealthIndicator.class); - assertThat(ctxt) - .doesNotHaveBean(DiscoveryCompositeHealthContributor.class); + applicationContextRunner.withPropertyValues("spring.cloud.discovery.enabled=false", + "management.endpoints.web.exposure.include=features").run(ctxt -> { + assertThat(ctxt).doesNotHaveBean(DiscoveryClientHealthIndicator.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryCompositeHealthContributor.class); then(ctxt.getBean(FeaturesEndpoint.class)).isNotNull(); // features actuator is independent of discovery assertThat(ctxt).doesNotHaveBean(HasFeatures.class); @@ -79,14 +70,10 @@ public class CommonsClientAutoConfigurationTests { @Test public void disableBlocking() { - applicationContextRunner - .withPropertyValues("spring.cloud.discovery.blocking.enabled=false", - "management.endpoints.web.exposure.include=features") - .run(ctxt -> { - assertThat(ctxt) - .doesNotHaveBean(DiscoveryClientHealthIndicator.class); - assertThat(ctxt) - .doesNotHaveBean(DiscoveryCompositeHealthContributor.class); + applicationContextRunner.withPropertyValues("spring.cloud.discovery.blocking.enabled=false", + "management.endpoints.web.exposure.include=features").run(ctxt -> { + assertThat(ctxt).doesNotHaveBean(DiscoveryClientHealthIndicator.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryCompositeHealthContributor.class); then(ctxt.getBean(FeaturesEndpoint.class)).isNotNull(); // features actuator is independent of discovery assertThat(ctxt).doesNotHaveBean(HasFeatures.class); @@ -95,41 +82,30 @@ public class CommonsClientAutoConfigurationTests { @Test public void disableAllIndividually() { - applicationContextRunner.withPropertyValues( - "spring.cloud.discovery.client.health-indicator.enabled=false", + applicationContextRunner.withPropertyValues("spring.cloud.discovery.client.health-indicator.enabled=false", "spring.cloud.discovery.client.composite-indicator.enabled=false", "spring.cloud.features.enabled=false").run(ctxt -> { - assertThat(ctxt) - .doesNotHaveBean(DiscoveryClientHealthIndicator.class); - assertThat(ctxt) - .doesNotHaveBean(DiscoveryCompositeHealthContributor.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryClientHealthIndicator.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryCompositeHealthContributor.class); assertThat(ctxt).doesNotHaveBean(FeaturesEndpoint.class); }); } @Test public void disableHealthIndicator() { - applicationContextRunner - .withPropertyValues( - "spring.cloud.discovery.client.health-indicator.enabled=false") + applicationContextRunner.withPropertyValues("spring.cloud.discovery.client.health-indicator.enabled=false") .run(ctxt -> { - assertThat(ctxt) - .doesNotHaveBean(DiscoveryClientHealthIndicator.class); - assertThat(ctxt) - .doesNotHaveBean(DiscoveryCompositeHealthContributor.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryClientHealthIndicator.class); + assertThat(ctxt).doesNotHaveBean(DiscoveryCompositeHealthContributor.class); }); } @Test public void worksWithoutActuator() { - applicationContextRunner - .withClassLoader( - new FilteredClassLoader("org.springframework.boot.actuate")) + applicationContextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")) .run(context -> { - assertThat(context) - .doesNotHaveBean(DiscoveryClientHealthIndicator.class); - assertThat(context) - .doesNotHaveBean(DiscoveryCompositeHealthContributor.class); + assertThat(context).doesNotHaveBean(DiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(DiscoveryCompositeHealthContributor.class); then(context.getBeansOfType(HasFeatures.class).values()).isEmpty(); }); } @@ -146,12 +122,10 @@ public class CommonsClientAutoConfigurationTests { @Test public void conditionalOnBlockingDiscoveryEnabledWorks() { - applicationContextRunner - .withUserConfiguration(BlockingDiscoveryEnabledConfig.class) + applicationContextRunner.withUserConfiguration(BlockingDiscoveryEnabledConfig.class) .withPropertyValues("spring.cloud.discovery.blocking.enabled=false") .run(context -> assertThat(context).doesNotHaveBean(TestBean.class)); - applicationContextRunner - .withUserConfiguration(BlockingDiscoveryEnabledConfig.class) + applicationContextRunner.withUserConfiguration(BlockingDiscoveryEnabledConfig.class) .withPropertyValues("spring.cloud.discovery.blocking.enabled=true") .run(context -> assertThat(context.getBean(TestBean.class)).isNotNull()); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java index ee08a03c..0e424e05 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java @@ -40,20 +40,15 @@ public class ReactiveCommonsClientAutoConfigurationTests { ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(CommonsClientAutoConfiguration.class, - SimpleReactiveDiscoveryClientAutoConfiguration.class, - UtilAutoConfiguration.class, + SimpleReactiveDiscoveryClientAutoConfiguration.class, UtilAutoConfiguration.class, ReactiveCommonsClientAutoConfiguration.class)); @Test public void beansCreatedNormally() { - applicationContextRunner - .withPropertyValues("management.endpoints.web.exposure.include=features") + applicationContextRunner.withPropertyValues("management.endpoints.web.exposure.include=features") .run(context -> { - then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class)) - .isNotNull(); - then(context - .getBean(ReactiveDiscoveryCompositeHealthContributor.class)) - .isNotNull(); + then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class)).isNotNull(); + then(context.getBean(ReactiveDiscoveryCompositeHealthContributor.class)).isNotNull(); then(context.getBean(FeaturesEndpoint.class)).isNotNull(); then(context.getBeansOfType(HasFeatures.class).values()).isNotEmpty(); }); @@ -61,14 +56,10 @@ public class ReactiveCommonsClientAutoConfigurationTests { @Test public void disableAll() { - applicationContextRunner - .withPropertyValues("spring.cloud.discovery.enabled=false", - "management.endpoints.web.exposure.include=features") - .run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + applicationContextRunner.withPropertyValues("spring.cloud.discovery.enabled=false", + "management.endpoints.web.exposure.include=features").run(context -> { + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); // features actuator is independent of discovery then(context.getBean(FeaturesEndpoint.class)).isNotNull(); assertThat(context).doesNotHaveBean(HasFeatures.class); @@ -77,14 +68,10 @@ public class ReactiveCommonsClientAutoConfigurationTests { @Test public void disableReactive() { - applicationContextRunner - .withPropertyValues("spring.cloud.discovery.reactive.enabled=false", - "management.endpoints.web.exposure.include=features") - .run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + applicationContextRunner.withPropertyValues("spring.cloud.discovery.reactive.enabled=false", + "management.endpoints.web.exposure.include=features").run(context -> { + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); // features actuator is independent of discovery then(context.getBean(FeaturesEndpoint.class)).isNotNull(); assertThat(context).doesNotHaveBean(HasFeatures.class); @@ -93,55 +80,40 @@ public class ReactiveCommonsClientAutoConfigurationTests { @Test public void disableAllIndividually() { - applicationContextRunner.withPropertyValues( - "spring.cloud.discovery.client.health-indicator.enabled=false", + applicationContextRunner.withPropertyValues("spring.cloud.discovery.client.health-indicator.enabled=false", "spring.cloud.discovery.client.composite-indicator.enabled=false", "spring.cloud.features.enabled=false").run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); assertThat(context).doesNotHaveBean(FeaturesEndpoint.class); }); } @Test public void disableHealthIndicator() { - applicationContextRunner - .withPropertyValues( - "spring.cloud.discovery.client.health-indicator.enabled=false") + applicationContextRunner.withPropertyValues("spring.cloud.discovery.client.health-indicator.enabled=false") .run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); }); } @Test public void worksWithoutActuator() { - applicationContextRunner - .withClassLoader( - new FilteredClassLoader("org.springframework.boot.actuate")) + applicationContextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")) .run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); then(context.getBeansOfType(HasFeatures.class).values()).isEmpty(); }); } @Test public void worksWithoutWebflux() { - applicationContextRunner - .withClassLoader( - new FilteredClassLoader("org.springframework.web.reactive")) + applicationContextRunner.withClassLoader(new FilteredClassLoader("org.springframework.web.reactive")) .run(context -> { - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryCompositeHealthContributor.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryCompositeHealthContributor.class); assertThat(context).doesNotHaveBean(HasFeatures.class); }); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java index 91a0cba4..0998a648 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java @@ -42,8 +42,7 @@ public class FeaturesEndpointTests { @Before public void setup() { this.context = new AnnotationConfigApplicationContext(); - this.context.register(JacksonAutoConfiguration.class, FeaturesConfig.class, - Config.class); + this.context.register(JacksonAutoConfiguration.class, FeaturesConfig.class, Config.class); this.context.refresh(); } @@ -56,8 +55,7 @@ public class FeaturesEndpointTests { @Test public void invokeWorks() { - FeaturesEndpoint.Features features = this.context.getBean(FeaturesEndpoint.class) - .features(); + FeaturesEndpoint.Features features = this.context.getBean(FeaturesEndpoint.class).features(); then(features).isNotNull(); then(features.getEnabled()).hasSize(2).contains(newFeature("foo", Foo.class), newFeature("Baz Feature", Baz.class)); @@ -78,8 +76,7 @@ public class FeaturesEndpointTests { @Bean HasFeatures localFeatures() { - HasFeatures features = HasFeatures.namedFeatures( - new NamedFeature("foo", Foo.class), + HasFeatures features = HasFeatures.namedFeatures(new NamedFeature("foo", Foo.class), new NamedFeature("Baz Feature", Baz.class)); features.getAbstractFeatures().add(Bar.class); return features; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/circuitbreaker/CustomizerTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/circuitbreaker/CustomizerTests.java index 8039a650..80b399b6 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/circuitbreaker/CustomizerTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/circuitbreaker/CustomizerTests.java @@ -26,8 +26,7 @@ public class CustomizerTests { @Test public void testCustomizedOnlyOnce() { AtomicInteger counter = new AtomicInteger(0); - final Customizer customizer = Customizer - .once(AtomicInteger::incrementAndGet, Object::hashCode); + final Customizer customizer = Customizer.once(AtomicInteger::incrementAndGet, Object::hashCode); customizer.customize(counter); customizer.customize(counter); customizer.customize(counter); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java index 04755bc4..cf3bf270 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java @@ -35,8 +35,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest( - properties = { "spring.cloud.service-registry.auto-registration.enabled: false" }) +@SpringBootTest(properties = { "spring.cloud.service-registry.auto-registration.enabled: false" }) public class AutoRegisterPropertyFalseTests { @Autowired(required = false) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelectorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelectorTests.java index f6f9f16a..31ec9442 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelectorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientImportSelectorTests.java @@ -54,8 +54,7 @@ public class EnableDiscoveryClientImportSelectorTests { public void autoRegistrationIsEnabled() { configureAnnotation(true); String[] imports = this.importSelector.selectImports(this.annotationMetadata); - then(this.environment.getProperty( - "spring.cloud.service-registry.auto-registration.enabled", Boolean.class, + then(this.environment.getProperty("spring.cloud.service-registry.auto-registration.enabled", Boolean.class, true)).isTrue(); then(imports).hasSize(1); } @@ -64,9 +63,8 @@ public class EnableDiscoveryClientImportSelectorTests { public void autoRegistrationIsDisabled() { configureAnnotation(false); String[] imports = this.importSelector.selectImports(this.annotationMetadata); - then(this.environment.getProperty( - "spring.cloud.service-registry.auto-registration.enabled", Boolean.class)) - .isFalse(); + then(this.environment.getProperty("spring.cloud.service-registry.auto-registration.enabled", Boolean.class)) + .isFalse(); then(imports).isEmpty(); } @@ -75,8 +73,7 @@ public class EnableDiscoveryClientImportSelectorTests { given(this.annotationMetadata.isAnnotated(annotationName)).willReturn(true); given(this.annotationMetadata.getAnnotationAttributes(annotationName, true)) .willReturn(this.annotationAttributes); - given(this.annotationAttributes.getBoolean("autoRegister")) - .willReturn(autoRegistration); + given(this.annotationAttributes.getBoolean("autoRegister")).willReturn(autoRegistration); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java index 5bb8beee..28badd15 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java @@ -37,8 +37,8 @@ public class EnableDiscoveryClientMissingImplTests { @Test public void testContextFails() { - try (ConfigurableApplicationContext context = new SpringApplicationBuilder() - .sources(App.class).web(WebApplicationType.NONE).run()) { + try (ConfigurableApplicationContext context = new SpringApplicationBuilder().sources(App.class) + .web(WebApplicationType.NONE).run()) { // do sth } catch (NestedRuntimeException e) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/ManagementServerPortUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/ManagementServerPortUtilsTests.java index 8427b8ab..520cb185 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/ManagementServerPortUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/ManagementServerPortUtilsTests.java @@ -35,8 +35,8 @@ public class ManagementServerPortUtilsTests { @Test public void contextStarts() { - try (ConfigurableApplicationContext context = new SpringApplicationBuilder() - .web(WebApplicationType.NONE).sources(TestApp.class).run()) { + try (ConfigurableApplicationContext context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + .sources(TestApp.class).run()) { then(ManagementServerPortUtils.hasActuator).isFalse(); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java index 3eae7c80..328d1528 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java @@ -60,8 +60,7 @@ public class CompositeDiscoveryClientAutoConfigurationTests { CompositeDiscoveryClient compositeDiscoveryClient = (CompositeDiscoveryClient) this.discoveryClient; then(compositeDiscoveryClient.getDiscoveryClients().get(0).description()) .isEqualTo("A custom discovery client"); - then(compositeDiscoveryClient.getDiscoveryClients().get(1)) - .isInstanceOf(SimpleDiscoveryClient.class); + then(compositeDiscoveryClient.getDiscoveryClients().get(1)).isInstanceOf(SimpleDiscoveryClient.class); } @EnableAutoConfiguration diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java index c5dbc891..084de0ed 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java @@ -55,8 +55,7 @@ public class CompositeDiscoveryClientOrderTest { // then: then(discoveryClients.get(0).description()).isEqualTo(CUSTOM_DISCOVERY_CLIENT); - then(discoveryClients.get(1).description()) - .isEqualTo(DEFAULT_ORDER_DISCOVERY_CLIENT); + then(discoveryClients.get(1).description()).isEqualTo(DEFAULT_ORDER_DISCOVERY_CLIENT); then(discoveryClients.get(2).description()).isEqualTo("Simple Discovery Client"); then(discoveryClients.get(3).description()).isEqualTo(FOURTH_DISCOVERY_CLIENT); } @@ -64,8 +63,7 @@ public class CompositeDiscoveryClientOrderTest { @Test public void shouldOnlyReturnServiceInstancesForTheHighestPrecedenceDiscoveryClient() { // when: - List serviceInstances = this.discoveryClient - .getInstances(CUSTOM_SERVICE_ID); + List serviceInstances = this.discoveryClient.getInstances(CUSTOM_SERVICE_ID); // then: then(serviceInstances).hasSize(1); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java index fcebe880..fe4f774f 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java @@ -37,11 +37,12 @@ import static org.springframework.cloud.client.discovery.composite.CompositeDisc */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "spring.application.name=service0", - "spring.cloud.discovery.client.simple.instances.service1[0].uri=http://s11:8080", - "spring.cloud.discovery.client.simple.instances.service1[1].uri=https://s12:8443", - "spring.cloud.discovery.client.simple.instances.service2[0].uri=https://s21:8080", - "spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s22:443" }, +@SpringBootTest( + properties = { "spring.application.name=service0", + "spring.cloud.discovery.client.simple.instances.service1[0].uri=http://s11:8080", + "spring.cloud.discovery.client.simple.instances.service1[1].uri=https://s12:8443", + "spring.cloud.discovery.client.simple.instances.service2[0].uri=https://s21:8080", + "spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s22:443" }, classes = { CompositeDiscoveryClientTestsConfig.class }) public class CompositeDiscoveryClientTests { @@ -63,8 +64,7 @@ public class CompositeDiscoveryClientTests { @Test public void getServicesShouldAggregateAllServiceNames() { - then(this.discoveryClient.getServices()).containsOnlyOnce("service1", "service2", - "custom"); + then(this.discoveryClient.getServices()).containsOnlyOnce("service1", "service2", "custom"); } @Test diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java index 4c0657e9..e7a5ef0a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java @@ -68,8 +68,8 @@ public class CompositeDiscoveryClientTestsConfig { @Override public List getInstances(String serviceId) { if (serviceId.equals(CUSTOM_SERVICE_ID)) { - ServiceInstance s1 = new DefaultServiceInstance("customInstance", - CUSTOM_SERVICE_ID, "host", 123, false); + ServiceInstance s1 = new DefaultServiceInstance("customInstance", CUSTOM_SERVICE_ID, "host", 123, + false); return singletonList(s1); } return Collections.emptyList(); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfigurationTests.java index a2a0b22c..4ab9b6c6 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfigurationTests.java @@ -34,30 +34,25 @@ import static org.assertj.core.api.Assertions.assertThat; class ReactiveCompositeDiscoveryClientAutoConfigurationTests { private ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations - .of(ReactiveCompositeDiscoveryClientAutoConfiguration.class)); + .withConfiguration(AutoConfigurations.of(ReactiveCompositeDiscoveryClientAutoConfiguration.class)); @Test public void shouldCreateCompositeReactiveDiscoveryClientWithoutDelegates() { this.contextRunner.run((context) -> { - ReactiveDiscoveryClient client = context - .getBean(ReactiveDiscoveryClient.class); + ReactiveDiscoveryClient client = context.getBean(ReactiveDiscoveryClient.class); assertThat(client).isNotNull(); assertThat(client).isInstanceOf(ReactiveCompositeDiscoveryClient.class); - assertThat(((ReactiveCompositeDiscoveryClient) client).getDiscoveryClients()) - .isEmpty(); + assertThat(((ReactiveCompositeDiscoveryClient) client).getDiscoveryClients()).isEmpty(); }); } @Test public void shouldCreateCompositeReactiveDiscoveryClientWithDelegate() { this.contextRunner.withUserConfiguration(Configuration.class).run((context) -> { - ReactiveDiscoveryClient client = context - .getBean(ReactiveDiscoveryClient.class); + ReactiveDiscoveryClient client = context.getBean(ReactiveDiscoveryClient.class); assertThat(client).isNotNull(); assertThat(client).isInstanceOf(ReactiveCompositeDiscoveryClient.class); - assertThat(((ReactiveCompositeDiscoveryClient) client).getDiscoveryClients()) - .hasSize(1); + assertThat(((ReactiveCompositeDiscoveryClient) client).getDiscoveryClients()).hasSize(1); }); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientTests.java index c2f81e84..36f70730 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientTests.java @@ -47,8 +47,7 @@ class ReactiveCompositeDiscoveryClientTests { @Test public void shouldReturnEmptyFluxOfServices() { - ReactiveCompositeDiscoveryClient client = new ReactiveCompositeDiscoveryClient( - emptyList()); + ReactiveCompositeDiscoveryClient client = new ReactiveCompositeDiscoveryClient(emptyList()); Flux services = client.getServices(); @@ -76,15 +75,13 @@ class ReactiveCompositeDiscoveryClientTests { Flux services = client.getServices(); - StepVerifier.create(services).expectNext("serviceAFromClient1") - .expectNext("serviceBFromClient1").expectNext("serviceCFromClient2") - .expectComplete().verify(); + StepVerifier.create(services).expectNext("serviceAFromClient1").expectNext("serviceBFromClient1") + .expectNext("serviceCFromClient2").expectComplete().verify(); } @Test public void shouldReturnEmptyFluxOfServiceInstances() { - ReactiveCompositeDiscoveryClient client = new ReactiveCompositeDiscoveryClient( - emptyList()); + ReactiveCompositeDiscoveryClient client = new ReactiveCompositeDiscoveryClient(emptyList()); Flux instances = client.getInstances("service"); @@ -93,32 +90,28 @@ class ReactiveCompositeDiscoveryClientTests { @Test public void shouldReturnFluxOfServiceInstances() { - DefaultServiceInstance serviceInstance1 = new DefaultServiceInstance("instance", - "service", "localhost", 8080, false); - DefaultServiceInstance serviceInstance2 = new DefaultServiceInstance("instance2", - "service", "localhost", 8080, false); - TestPublisher discoveryClient1Publisher = TestPublisher - .createCold(); + DefaultServiceInstance serviceInstance1 = new DefaultServiceInstance("instance", "service", "localhost", 8080, + false); + DefaultServiceInstance serviceInstance2 = new DefaultServiceInstance("instance2", "service", "localhost", 8080, + false); + TestPublisher discoveryClient1Publisher = TestPublisher.createCold(); discoveryClient1Publisher.emit(serviceInstance1); discoveryClient1Publisher.emit(serviceInstance2); discoveryClient1Publisher.complete(); - TestPublisher discoveryClient2Publisher = TestPublisher - .createCold(); + TestPublisher discoveryClient2Publisher = TestPublisher.createCold(); discoveryClient2Publisher.complete(); - when(discoveryClient1.getInstances("service")) - .thenReturn(discoveryClient1Publisher.flux()); - when(discoveryClient2.getInstances("service")) - .thenReturn(discoveryClient2Publisher.flux()); + when(discoveryClient1.getInstances("service")).thenReturn(discoveryClient1Publisher.flux()); + when(discoveryClient2.getInstances("service")).thenReturn(discoveryClient2Publisher.flux()); ReactiveCompositeDiscoveryClient client = new ReactiveCompositeDiscoveryClient( asList(discoveryClient1, discoveryClient2)); Flux instances = client.getInstances("service"); - StepVerifier.create(instances).expectNext(serviceInstance1) - .expectNext(serviceInstance2).expectComplete().verify(); + StepVerifier.create(instances).expectNext(serviceInstance1).expectNext(serviceInstance2).expectComplete() + .verify(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java index 4e533315..b1aa4bc4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java @@ -45,9 +45,7 @@ import static org.mockito.Mockito.mock; */ @RunWith(SpringRunner.class) // @checkstyle:off -@SpringBootTest( - classes = { DiscoveryClientHealthIndicatorTests.Config.class, - CommonsClientAutoConfiguration.class }, +@SpringBootTest(classes = { DiscoveryClientHealthIndicatorTests.Config.class, CommonsClientAutoConfiguration.class }, properties = "spring.cloud.discovery.client.health-indicator.include-description:true") // @checkstyle:on public class DiscoveryClientHealthIndicatorTests { @@ -64,18 +62,15 @@ public class DiscoveryClientHealthIndicatorTests { assertHealth(getHealth("testDiscoveryHealthIndicator"), Status.UNKNOWN); assertHealth(getHealth("discoveryClient"), Status.UNKNOWN); - this.clientHealthIndicator - .onApplicationEvent(new InstanceRegisteredEvent<>(this, null)); + this.clientHealthIndicator.onApplicationEvent(new InstanceRegisteredEvent<>(this, null)); assertHealth(getHealth("testDiscoveryHealthIndicator"), Status.UNKNOWN); Status status = assertHealth(getHealth("discoveryClient"), Status.UP); - then(status.getDescription()).as("status description was wrong") - .isEqualTo("TestDiscoveryClient"); + then(status.getDescription()).as("status description was wrong").isEqualTo("TestDiscoveryClient"); } private Health getHealth(String name) { - HealthContributor delegate = ((CompositeHealthContributor) this.healthContributor) - .getContributor(name); + HealthContributor delegate = ((CompositeHealthContributor) this.healthContributor).getContributor(name); return ((HealthIndicator) delegate).health(); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributorTests.java index d7a6d922..4e5a3b60 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributorTests.java @@ -39,15 +39,13 @@ public class DiscoveryCompositeHealthContributorTests { @Test public void createWhenIndicatorsAreNullThrowsException() throws Exception { - assertThatIllegalArgumentException() - .isThrownBy(() -> new DiscoveryCompositeHealthContributor(null)) + assertThatIllegalArgumentException().isThrownBy(() -> new DiscoveryCompositeHealthContributor(null)) .withMessage("'indicators' must not be null"); } @Test public void getContributorReturnsContributor() throws Exception { - TestDiscoveryHealthIndicator indicator = new TestDiscoveryHealthIndicator("test", - Health.up().build()); + TestDiscoveryHealthIndicator indicator = new TestDiscoveryHealthIndicator("test", Health.up().build()); DiscoveryCompositeHealthContributor composite = new DiscoveryCompositeHealthContributor( Arrays.asList(indicator)); HealthIndicator adapted = (HealthIndicator) composite.getContributor("test"); @@ -57,8 +55,7 @@ public class DiscoveryCompositeHealthContributorTests { @Test public void getContributorWhenMissingReturnsNull() throws Exception { - TestDiscoveryHealthIndicator indicator = new TestDiscoveryHealthIndicator("test", - Health.up().build()); + TestDiscoveryHealthIndicator indicator = new TestDiscoveryHealthIndicator("test", Health.up().build()); DiscoveryCompositeHealthContributor composite = new DiscoveryCompositeHealthContributor( Arrays.asList(indicator)); assertThat((HealthIndicator) composite.getContributor("missing")).isNull(); @@ -66,10 +63,8 @@ public class DiscoveryCompositeHealthContributorTests { @Test public void iteratorIteratesNamedContributors() throws Exception { - TestDiscoveryHealthIndicator indicator1 = new TestDiscoveryHealthIndicator( - "test1", Health.up().build()); - TestDiscoveryHealthIndicator indicator2 = new TestDiscoveryHealthIndicator( - "test2", Health.down().build()); + TestDiscoveryHealthIndicator indicator1 = new TestDiscoveryHealthIndicator("test1", Health.up().build()); + TestDiscoveryHealthIndicator indicator2 = new TestDiscoveryHealthIndicator("test2", Health.down().build()); DiscoveryCompositeHealthContributor composite = new DiscoveryCompositeHealthContributor( Arrays.asList(indicator1, indicator2)); List> contributors = new ArrayList<>(); @@ -77,14 +72,12 @@ public class DiscoveryCompositeHealthContributorTests { contributors.add(contributor); } assertThat(contributors).hasSize(2); - assertThat(contributors).extracting("name").containsExactlyInAnyOrder("test1", - "test2"); + assertThat(contributors).extracting("name").containsExactlyInAnyOrder("test1", "test2"); assertThat(contributors).extracting("contributor").extracting("health") .containsExactlyInAnyOrder(indicator1.health(), indicator2.health()); } - private static class TestDiscoveryHealthIndicator - implements DiscoveryHealthIndicator { + private static class TestDiscoveryHealthIndicator implements DiscoveryHealthIndicator { private final String name; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicatorTests.java index 8895fd5e..2dbb88e7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryClientHealthIndicatorTests.java @@ -61,8 +61,7 @@ class ReactiveDiscoveryClientHealthIndicatorTests { @Test public void shouldReturnUnknownStatusWhenNotInitialized() { - Health expectedHealth = Health.status( - new Status(Status.UNKNOWN.getCode(), "Discovery Client not initialized")) + Health expectedHealth = Health.status(new Status(Status.UNKNOWN.getCode(), "Discovery Client not initialized")) .build(); Mono health = indicator.health(); StepVerifier.create(health).expectNext(expectedHealth).expectComplete().verify(); @@ -72,8 +71,8 @@ class ReactiveDiscoveryClientHealthIndicatorTests { public void shouldReturnUpStatusWithoutServices() { when(discoveryClient.description()).thenReturn("Mocked Service Discovery Client"); when(discoveryClient.getServices()).thenReturn(Flux.empty()); - Health expectedHealth = Health.status(new Status(Status.UP.getCode(), "")) - .withDetail("services", emptyList()).build(); + Health expectedHealth = Health.status(new Status(Status.UP.getCode(), "")).withDetail("services", emptyList()) + .build(); indicator.onApplicationEvent(new InstanceRegisteredEvent<>(this, null)); Mono health = indicator.health(); @@ -87,9 +86,7 @@ class ReactiveDiscoveryClientHealthIndicatorTests { when(discoveryClient.getServices()).thenReturn(Flux.just("service")); when(properties.isIncludeDescription()).thenReturn(true); when(discoveryClient.description()).thenReturn("Mocked Service Discovery Client"); - Health expectedHealth = Health - .status(new Status(Status.UP.getCode(), - "Mocked Service Discovery Client")) + Health expectedHealth = Health.status(new Status(Status.UP.getCode(), "Mocked Service Discovery Client")) .withDetail("services", singletonList("service")).build(); indicator.onApplicationEvent(new InstanceRegisteredEvent<>(this, null)); @@ -108,8 +105,7 @@ class ReactiveDiscoveryClientHealthIndicatorTests { indicator.onApplicationEvent(new InstanceRegisteredEvent<>(this, null)); Mono health = indicator.health(); - StepVerifier.create(health).expectNext(expectedHealth).expectComplete() - .verifyThenAssertThat(); + StepVerifier.create(health).expectNext(expectedHealth).expectComplete().verifyThenAssertThat(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributorTests.java index 530f3b00..cd7a0cb2 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/reactive/ReactiveDiscoveryCompositeHealthContributorTests.java @@ -54,8 +54,7 @@ class ReactiveDiscoveryCompositeHealthContributorTests { @Test void shouldReturnKnownContributor() { - ReactiveDiscoveryHealthIndicator indicator = mock( - ReactiveDiscoveryHealthIndicator.class); + ReactiveDiscoveryHealthIndicator indicator = mock(ReactiveDiscoveryHealthIndicator.class); Health health = Health.up().build(); when(indicator.getName()).thenReturn("known"); when(indicator.health()).thenReturn(Mono.just(health)); @@ -64,19 +63,15 @@ class ReactiveDiscoveryCompositeHealthContributorTests { singletonList(indicator)); assertThat(healthContributor.getContributor("known")).isNotNull(); - Iterator> iterator = healthContributor - .iterator(); + Iterator> iterator = healthContributor.iterator(); assertThat(iterator.hasNext()).isTrue(); NamedContributor contributor = iterator.next(); assertThat(contributor).isNotNull(); assertThat(contributor.getName()).isEqualTo("known"); assertThat(contributor.getContributor()).isNotNull(); - assertThat(contributor.getContributor()) - .isInstanceOf(ReactiveHealthIndicator.class); - ReactiveHealthIndicator healthIndicator = (ReactiveHealthIndicator) contributor - .getContributor(); - StepVerifier.create(healthIndicator.getHealth(true)).expectNext(health) - .expectComplete().verify(); + assertThat(contributor.getContributor()).isInstanceOf(ReactiveHealthIndicator.class); + ReactiveHealthIndicator healthIndicator = (ReactiveHealthIndicator) contributor.getContributor(); + StepVerifier.create(healthIndicator.getHealth(true)).expectNext(health).expectComplete().verify(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java index c4ff1ca8..7b90a4e5 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java @@ -32,8 +32,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest( - classes = ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.Config.class, +@SpringBootTest(classes = ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.Config.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "spring.main.web-application-type=reactive") public class ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java index 48c40bc8..53feda84 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java @@ -32,8 +32,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest( - classes = ServletSimpleDiscoveryPropertiesAutoConfigurationTests.Config.class, +@SpringBootTest(classes = ServletSimpleDiscoveryPropertiesAutoConfigurationTests.Config.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ServletSimpleDiscoveryPropertiesAutoConfigurationTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java index daeb0fff..3d1a4188 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java @@ -56,16 +56,13 @@ public class SimpleDiscoveryClientPropertiesMappingTests { then(this.props.getInstances().get("service1").size()).isEqualTo(2); then(this.props.getInstances().get("service1").get(0).getHost()).isEqualTo("s11"); then(this.props.getInstances().get("service1").get(0).getPort()).isEqualTo(8080); - then(this.props.getInstances().get("service1").get(0).getUri()) - .isEqualTo(URI.create("http://s11:8080")); - then(this.props.getInstances().get("service1").get(0).isSecure()) - .isEqualTo(false); + then(this.props.getInstances().get("service1").get(0).getUri()).isEqualTo(URI.create("http://s11:8080")); + then(this.props.getInstances().get("service1").get(0).isSecure()).isEqualTo(false); then(this.props.getInstances().get("service2").size()).isEqualTo(2); then(this.props.getInstances().get("service2").get(0).getHost()).isEqualTo("s21"); then(this.props.getInstances().get("service2").get(0).getPort()).isEqualTo(8080); - then(this.props.getInstances().get("service2").get(0).getUri()) - .isEqualTo(URI.create("https://s21:8080")); + then(this.props.getInstances().get("service2").get(0).getUri()).isEqualTo(URI.create("https://s21:8080")); then(this.props.getInstances().get("service2").get(0).isSecure()).isEqualTo(true); } @@ -83,8 +80,7 @@ public class SimpleDiscoveryClientPropertiesMappingTests { @Test public void testGetServices() { - then(this.discoveryClient.getServices()).containsExactlyInAnyOrder("service1", - "service2"); + then(this.discoveryClient.getServices()).containsExactlyInAnyOrder("service1", "service2"); } @Test diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java index dae04dfd..a5ffaf62 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java @@ -42,10 +42,8 @@ public class SimpleDiscoveryClientTests { SimpleDiscoveryProperties simpleDiscoveryProperties = new SimpleDiscoveryProperties(); Map> map = new HashMap<>(); - SimpleServiceInstance service1Inst1 = new SimpleServiceInstance( - URI.create("http://host1:8080")); - SimpleServiceInstance service1Inst2 = new SimpleServiceInstance( - URI.create("https://host2:8443")); + SimpleServiceInstance service1Inst1 = new SimpleServiceInstance(URI.create("http://host1:8080")); + SimpleServiceInstance service1Inst2 = new SimpleServiceInstance(URI.create("https://host2:8443")); map.put("service1", Arrays.asList(service1Inst1, service1Inst2)); simpleDiscoveryProperties.setInstances(map); simpleDiscoveryProperties.init(); @@ -54,8 +52,7 @@ public class SimpleDiscoveryClientTests { @Test public void shouldBeAbleToRetrieveServiceDetailsByName() { - List instances = this.simpleDiscoveryClient - .getInstances("service1"); + List instances = this.simpleDiscoveryClient.getInstances("service1"); then(instances.size()).isEqualTo(2); then(instances.get(0).getServiceId()).isEqualTo("service1"); then(instances.get(0).getHost()).isEqualTo("host1"); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfigurationTests.java index 244fce88..b6ba733a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfigurationTests.java @@ -34,27 +34,21 @@ import static org.assertj.core.api.Assertions.assertThat; */ class SimpleReactiveDiscoveryClientAutoConfigurationTests { - private ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of( - SimpleReactiveDiscoveryClientAutoConfiguration.class, - UtilAutoConfiguration.class)); + private ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration( + AutoConfigurations.of(SimpleReactiveDiscoveryClientAutoConfiguration.class, UtilAutoConfiguration.class)); @Test public void shouldUseDefaults() { this.contextRunner.run((context) -> { - ReactiveDiscoveryClient client = context - .getBean(ReactiveDiscoveryClient.class); + ReactiveDiscoveryClient client = context.getBean(ReactiveDiscoveryClient.class); assertThat(client).isNotNull(); - assertThat(client.getOrder()) - .isEqualTo(ReactiveDiscoveryClient.DEFAULT_ORDER); + assertThat(client.getOrder()).isEqualTo(ReactiveDiscoveryClient.DEFAULT_ORDER); InetUtils inet = context.getBean(InetUtils.class); assertThat(inet).isNotNull(); - SimpleReactiveDiscoveryProperties properties = context - .getBean(SimpleReactiveDiscoveryProperties.class); + SimpleReactiveDiscoveryProperties properties = context.getBean(SimpleReactiveDiscoveryProperties.class); assertThat(properties).isNotNull(); assertThat(properties.getLocal().getServiceId()).isEqualTo("application"); - assertThat(properties.getLocal().getHost()) - .isEqualTo(inet.findFirstNonLoopbackHostInfo().getHostname()); + assertThat(properties.getLocal().getHost()).isEqualTo(inet.findFirstNonLoopbackHostInfo().getHostname()); assertThat(properties.getLocal().getPort()).isEqualTo(8080); }); } @@ -63,11 +57,9 @@ class SimpleReactiveDiscoveryClientAutoConfigurationTests { public void shouldUseCustomConfiguration() { this.contextRunner.withUserConfiguration(Configuration.class) .withPropertyValues("spring.application.name=my-service", - "spring.cloud.discovery.client.simple.order=1", - "server.port=8443") + "spring.cloud.discovery.client.simple.order=1", "server.port=8443") .run((context) -> { - ReactiveDiscoveryClient client = context - .getBean(ReactiveDiscoveryClient.class); + ReactiveDiscoveryClient client = context.getBean(ReactiveDiscoveryClient.class); assertThat(client).isNotNull(); assertThat(client.getOrder()).isEqualTo(1); InetUtils inet = context.getBean(InetUtils.class); @@ -75,8 +67,7 @@ class SimpleReactiveDiscoveryClientAutoConfigurationTests { SimpleReactiveDiscoveryProperties properties = context .getBean(SimpleReactiveDiscoveryProperties.class); assertThat(properties).isNotNull(); - assertThat(properties.getLocal().getServiceId()) - .isEqualTo("my-service"); + assertThat(properties.getLocal().getServiceId()).isEqualTo("my-service"); assertThat(properties.getLocal().getHost()) .isEqualTo(inet.findFirstNonLoopbackHostInfo().getHostname()); assertThat(properties.getLocal().getPort()).isEqualTo(8443); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java index 0252e7e0..50fbf545 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.java @@ -36,22 +36,19 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class SimpleReactiveDiscoveryClientTests { - private final SimpleServiceInstance service1Inst1 = new SimpleServiceInstance( - URI.create("http://host1:8080")); + private final SimpleServiceInstance service1Inst1 = new SimpleServiceInstance(URI.create("http://host1:8080")); - private final SimpleServiceInstance service1Inst2 = new SimpleServiceInstance( - URI.create("https://host2:8443")); + private final SimpleServiceInstance service1Inst2 = new SimpleServiceInstance(URI.create("https://host2:8443")); private SimpleReactiveDiscoveryClient client; @BeforeEach public void setUp() { SimpleReactiveDiscoveryProperties simpleReactiveDiscoveryProperties = new SimpleReactiveDiscoveryProperties(); - simpleReactiveDiscoveryProperties.setInstances( - singletonMap("service", Arrays.asList(service1Inst1, service1Inst2))); + simpleReactiveDiscoveryProperties + .setInstances(singletonMap("service", Arrays.asList(service1Inst1, service1Inst2))); simpleReactiveDiscoveryProperties.init(); - this.client = new SimpleReactiveDiscoveryClient( - simpleReactiveDiscoveryProperties); + this.client = new SimpleReactiveDiscoveryClient(simpleReactiveDiscoveryProperties); } @Test @@ -75,8 +72,7 @@ public class SimpleReactiveDiscoveryClientTests { @Test public void shouldReturnFluxOfServiceInstances() { Flux services = this.client.getInstances("service"); - StepVerifier.create(services).expectNext(service1Inst1).expectNext(service1Inst2) - .expectComplete().verify(); + StepVerifier.create(services).expectNext(service1Inst1).expectNext(service1Inst2).expectComplete().verify(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java index ef39c36e..0de4896c 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfigurationIntegrationTests.java @@ -36,20 +36,16 @@ import static org.assertj.core.api.BDDAssertions.then; */ public class CloudHypermediaAutoConfigurationIntegrationTests { - private static ConfigurableApplicationContext getApplicationContext( - Class configuration) { - return new SpringApplicationBuilder(configuration).properties("server.port=0") - .run(); + private static ConfigurableApplicationContext getApplicationContext(Class configuration) { + return new SpringApplicationBuilder(configuration).properties("server.port=0").run(); } @Test public void picksUpHypermediaProperties() { - try (ConfigurableApplicationContext context = getApplicationContext( - ConfigWithRemoteResource.class)) { + try (ConfigurableApplicationContext context = getApplicationContext(ConfigWithRemoteResource.class)) { - CloudHypermediaProperties properties = context - .getBean(CloudHypermediaProperties.class); + CloudHypermediaProperties properties = context.getBean(CloudHypermediaProperties.class); then(properties.getRefresh().getInitialDelay()).isEqualTo(50000); then(properties.getRefresh().getFixedDelay()).isEqualTo(10000); @@ -59,8 +55,7 @@ public class CloudHypermediaAutoConfigurationIntegrationTests { @Test public void doesNotCreateCloudHypermediaPropertiesifNotActive() { - try (ConfigurableApplicationContext context = getApplicationContext( - Config.class)) { + try (ConfigurableApplicationContext context = getApplicationContext(Config.class)) { then(context.getBeanNamesForType(CloudHypermediaProperties.class)).hasSize(0); } } @@ -68,8 +63,7 @@ public class CloudHypermediaAutoConfigurationIntegrationTests { @Test public void doesNotRegisterResourceRefresherIfNoDiscoveredResourceIsDefined() { - try (ConfigurableApplicationContext context = getApplicationContext( - Config.class)) { + try (ConfigurableApplicationContext context = getApplicationContext(Config.class)) { then(context.getBeansOfType(RemoteResource.class).values()).hasSize(0); then(context.getBeanNamesForType(RemoteResourceRefresher.class)).hasSize(0); @@ -79,8 +73,7 @@ public class CloudHypermediaAutoConfigurationIntegrationTests { @Test public void registersResourceRefresherIfDiscoverredResourceIsDefined() { - try (ConfigurableApplicationContext context = getApplicationContext( - ConfigWithRemoteResource.class)) { + try (ConfigurableApplicationContext context = getApplicationContext(ConfigWithRemoteResource.class)) { then(context.getBeansOfType(RemoteResource.class).values()).hasSize(1); then(context.getBean(RemoteResourceRefresher.class)).isNotNull(); @@ -101,8 +94,7 @@ public class CloudHypermediaAutoConfigurationIntegrationTests { public RemoteResource resource() { ServiceInstanceProvider provider = new StaticServiceInstanceProvider( - new DefaultServiceInstance("instance", "service", "localhost", 80, - false)); + new DefaultServiceInstance("instance", "service", "localhost", 80, false)); return new DiscoveredResource(provider, traverson -> traverson.follow("rel")); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DiscoveredResourceUnitTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DiscoveredResourceUnitTests.java index d19bc4db..c245116e 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DiscoveredResourceUnitTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DiscoveredResourceUnitTests.java @@ -59,8 +59,7 @@ public class DiscoveredResourceUnitTests { @Before public void setUp() { - when(this.traversal.buildTraversal(Matchers.any(Traverson.class))) - .thenReturn(this.builder); + when(this.traversal.buildTraversal(Matchers.any(Traverson.class))).thenReturn(this.builder); this.resource = new DiscoveredResource(this.provider, this.traversal); this.resource.setRestOperations(this.operations); @@ -76,8 +75,8 @@ public class DiscoveredResourceUnitTests { Link link = new Link("target", "rel"); - when(this.provider.getServiceInstance()).thenReturn(new DefaultServiceInstance( - "instance", "service", "localhost", 8080, false)); + when(this.provider.getServiceInstance()) + .thenReturn(new DefaultServiceInstance("instance", "service", "localhost", 8080, false)); when(this.builder.asTemplatedLink()).thenReturn(link); this.resource.verifyOrDiscover(); @@ -103,8 +102,7 @@ public class DiscoveredResourceUnitTests { verificationTriggersDiscovery(); - doThrow(RestClientException.class).when(this.operations) - .headForHeaders(anyString()); + doThrow(RestClientException.class).when(this.operations).headForHeaders(anyString()); this.resource.verifyOrDiscover(); then(this.resource.getLink()).isNull(); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DynamicServiceInstanceProviderUnitTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DynamicServiceInstanceProviderUnitTests.java index 51b57076..5b1fb213 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DynamicServiceInstanceProviderUnitTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DynamicServiceInstanceProviderUnitTests.java @@ -42,8 +42,7 @@ public class DynamicServiceInstanceProviderUnitTests { @Test public void returnsNoServiceInCaseNoneIsAvailable() { - then(new DynamicServiceInstanceProvider(this.client, "service") - .getServiceInstance()).isNull(); + then(new DynamicServiceInstanceProvider(this.client, "service").getServiceInstance()).isNull(); } @Test @@ -52,11 +51,9 @@ public class DynamicServiceInstanceProviderUnitTests { ServiceInstance first = mock(ServiceInstance.class); ServiceInstance second = mock(ServiceInstance.class); - when(this.client.getInstances(anyString())) - .thenReturn(Arrays.asList(first, second)); + when(this.client.getInstances(anyString())).thenReturn(Arrays.asList(first, second)); - then(new DynamicServiceInstanceProvider(this.client, "service") - .getServiceInstance()).isEqualTo(first); + then(new DynamicServiceInstanceProvider(this.client, "service").getServiceInstance()).isEqualTo(first); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java index da55a31d..81a95dfe 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java @@ -50,8 +50,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { @Test public void restTemplateGetsLoadBalancerInterceptor() { ConfigurableApplicationContext context = init(OneRestTemplate.class); - final Map restTemplates = context - .getBeansOfType(RestTemplate.class); + final Map restTemplates = context.getBeansOfType(RestTemplate.class); then(restTemplates).isNotNull(); then(restTemplates.values()).hasSize(1); @@ -66,8 +65,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { @Test public void multipleRestTemplates() { ConfigurableApplicationContext context = init(TwoRestTemplates.class); - final Map restTemplates = context - .getBeansOfType(RestTemplate.class); + final Map restTemplates = context.getBeansOfType(RestTemplate.class); then(restTemplates).isNotNull(); Collection templates = restTemplates.values(); @@ -84,8 +82,8 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { protected ConfigurableApplicationContext init(Class config) { return new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.aop.proxyTargetClass=true") - .sources(config, LoadBalancerAutoConfiguration.class).run(); + .properties("spring.aop.proxyTargetClass=true").sources(config, LoadBalancerAutoConfiguration.class) + .run(); } @Configuration(proxyBeanMethods = false) @@ -149,8 +147,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { @Override public ServiceInstance choose(String serviceId, Request request) { - return new DefaultServiceInstance(serviceId, serviceId, serviceId, - this.random.nextInt(40000), false); + return new DefaultServiceInstance(serviceId, serviceId, serviceId, this.random.nextInt(40000), false); } @Override @@ -164,8 +161,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { } @Override - public T execute(String serviceId, ServiceInstance serviceInstance, - LoadBalancerRequest request) { + public T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) { try { return request.apply(choose(serviceId, REQUEST)); } @@ -181,8 +177,7 @@ public abstract class AbstractLoadBalancerAutoConfigurationTests { } - private static class TestLoadBalancerFactory - implements ReactiveLoadBalancer.Factory { + private static class TestLoadBalancerFactory implements ReactiveLoadBalancer.Factory { @Override public ReactiveLoadBalancer getInstance(String serviceId) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java index 8f36ff54..252a4b61 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfigurationTests.java @@ -49,8 +49,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { @Test public void restTemplateGetsLoadBalancerInterceptor() { ConfigurableApplicationContext context = init(OneRestTemplate.class); - final Map restTemplates = context - .getBeansOfType(AsyncRestTemplate.class); + final Map restTemplates = context.getBeansOfType(AsyncRestTemplate.class); then(restTemplates).isNotNull(); then(restTemplates.values()).hasSize(1); @@ -61,8 +60,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { } private void assertLoadBalanced(AsyncRestTemplate restTemplate) { - List interceptors = restTemplate - .getInterceptors(); + List interceptors = restTemplate.getInterceptors(); then(interceptors).hasSize(1); AsyncClientHttpRequestInterceptor interceptor = interceptors.get(0); then(interceptor).isInstanceOf(AsyncLoadBalancerInterceptor.class); @@ -71,8 +69,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { @Test public void multipleRestTemplates() { ConfigurableApplicationContext context = init(TwoRestTemplates.class); - final Map restTemplates = context - .getBeansOfType(AsyncRestTemplate.class); + final Map restTemplates = context.getBeansOfType(AsyncRestTemplate.class); then(restTemplates).isNotNull(); Collection templates = restTemplates.values(); @@ -160,8 +157,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { @Override public ServiceInstance choose(String serviceId, Request request) { - return new DefaultServiceInstance(serviceId, serviceId, serviceId, - this.random.nextInt(40000), false); + return new DefaultServiceInstance(serviceId, serviceId, serviceId, this.random.nextInt(40000), false); } @Override @@ -175,8 +171,7 @@ public class AsyncLoadBalancerAutoConfigurationTests { } @Override - public T execute(String serviceId, ServiceInstance serviceInstance, - LoadBalancerRequest request) { + public T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) { try { return request.apply(choose(serviceId, REQUEST)); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java index e9863561..1bccb927 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/ClientHttpResponseStatusCodeExceptionTest.java @@ -41,14 +41,13 @@ public class ClientHttpResponseStatusCodeExceptionTest { public void testCreation() throws Exception { MyClientHttpResponse response = new MyClientHttpResponse(); then(response.isClosed()).isFalse(); - ClientHttpResponseStatusCodeException exp = new ClientHttpResponseStatusCodeException( - "service", response, response.getStatusText().getBytes()); + ClientHttpResponseStatusCodeException exp = new ClientHttpResponseStatusCodeException("service", response, + response.getStatusText().getBytes()); ClientHttpResponse expResponse = exp.getResponse(); then(expResponse.getRawStatusCode()).isEqualTo(response.getRawStatusCode()); then(expResponse.getStatusText()).isEqualTo(response.getStatusText()); then(expResponse.getHeaders()).isEqualTo(response.getHeaders()); - then(new String(StreamUtils.copyToByteArray(expResponse.getBody()))) - .isEqualTo(response.getStatusText()); + then(new String(StreamUtils.copyToByteArray(expResponse.getBody()))).isEqualTo(response.getStatusText()); } class MyClientHttpResponse extends AbstractClientHttpResponse { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java index 01317834..2038582c 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java @@ -65,13 +65,12 @@ public class InterceptorRetryPolicyTest { @Test public void canRetryBeforeExecution() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class); when(context.getRetryCount()).thenReturn(0); ServiceInstance serviceInstance = mock(ServiceInstance.class); - when(this.serviceInstanceChooser.choose(eq(this.serviceName))) - .thenReturn(serviceInstance); + when(this.serviceInstanceChooser.choose(eq(this.serviceName))).thenReturn(serviceInstance); then(interceptorRetryPolicy.canRetry(context)).isTrue(); verify(context, times(1)).setServiceInstance(eq(serviceInstance)); @@ -79,8 +78,8 @@ public class InterceptorRetryPolicyTest { @Test public void canRetryNextServer() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class); when(context.getRetryCount()).thenReturn(1); when(this.policy.canRetryNextServer(eq(context))).thenReturn(true); @@ -89,8 +88,8 @@ public class InterceptorRetryPolicyTest { @Test public void cannotRetry() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class); when(context.getRetryCount()).thenReturn(1); then(interceptorRetryPolicy.canRetry(context)).isFalse(); @@ -98,16 +97,16 @@ public class InterceptorRetryPolicyTest { @Test public void open() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); RetryContext context = interceptorRetryPolicy.open(null); then(context).isInstanceOf(LoadBalancedRetryContext.class); } @Test public void close() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class); interceptorRetryPolicy.close(context); verify(this.policy, times(1)).close(eq(context)); @@ -115,8 +114,8 @@ public class InterceptorRetryPolicyTest { @Test public void registerThrowable() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); LoadBalancedRetryContext context = mock(LoadBalancedRetryContext.class); Throwable thrown = new Exception(); interceptorRetryPolicy.registerThrowable(context, thrown); @@ -126,13 +125,14 @@ public class InterceptorRetryPolicyTest { @Test public void equals() throws Exception { - InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy( - this.request, this.policy, this.serviceInstanceChooser, this.serviceName); + InterceptorRetryPolicy interceptorRetryPolicy = new InterceptorRetryPolicy(this.request, this.policy, + this.serviceInstanceChooser, this.serviceName); then(interceptorRetryPolicy.equals(null)).isFalse(); then(interceptorRetryPolicy.equals(new Object())).isFalse(); then(interceptorRetryPolicy.equals(interceptorRetryPolicy)).isTrue(); - then(interceptorRetryPolicy.equals(new InterceptorRetryPolicy(this.request, - this.policy, this.serviceInstanceChooser, this.serviceName))).isTrue(); + then(interceptorRetryPolicy.equals( + new InterceptorRetryPolicy(this.request, this.policy, this.serviceInstanceChooser, this.serviceName))) + .isTrue(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryContextTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryContextTest.java index 0c4bbfe4..e99ab74f 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryContextTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancedRetryContextTest.java @@ -53,15 +53,13 @@ public class LoadBalancedRetryContextTest { @Test public void getRequest() throws Exception { - LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, - this.request); + LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, this.request); then(lbContext.getRequest()).isEqualTo(this.request); } @Test public void setRequest() throws Exception { - LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, - this.request); + LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, this.request); HttpRequest newRequest = mock(HttpRequest.class); lbContext.setRequest(newRequest); then(lbContext.getRequest()).isEqualTo(newRequest); @@ -69,8 +67,7 @@ public class LoadBalancedRetryContextTest { @Test public void getServiceInstance() throws Exception { - LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, - this.request); + LoadBalancedRetryContext lbContext = new LoadBalancedRetryContext(this.context, this.request); ServiceInstance serviceInstance = mock(ServiceInstance.class); lbContext.setServiceInstance(serviceInstance); then(lbContext.getServiceInstance()).isEqualTo(serviceInstance); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfigurationTests.java index 7e6e08db..6a92b5f1 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfigurationTests.java @@ -32,8 +32,7 @@ import static org.assertj.core.api.BDDAssertions.then; */ @RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" }) -public class LoadBalancerAutoConfigurationTests - extends AbstractLoadBalancerAutoConfigurationTests { +public class LoadBalancerAutoConfigurationTests extends AbstractLoadBalancerAutoConfigurationTests { @Override protected void assertLoadBalanced(RestTemplate restTemplate) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java index 582b055f..bd439c10 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryConfigurationTests.java @@ -75,14 +75,12 @@ public class LoadBalancerRequestFactoryConfigurationTests { } protected ConfigurableApplicationContext init(Class config) { - ConfigurableApplicationContext context = new SpringApplicationBuilder() - .web(WebApplicationType.NONE) - .properties("spring.aop.proxyTargetClass=true") - .sources(config, LoadBalancerAutoConfiguration.class).run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + .properties("spring.aop.proxyTargetClass=true").sources(config, LoadBalancerAutoConfiguration.class) + .run(); this.lbReqFactory = context.getBean(LoadBalancerRequestFactory.class); - this.lbRequest = this.lbReqFactory.createRequest(this.request, this.body, - this.execution); + this.lbRequest = this.lbReqFactory.createRequest(this.request, this.body, this.execution); return context; } @@ -92,14 +90,14 @@ public class LoadBalancerRequestFactoryConfigurationTests { LoadBalancerRequestTransformer transformer = context.getBean("transformer", LoadBalancerRequestTransformer.class); - when(transformer.transformRequest(any(ServiceRequestWrapper.class), - eq(this.instance))).thenReturn(this.transformedRequest); + when(transformer.transformRequest(any(ServiceRequestWrapper.class), eq(this.instance))) + .thenReturn(this.transformedRequest); this.lbRequest.apply(this.instance); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue()).as( - "transformer should have transformed the ServiceRequestWrapper into transformedRequest") + then(this.httpRequestCaptor.getValue()) + .as("transformer should have transformed the ServiceRequestWrapper into transformedRequest") .isEqualTo(this.transformedRequest); } @@ -110,8 +108,7 @@ public class LoadBalancerRequestFactoryConfigurationTests { this.lbRequest.apply(this.instance); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue().getClass()) - .as("ServiceRequestWrapper should be executed") + then(this.httpRequestCaptor.getValue().getClass()).as("ServiceRequestWrapper should be executed") .isEqualTo(ServiceRequestWrapper.class); } @@ -121,8 +118,8 @@ public class LoadBalancerRequestFactoryConfigurationTests { LoadBalancerRequestTransformer transformer = context.getBean("transformer", LoadBalancerRequestTransformer.class); - when(transformer.transformRequest(any(ServiceRequestWrapper.class), - eq(this.instance))).thenReturn(this.transformedRequest); + when(transformer.transformRequest(any(ServiceRequestWrapper.class), eq(this.instance))) + .thenReturn(this.transformedRequest); LoadBalancerRequestTransformer transformer2 = context.getBean("transformer2", LoadBalancerRequestTransformer.class); when(transformer2.transformRequest(this.transformedRequest, this.instance)) @@ -131,8 +128,7 @@ public class LoadBalancerRequestFactoryConfigurationTests { this.lbRequest.apply(this.instance); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue()) - .as("transformer2 should run after transformer") + then(this.httpRequestCaptor.getValue()).as("transformer2 should run after transformer") .isEqualTo(this.transformedRequest2); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryTests.java index 177465be..28426eb0 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryTests.java @@ -79,8 +79,7 @@ public class LoadBalancerRequestFactoryTests { executeLbRequest(null); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue().getClass()) - .as("request should be of type ServiceRequestWrapper") + then(this.httpRequestCaptor.getValue().getClass()).as("request should be of type ServiceRequestWrapper") .isEqualTo(ServiceRequestWrapper.class); } @@ -91,49 +90,44 @@ public class LoadBalancerRequestFactoryTests { executeLbRequest(transformers); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue().getClass()) - .as("request should be of type ServiceRequestWrapper") + then(this.httpRequestCaptor.getValue().getClass()).as("request should be of type ServiceRequestWrapper") .isEqualTo(ServiceRequestWrapper.class); } @Test public void testOneTransformer() throws Exception { - List transformers = Arrays - .asList(this.transformer1); - when(this.transformer1.transformRequest(any(ServiceRequestWrapper.class), - eq(this.instance))).thenReturn(this.transformedRequest1); + List transformers = Arrays.asList(this.transformer1); + when(this.transformer1.transformRequest(any(ServiceRequestWrapper.class), eq(this.instance))) + .thenReturn(this.transformedRequest1); executeLbRequest(transformers); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue()).as( - "transformer1 should have transformed request into transformedRequest1") + then(this.httpRequestCaptor.getValue()) + .as("transformer1 should have transformed request into transformedRequest1") .isEqualTo(this.transformedRequest1); } @Test public void testTwoTransformers() throws Exception { - List transformers = Arrays - .asList(this.transformer1, this.transformer2); - when(this.transformer1.transformRequest(any(ServiceRequestWrapper.class), - eq(this.instance))).thenReturn(this.transformedRequest1); + List transformers = Arrays.asList(this.transformer1, this.transformer2); + when(this.transformer1.transformRequest(any(ServiceRequestWrapper.class), eq(this.instance))) + .thenReturn(this.transformedRequest1); when(this.transformer2.transformRequest(this.transformedRequest1, this.instance)) .thenReturn(this.transformedRequest2); executeLbRequest(transformers); verify(this.execution).execute(this.httpRequestCaptor.capture(), eq(this.body)); - then(this.httpRequestCaptor.getValue()).as( - "transformer2 should have transformed transformedRequest1 into transformedRequest2") + then(this.httpRequestCaptor.getValue()) + .as("transformer2 should have transformed transformedRequest1 into transformedRequest2") .isEqualTo(this.transformedRequest2); } - private void executeLbRequest(List transformers) - throws Exception { - LoadBalancerRequestFactory lbReqFactory = new LoadBalancerRequestFactory( - this.loadBalancer, transformers); - LoadBalancerRequest lbRequest = lbReqFactory - .createRequest(this.request, this.body, this.execution); + private void executeLbRequest(List transformers) throws Exception { + LoadBalancerRequestFactory lbReqFactory = new LoadBalancerRequestFactory(this.loadBalancer, transformers); + LoadBalancerRequest lbRequest = lbReqFactory.createRequest(this.request, this.body, + this.execution); lbRequest.apply(this.instance); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriToolsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriToolsTests.java index 6388791c..78a16301 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriToolsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerUriToolsTests.java @@ -37,11 +37,9 @@ class LoadBalancerUriToolsTests { @Test void originalURIReturnedIfDataMatches() { TestServiceInstance serviceInstance = new TestServiceInstance(); - URI original = UriComponentsBuilder.fromUriString("http://test.example:8080/xxx") - .build().toUri(); + URI original = UriComponentsBuilder.fromUriString("http://test.example:8080/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isEqualTo(original); } @@ -49,11 +47,9 @@ class LoadBalancerUriToolsTests { @Test void serviceInstanceHostSet() { TestServiceInstance serviceInstance = new TestServiceInstance(); - URI original = UriComponentsBuilder - .fromUriString("http://testHost.example:8080/xxx").build().toUri(); + URI original = UriComponentsBuilder.fromUriString("http://testHost.example:8080/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getHost()).isEqualTo(serviceInstance.getHost()); @@ -61,13 +57,10 @@ class LoadBalancerUriToolsTests { @Test void serviceInstanceSchemeSet() { - TestServiceInstance serviceInstance = new TestServiceInstance() - .withScheme("https"); - URI original = UriComponentsBuilder.fromUriString("http://test.example/xxx") - .build().toUri(); + TestServiceInstance serviceInstance = new TestServiceInstance().withScheme("https"); + URI original = UriComponentsBuilder.fromUriString("http://test.example/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getScheme()).isEqualTo(serviceInstance.getScheme()); @@ -76,11 +69,9 @@ class LoadBalancerUriToolsTests { @Test void originalSchemeSetIfServiceInstanceSchemeMissing() { TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null); - URI original = UriComponentsBuilder.fromUriString("https://test.example/xxx") - .build().toUri(); + URI original = UriComponentsBuilder.fromUriString("https://test.example/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getScheme()).isEqualTo(original.getScheme()); @@ -88,13 +79,10 @@ class LoadBalancerUriToolsTests { @Test void secureSchemeSetIfServiceInstanceSchemeMissingAndServiceInstanceSecure() { - TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null) - .withSecure(true); - URI original = UriComponentsBuilder.fromUriString("http://test.example/xxx") - .build().toUri(); + TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null).withSecure(true); + URI original = UriComponentsBuilder.fromUriString("http://test.example/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getScheme()).isEqualTo("https"); @@ -102,13 +90,10 @@ class LoadBalancerUriToolsTests { @Test void secureWsSchemeSetIfServiceInstanceSchemeMissingAndServiceInstanceSecure() { - TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null) - .withSecure(true); - URI original = UriComponentsBuilder.fromUriString("ws://test.example/xxx").build() - .toUri(); + TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null).withSecure(true); + URI original = UriComponentsBuilder.fromUriString("ws://test.example/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getScheme()).isEqualTo("wss"); @@ -117,11 +102,9 @@ class LoadBalancerUriToolsTests { @Test void defaultSchemeSetIfMissing() { TestServiceInstance serviceInstance = new TestServiceInstance().withScheme(null); - URI original = UriComponentsBuilder.fromUriString("//test.example/xxx").build() - .toUri(); + URI original = UriComponentsBuilder.fromUriString("//test.example/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getScheme()).isEqualTo("http"); @@ -130,11 +113,9 @@ class LoadBalancerUriToolsTests { @Test void serviceInstancePortSet() { TestServiceInstance serviceInstance = new TestServiceInstance().withPort(0); - URI original = UriComponentsBuilder.fromUriString("http://test.example:8080/xxx") - .build().toUri(); + URI original = UriComponentsBuilder.fromUriString("http://test.example:8080/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getPort()).isEqualTo(serviceInstance.getPort()); @@ -143,11 +124,9 @@ class LoadBalancerUriToolsTests { @Test void defaultHttpPortSetIfServiceInstancePortIncorrect() { TestServiceInstance serviceInstance = new TestServiceInstance().withPort(-1); - URI original = UriComponentsBuilder.fromUriString("http://test.example:8888/xxx") - .build().toUri(); + URI original = UriComponentsBuilder.fromUriString("http://test.example:8888/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getPort()).isEqualTo(80); @@ -155,13 +134,10 @@ class LoadBalancerUriToolsTests { @Test void defaultHttpsPortSetIfServiceInstancePortIncorrect() { - TestServiceInstance serviceInstance = new TestServiceInstance() - .withScheme("https").withPort(-1); - URI original = UriComponentsBuilder.fromUriString("http://test.example:8888/xxx") - .build().toUri(); + TestServiceInstance serviceInstance = new TestServiceInstance().withScheme("https").withPort(-1); + URI original = UriComponentsBuilder.fromUriString("http://test.example:8888/xxx").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getPort()).isEqualTo(443); @@ -170,12 +146,11 @@ class LoadBalancerUriToolsTests { @Test void originalUserInfoSet() { TestServiceInstance serviceInstance = new TestServiceInstance(); - URI original = UriComponentsBuilder.fromUriString( - "http://testUser@testHost.example/path?query1=test1&query2=test2#fragment") - .build().toUri(); + URI original = UriComponentsBuilder + .fromUriString("http://testUser@testHost.example/path?query1=test1&query2=test2#fragment").build() + .toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getRawUserInfo()).isEqualTo(original.getRawUserInfo()); @@ -190,12 +165,10 @@ class LoadBalancerUriToolsTests { @Test void reconstructedURIEncodedCorrectly() { TestServiceInstance serviceInstance = new TestServiceInstance(); - URI original = UriComponentsBuilder.fromUriString( - "http://test.example/path%40%21%242?query=val%40%21%242#frag%40%21%242") - .build().toUri(); + URI original = UriComponentsBuilder + .fromUriString("http://test.example/path%40%21%242?query=val%40%21%242#frag%40%21%242").build().toUri(); - URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, - original); + URI reconstructed = LoadBalancerUriTools.reconstructURI(serviceInstance, original); assertThat(reconstructed).isNotNull(); assertThat(reconstructed.getRawUserInfo()).isEqualTo(original.getRawUserInfo()); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerAutoConfigurationTests.java index 3799ce96..aa1d3a2b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerAutoConfigurationTests.java @@ -30,8 +30,7 @@ import static org.assertj.core.api.BDDAssertions.then; /** * @author Ryan Baxter */ -public class RetryLoadBalancerAutoConfigurationTests - extends AbstractLoadBalancerAutoConfigurationTests { +public class RetryLoadBalancerAutoConfigurationTests extends AbstractLoadBalancerAutoConfigurationTests { @Override protected void assertLoadBalanced(RestTemplate restTemplate) { @@ -44,11 +43,9 @@ public class RetryLoadBalancerAutoConfigurationTests @Test public void testDefaultBackOffPolicy() { ConfigurableApplicationContext context = init(OneRestTemplate.class); - LoadBalancedRetryFactory loadBalancedRetryFactory = context - .getBean(LoadBalancedRetryFactory.class); + LoadBalancedRetryFactory loadBalancedRetryFactory = context.getBean(LoadBalancedRetryFactory.class); then(loadBalancedRetryFactory).isInstanceOf(LoadBalancedRetryFactory.class); - then(loadBalancedRetryFactory.createBackOffPolicy("foo")) - .isInstanceOf(NoBackOffPolicy.class); + then(loadBalancedRetryFactory.createBackOffPolicy("foo")).isInstanceOf(NoBackOffPolicy.class); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java index ff3e08ea..931e6307 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTests.java @@ -106,17 +106,15 @@ public class RetryLoadBalancerInterceptorTests { when(request.getURI()).thenReturn(new URI("http://foo")); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenThrow(new IOException()); + when(client.execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenThrow(new IOException()); retryProperties.setEnabled(false); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, loadBalancedRetryFactory, - properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, loadBalancedRetryFactory, properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); interceptor.intercept(request, body, execution); verify(lbRequestFactory).createRequest(request, body, execution); @@ -127,9 +125,8 @@ public class RetryLoadBalancerInterceptorTests { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://foo_underscore")); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, loadBalancedRetryFactory, - properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, loadBalancedRetryFactory, properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); interceptor.intercept(request, body, execution); @@ -139,18 +136,15 @@ public class RetryLoadBalancerInterceptorTests { public void interceptNeverRetry() throws Throwable { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://foo")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenReturn(clientHttpResponse); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); + when(client.execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenReturn(clientHttpResponse); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, loadBalancedRetryFactory, - properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, loadBalancedRetryFactory, properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); interceptor.intercept(request, body, execution); @@ -161,19 +155,16 @@ public class RetryLoadBalancerInterceptorTests { public void interceptSuccess() throws Throwable { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://foo")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenReturn(clientHttpResponse); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); + when(client.execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenReturn(clientHttpResponse); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy), properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); @@ -187,30 +178,23 @@ public class RetryLoadBalancerInterceptorTests { when(request.getURI()).thenReturn(new URI("http://foo")); InputStream notFoundStream = mock(InputStream.class); when(notFoundStream.read(any(byte[].class))).thenReturn(-1); - ClientHttpResponse clientHttpResponseNotFound = new MockClientHttpResponse( - notFoundStream, HttpStatus.NOT_FOUND); - ClientHttpResponse clientHttpResponseOk = new MockClientHttpResponse( - new byte[] {}, HttpStatus.OK); + ClientHttpResponse clientHttpResponseNotFound = new MockClientHttpResponse(notFoundStream, + HttpStatus.NOT_FOUND); + ClientHttpResponse clientHttpResponseOk = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.retryableStatusCode(eq(HttpStatus.NOT_FOUND.value()))) - .thenReturn(true); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(true); + when(policy.retryableStatusCode(eq(HttpStatus.NOT_FOUND.value()))).thenReturn(true); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(true); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - nullable(LoadBalancerRequest.class))) - .thenReturn(clientHttpResponseNotFound) - .thenReturn(clientHttpResponseOk); + when(client.execute(eq("foo"), eq(serviceInstance), nullable(LoadBalancerRequest.class))) + .thenReturn(clientHttpResponseNotFound).thenReturn(clientHttpResponseOk); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy), properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); - verify(client, times(2)).execute(eq("foo"), eq(serviceInstance), - nullable(LoadBalancerRequest.class)); + verify(client, times(2)).execute(eq("foo"), eq(serviceInstance), nullable(LoadBalancerRequest.class)); verify(notFoundStream, times(1)).close(); then(rsp).isEqualTo(clientHttpResponseOk); verify(lbRequestFactory, times(2)).createRequest(request, body, execution); @@ -222,14 +206,12 @@ public class RetryLoadBalancerInterceptorTests { when(request.getURI()).thenReturn(new URI("http://foo")); InputStream notFoundStream = new ByteArrayInputStream("foo".getBytes()); - ClientHttpResponse clientHttpResponseNotFound = new MockClientHttpResponse( - notFoundStream, HttpStatus.NOT_FOUND); + ClientHttpResponse clientHttpResponseNotFound = new MockClientHttpResponse(notFoundStream, + HttpStatus.NOT_FOUND); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.retryableStatusCode(eq(HttpStatus.NOT_FOUND.value()))) - .thenReturn(true); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(false); + when(policy.retryableStatusCode(eq(HttpStatus.NOT_FOUND.value()))).thenReturn(true); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(false); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); @@ -240,9 +222,8 @@ public class RetryLoadBalancerInterceptorTests { retryProperties.setEnabled(true); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy), properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy), properties, lbFactory); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); verify(client, times(1)).execute(eq("foo"), eq(serviceInstance), @@ -261,29 +242,22 @@ public class RetryLoadBalancerInterceptorTests { public void interceptRetry() throws Throwable { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://foo")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(true); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(true); MyBackOffPolicy backOffPolicy = new MyBackOffPolicy(); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenThrow(new IOException()) - .thenReturn(clientHttpResponse); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); + when(client.execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenThrow(new IOException()).thenReturn(clientHttpResponse); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy, backOffPolicy), properties, - lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy, backOffPolicy), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); - verify(client, times(2)).execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class)); + verify(client, times(2)).execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class)); then(rsp).isEqualTo(clientHttpResponse); verify(lbRequestFactory, times(2)).createRequest(request, body, execution); then(backOffPolicy.getBackoffAttempts()).isEqualTo(1); @@ -293,22 +267,17 @@ public class RetryLoadBalancerInterceptorTests { public void interceptFailedRetry() throws Exception { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://foo")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(false); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(false); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("foo"), any())).thenReturn(serviceInstance); - when(client.execute(eq("foo"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenThrow(new IOException()) - .thenReturn(clientHttpResponse); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); + when(client.execute(eq("foo"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenThrow(new IOException()).thenReturn(clientHttpResponse); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); retryProperties.setEnabled(true); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy), properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); interceptor.intercept(request, body, execution); @@ -323,31 +292,25 @@ public class RetryLoadBalancerInterceptorTests { public void retryListenerTest() throws Throwable { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://listener")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(true); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(true); MyBackOffPolicy backOffPolicy = new MyBackOffPolicy(); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("listener"), any())).thenReturn(serviceInstance); - when(client.execute(eq("listener"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenThrow(new IOException()) - .thenReturn(clientHttpResponse); + when(client.execute(eq("listener"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenThrow(new IOException()).thenReturn(clientHttpResponse); retryProperties.setEnabled(true); MyRetryListener retryListener = new MyRetryListener(); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy, backOffPolicy, - new RetryListener[] { retryListener }), + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, + new MyLoadBalancedRetryFactory(policy, backOffPolicy, new RetryListener[] { retryListener }), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); - verify(client, times(2)).execute(eq("listener"), eq(serviceInstance), - any(LoadBalancerRequest.class)); + verify(client, times(2)).execute(eq("listener"), eq(serviceInstance), any(LoadBalancerRequest.class)); then(rsp).isEqualTo(clientHttpResponse); verify(lbRequestFactory, times(2)).createRequest(request, body, execution); then(backOffPolicy.getBackoffAttempts()).isEqualTo(1); @@ -358,29 +321,22 @@ public class RetryLoadBalancerInterceptorTests { public void retryWithDefaultConstructorTest() throws Throwable { HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://default")); - ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, - HttpStatus.OK); + ClientHttpResponse clientHttpResponse = new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); LoadBalancedRetryPolicy policy = mock(LoadBalancedRetryPolicy.class); - when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))) - .thenReturn(true); + when(policy.canRetryNextServer(any(LoadBalancedRetryContext.class))).thenReturn(true); MyBackOffPolicy backOffPolicy = new MyBackOffPolicy(); ServiceInstance serviceInstance = mock(ServiceInstance.class); when(client.choose(eq("default"), any())).thenReturn(serviceInstance); - when(client.execute(eq("default"), eq(serviceInstance), - any(LoadBalancerRequest.class))).thenThrow(new IOException()) - .thenReturn(clientHttpResponse); + when(client.execute(eq("default"), eq(serviceInstance), any(LoadBalancerRequest.class))) + .thenThrow(new IOException()).thenReturn(clientHttpResponse); retryProperties.setEnabled(true); - when(lbRequestFactory.createRequest(any(), any(), any())) - .thenReturn(mock(LoadBalancerRequest.class)); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy, backOffPolicy), properties, - lbFactory); + when(lbRequestFactory.createRequest(any(), any(), any())).thenReturn(mock(LoadBalancerRequest.class)); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, new MyLoadBalancedRetryFactory(policy, backOffPolicy), properties, lbFactory); byte[] body = new byte[] {}; ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); ClientHttpResponse rsp = interceptor.intercept(request, body, execution); - verify(client, times(2)).execute(eq("default"), eq(serviceInstance), - any(LoadBalancerRequest.class)); + verify(client, times(2)).execute(eq("default"), eq(serviceInstance), any(LoadBalancerRequest.class)); then(rsp).isEqualTo(clientHttpResponse); verify(lbRequestFactory, times(2)).createRequest(request, body, execution); then(backOffPolicy.getBackoffAttempts()).isEqualTo(1); @@ -395,56 +351,46 @@ public class RetryLoadBalancerInterceptorTests { retryProperties.setEnabled(true); RetryListener myRetryListener = new RetryListenerSupport() { @Override - public boolean open(RetryContext context, - RetryCallback callback) { + public boolean open(RetryContext context, RetryCallback callback) { return false; } }; - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, - new MyLoadBalancedRetryFactory(policy, backOffPolicy, - new RetryListener[] { myRetryListener }), + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, + new MyLoadBalancedRetryFactory(policy, backOffPolicy, new RetryListener[] { myRetryListener }), properties, lbFactory); ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class); interceptor.intercept(request, new byte[] {}, execution); } @Test - public void shouldNotDuplicateLifecycleCalls() - throws IOException, URISyntaxException { + public void shouldNotDuplicateLifecycleCalls() throws IOException, URISyntaxException { Map lifecycleProcessors = new HashMap<>(); lifecycleProcessors.put("testLifecycle", new TestLoadBalancerLifecycle()); lifecycleProcessors.put("anotherLifecycle", new AnotherLoadBalancerLifecycle()); - when(lbFactory.getInstances("test", LoadBalancerLifecycle.class)) - .thenReturn(lifecycleProcessors); + when(lbFactory.getInstances("test", LoadBalancerLifecycle.class)).thenReturn(lifecycleProcessors); HttpRequest request = mock(HttpRequest.class); when(request.getURI()).thenReturn(new URI("http://test")); TestLoadBalancerClient client = new TestLoadBalancerClient(); - RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor( - client, retryProperties, lbRequestFactory, loadBalancedRetryFactory, - properties, lbFactory); + RetryLoadBalancerInterceptor interceptor = new RetryLoadBalancerInterceptor(client, retryProperties, + lbRequestFactory, loadBalancedRetryFactory, properties, lbFactory); - interceptor.intercept(request, new byte[] {}, - mock(ClientHttpRequestExecution.class)); + interceptor.intercept(request, new byte[] {}, mock(ClientHttpRequestExecution.class)); - assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("testLifecycle")) - .getStartLog()).hasSize(1); - assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("testLifecycle")) - .getCompleteLog()).hasSize(0); + assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("testLifecycle")).getStartLog()).hasSize(1); + assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("testLifecycle")).getCompleteLog()).hasSize(0); + assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("anotherLifecycle")).getStartLog()).hasSize(1); + assertThat(((TestLoadBalancerLifecycle) lifecycleProcessors.get("anotherLifecycle")).getCompleteLog()) + .hasSize(0); + assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors().get("testLifecycle")).getStartLog()) + .hasSize(0); + assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors().get("testLifecycle")).getCompleteLog()) + .hasSize(1); + assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors().get("anotherLifecycle")).getStartLog()) + .hasSize(0); assertThat( - ((TestLoadBalancerLifecycle) lifecycleProcessors.get("anotherLifecycle")) - .getStartLog()).hasSize(1); - assertThat( - ((TestLoadBalancerLifecycle) lifecycleProcessors.get("anotherLifecycle")) - .getCompleteLog()).hasSize(0); - assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors() - .get("testLifecycle")).getStartLog()).hasSize(0); - assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors() - .get("testLifecycle")).getCompleteLog()).hasSize(1); - assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors() - .get("anotherLifecycle")).getStartLog()).hasSize(0); - assertThat(((TestLoadBalancerLifecycle) client.getLifecycleProcessors() - .get("anotherLifecycle")).getCompleteLog()).hasSize(1); + ((TestLoadBalancerLifecycle) client.getLifecycleProcessors().get("anotherLifecycle")).getCompleteLog()) + .hasSize(1); } static class MyLoadBalancedRetryFactory implements LoadBalancedRetryFactory { @@ -459,14 +405,13 @@ public class RetryLoadBalancerInterceptorTests { this.loadBalancedRetryPolicy = loadBalancedRetryPolicy; } - MyLoadBalancedRetryFactory(LoadBalancedRetryPolicy loadBalancedRetryPolicy, - BackOffPolicy backOffPolicy) { + MyLoadBalancedRetryFactory(LoadBalancedRetryPolicy loadBalancedRetryPolicy, BackOffPolicy backOffPolicy) { this(loadBalancedRetryPolicy); this.backOffPolicy = backOffPolicy; } - MyLoadBalancedRetryFactory(LoadBalancedRetryPolicy loadBalancedRetryPolicy, - BackOffPolicy backOffPolicy, RetryListener[] retryListeners) { + MyLoadBalancedRetryFactory(LoadBalancedRetryPolicy loadBalancedRetryPolicy, BackOffPolicy backOffPolicy, + RetryListener[] retryListeners) { this(loadBalancedRetryPolicy, backOffPolicy); this.retryListeners = retryListeners; } @@ -514,8 +459,7 @@ public class RetryLoadBalancerInterceptorTests { } @Override - public void backOff(BackOffContext backOffContext) - throws BackOffInterruptedException { + public void backOff(BackOffContext backOffContext) throws BackOffInterruptedException { backoffAttempts++; } @@ -530,8 +474,8 @@ public class RetryLoadBalancerInterceptorTests { private int onError = 0; @Override - public void onError(RetryContext retryContext, - RetryCallback retryCallback, Throwable throwable) { + public void onError(RetryContext retryContext, RetryCallback retryCallback, + Throwable throwable) { onError++; } @@ -547,8 +491,7 @@ public class RetryLoadBalancerInterceptorTests { TestLoadBalancerClient() { lifecycleProcessors.put("testLifecycle", new TestLoadBalancerLifecycle()); - lifecycleProcessors.put("anotherLifecycle", - new AnotherLoadBalancerLifecycle()); + lifecycleProcessors.put("anotherLifecycle", new AnotherLoadBalancerLifecycle()); } @Override @@ -557,16 +500,14 @@ public class RetryLoadBalancerInterceptorTests { } @Override - public T execute(String serviceId, ServiceInstance serviceInstance, - LoadBalancerRequest request) { + public T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) { Set supportedLoadBalancerProcessors = LoadBalancerLifecycleValidator - .getSupportedLifecycleProcessors(lifecycleProcessors, - DefaultRequestContext.class, Object.class, + .getSupportedLifecycleProcessors(lifecycleProcessors, DefaultRequestContext.class, Object.class, ServiceInstance.class); T response = (T) new MockClientHttpResponse(new byte[] {}, HttpStatus.OK); - supportedLoadBalancerProcessors.forEach(lifecycle -> lifecycle - .onComplete(new CompletionContext(CompletionContext.Status.SUCCESS, + supportedLoadBalancerProcessors + .forEach(lifecycle -> lifecycle.onComplete(new CompletionContext(CompletionContext.Status.SUCCESS, new DefaultResponse(defaultServiceInstance())))); return response; } @@ -592,16 +533,14 @@ public class RetryLoadBalancerInterceptorTests { } - protected static class TestLoadBalancerLifecycle - implements LoadBalancerLifecycle { + protected static class TestLoadBalancerLifecycle implements LoadBalancerLifecycle { final ConcurrentHashMap> startLog = new ConcurrentHashMap<>(); final ConcurrentHashMap> completeLog = new ConcurrentHashMap<>(); @Override - public boolean supports(Class requestContextClass, Class responseClass, - Class serverTypeClass) { + public boolean supports(Class requestContextClass, Class responseClass, Class serverTypeClass) { return DefaultRequestContext.class.isAssignableFrom(requestContextClass) && Object.class.isAssignableFrom(responseClass) && ServiceInstance.class.isAssignableFrom(serverTypeClass); @@ -613,8 +552,7 @@ public class RetryLoadBalancerInterceptorTests { } @Override - public void onComplete( - CompletionContext completionContext) { + public void onComplete(CompletionContext completionContext) { completeLog.put(getName() + UUID.randomUUID(), completionContext); } @@ -632,8 +570,7 @@ public class RetryLoadBalancerInterceptorTests { } - protected static class AnotherLoadBalancerLifecycle - extends TestLoadBalancerLifecycle { + protected static class AnotherLoadBalancerLifecycle extends TestLoadBalancerLifecycle { @Override protected String getName() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java index 4ac68eb8..31311fb7 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerTestUtils.java @@ -43,32 +43,26 @@ final class LoadBalancerTestUtils { static ConfigurableApplicationContext init(Class... configClasses) { return new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(ArrayUtils.add(configClasses, WebClientAutoConfiguration.class)) - .run(); + .sources(ArrayUtils.add(configClasses, WebClientAutoConfiguration.class)).run(); } @SuppressWarnings("unchecked") static List getFilters(WebClient.Builder builder) { - return (List) ReflectionTestUtils.getField(builder, - "filters"); + return (List) ReflectionTestUtils.getField(builder, "filters"); } - static void assertLoadBalanced(WebClient.Builder webClientBuilder, - Class exchangeFilterFunctionClass) { + static void assertLoadBalanced(WebClient.Builder webClientBuilder, Class exchangeFilterFunctionClass) { List filters = getFilters(webClientBuilder); then(filters).hasSize(1); - then(filters.get(0)) - .isInstanceOf(DeferringLoadBalancerExchangeFilterFunction.class); + then(filters.get(0)).isInstanceOf(DeferringLoadBalancerExchangeFilterFunction.class); DeferringLoadBalancerExchangeFilterFunction interceptor = (DeferringLoadBalancerExchangeFilterFunction) filters .get(0); interceptor.tryResolveDelegate(); then(interceptor.getDelegate()).isInstanceOf(exchangeFilterFunctionClass); } - static void assertLoadBalanced(WebClient webClient, - Class exchangeFilterFunctionClass) { - assertLoadBalanced( - (WebClient.Builder) ReflectionTestUtils.getField(webClient, "builder"), + static void assertLoadBalanced(WebClient webClient, Class exchangeFilterFunctionClass) { + assertLoadBalanced((WebClient.Builder) ReflectionTestUtils.getField(webClient, "builder"), exchangeFilterFunctionClass); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfigurationTests.java index 091e587b..cac43fc8 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfigurationTests.java @@ -44,38 +44,32 @@ public class ReactorLoadBalancerClientAutoConfigurationTests { @Test void loadBalancerFilterAddedToWebClientBuilder() { ConfigurableApplicationContext context = init(OneWebClientBuilder.class); - final Map webClientBuilders = context - .getBeansOfType(WebClient.Builder.class); + final Map webClientBuilders = context.getBeansOfType(WebClient.Builder.class); then(webClientBuilders).isNotNull().hasSize(1); WebClient.Builder webClientBuilder = webClientBuilders.values().iterator().next(); then(webClientBuilder).isNotNull(); - assertLoadBalanced(webClientBuilder, - ReactorLoadBalancerExchangeFilterFunction.class); + assertLoadBalanced(webClientBuilder, ReactorLoadBalancerExchangeFilterFunction.class); final Map testServiceMap = context .getBeansOfType(OneWebClientBuilder.TestService.class); then(testServiceMap).isNotNull().hasSize(1); - OneWebClientBuilder.TestService testService = testServiceMap.values().stream() - .findFirst().get(); - assertLoadBalanced(testService.webClient, - ReactorLoadBalancerExchangeFilterFunction.class); + OneWebClientBuilder.TestService testService = testServiceMap.values().stream().findFirst().get(); + assertLoadBalanced(testService.webClient, ReactorLoadBalancerExchangeFilterFunction.class); } @Test void loadBalancerFilterAddedOnlyToLoadBalancedWebClientBuilder() { ConfigurableApplicationContext context = init(TwoWebClientBuilders.class); - final Map webClientBuilders = context - .getBeansOfType(WebClient.Builder.class); + final Map webClientBuilders = context.getBeansOfType(WebClient.Builder.class); then(webClientBuilders).hasSize(2); TwoWebClientBuilders.Two two = context.getBean(TwoWebClientBuilders.Two.class); then(two.loadBalanced).isNotNull(); - assertLoadBalanced(two.loadBalanced, - ReactorLoadBalancerExchangeFilterFunction.class); + assertLoadBalanced(two.loadBalanced, ReactorLoadBalancerExchangeFilterFunction.class); then(two.nonLoadBalanced).isNotNull(); then(getFilters(two.nonLoadBalanced)).isNullOrEmpty(); @@ -84,8 +78,7 @@ public class ReactorLoadBalancerClientAutoConfigurationTests { @Test void noCustomWebClientBuilders() { ConfigurableApplicationContext context = init(NoWebClientBuilder.class); - final Map webClientBuilders = context - .getBeansOfType(WebClient.Builder.class); + final Map webClientBuilders = context.getBeansOfType(WebClient.Builder.class); then(webClientBuilders).hasSize(1); @@ -96,8 +89,7 @@ public class ReactorLoadBalancerClientAutoConfigurationTests { } private ConfigurableApplicationContext init(Class config) { - return LoadBalancerTestUtils.init(config, - ReactorLoadBalancerClientAutoConfiguration.class, + return LoadBalancerTestUtils.init(config, ReactorLoadBalancerClientAutoConfiguration.class, LoadBalancerBeanPostProcessorAutoConfiguration.class); } @@ -108,8 +100,7 @@ public class ReactorLoadBalancerClientAutoConfigurationTests { ReactiveLoadBalancer.Factory reactiveLoadBalancerFactory() { return new ReactiveLoadBalancer.Factory() { @Override - public ReactiveLoadBalancer getInstance( - String serviceId) { + public ReactiveLoadBalancer getInstance(String serviceId) { return new TestReactiveLoadBalancer(); } @@ -119,8 +110,7 @@ public class ReactorLoadBalancerClientAutoConfigurationTests { } @Override - public X getInstance(String name, Class clazz, - Class... generics) { + public X getInstance(String name, Class clazz, Class... generics) { throw new UnsupportedOperationException("Not implemented."); } }; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java index c820faab..3297f6f0 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerExchangeFilterFunctionTests.java @@ -90,12 +90,9 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { instance.setServiceId("testservice"); instance.setUri(URI.create("http://localhost:" + this.port)); SimpleDiscoveryProperties.SimpleServiceInstance instanceWithNoLifecycleProcessors = new SimpleDiscoveryProperties.SimpleServiceInstance(); - instanceWithNoLifecycleProcessors - .setServiceId("serviceWithNoLifecycleProcessors"); - instanceWithNoLifecycleProcessors - .setUri(URI.create("http://localhost:" + this.port)); - this.properties.getInstances().put("testservice", - Collections.singletonList(instance)); + instanceWithNoLifecycleProcessors.setServiceId("serviceWithNoLifecycleProcessors"); + instanceWithNoLifecycleProcessors.setUri(URI.create("http://localhost:" + this.port)); + this.properties.getInstances().put("testservice", Collections.singletonList(instance)); properties.getInstances().put("serviceWithNoLifecycleProcessors", Collections.singletonList(instanceWithNoLifecycleProcessors)); } @@ -103,33 +100,31 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { @Test void correctResponseReturnedForExistingHostAndInstancePresent() { ClientResponse clientResponse = WebClient.builder().baseUrl("http://testservice") - .filter(this.loadBalancerFunction).build().get().uri("/hello").exchange() - .block(); + .filter(this.loadBalancerFunction).build().get().uri("/hello").exchange().block(); then(clientResponse.statusCode()).isEqualTo(HttpStatus.OK); then(clientResponse.bodyToMono(String.class).block()).isEqualTo("Hello World"); } @Test void serviceUnavailableReturnedWhenNoInstancePresent() { - ClientResponse clientResponse = WebClient.builder().baseUrl("http://xxx") - .filter(this.loadBalancerFunction).build().get().exchange().block(); + ClientResponse clientResponse = WebClient.builder().baseUrl("http://xxx").filter(this.loadBalancerFunction) + .build().get().exchange().block(); then(clientResponse.statusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE); } @Test @Disabled // FIXME 3.0.0 void badRequestReturnedForIncorrectHost() { - ClientResponse clientResponse = WebClient.builder().baseUrl("http:///xxx") - .filter(this.loadBalancerFunction).build().get().exchange().block(); + ClientResponse clientResponse = WebClient.builder().baseUrl("http:///xxx").filter(this.loadBalancerFunction) + .build().get().exchange().block(); then(clientResponse.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST); } @Test void exceptionNotThrownWhenFactoryReturnsNullLifecycleProcessorsMap() { - assertThatCode(() -> WebClient.builder() - .baseUrl("http://serviceWithNoLifecycleProcessors") - .filter(this.loadBalancerFunction).build().get().uri("/hello").exchange() - .block()).doesNotThrowAnyException(); + assertThatCode(() -> WebClient.builder().baseUrl("http://serviceWithNoLifecycleProcessors") + .filter(this.loadBalancerFunction).build().get().uri("/hello").exchange().block()) + .doesNotThrowAnyException(); } @Test @@ -138,22 +133,20 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { loadBalancerProperties.getHint().put("testservice", "callbackTestHint"); final String result = "callbackTestResult"; ClientResponse clientResponse = WebClient.builder().baseUrl("http://testservice") - .filter(this.loadBalancerFunction).build().get().uri("/callback") - .exchange().block(); + .filter(this.loadBalancerFunction).build().get().uri("/callback").exchange().block(); Collection> lifecycleLogRequests = ((TestLoadBalancerLifecycle) factory - .getInstances("testservice", LoadBalancerLifecycle.class) - .get("loadBalancerLifecycle")).getStartLog().values(); + .getInstances("testservice", LoadBalancerLifecycle.class).get("loadBalancerLifecycle")).getStartLog() + .values(); Collection> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) factory - .getInstances("testservice", LoadBalancerLifecycle.class) - .get("anotherLoadBalancerLifecycle")).getCompleteLog().values(); + .getInstances("testservice", LoadBalancerLifecycle.class).get("anotherLoadBalancerLifecycle")) + .getCompleteLog().values(); then(clientResponse.statusCode()).isEqualTo(HttpStatus.OK); - assertThat(lifecycleLogRequests).extracting( - request -> ((DefaultRequestContext) request.getContext()).getHint()) + assertThat(lifecycleLogRequests).extracting(request -> ((DefaultRequestContext) request.getContext()).getHint()) .contains(callbackTestHint); assertThat(anotherLifecycleLogRequests) - .extracting(completionContext -> ((ClientResponse) completionContext - .getClientResponse()).bodyToMono(String.class).block()) + .extracting(completionContext -> ((ClientResponse) completionContext.getClientResponse()) + .bodyToMono(String.class).block()) .contains(result); } @@ -175,8 +168,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { } @Bean - ReactiveLoadBalancer.Factory reactiveLoadBalancerFactory( - DiscoveryClient discoveryClient) { + ReactiveLoadBalancer.Factory reactiveLoadBalancerFactory(DiscoveryClient discoveryClient) { return new ReactiveLoadBalancer.Factory() { private final TestLoadBalancerLifecycle testLoadBalancerLifecycle = new TestLoadBalancerLifecycle(); @@ -184,10 +176,8 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { private final TestLoadBalancerLifecycle anotherLoadBalancerLifecycle = new AnotherLoadBalancerLifecycle(); @Override - public ReactiveLoadBalancer getInstance( - String serviceId) { - return new DiscoveryClientBasedReactiveLoadBalancer(serviceId, - discoveryClient); + public ReactiveLoadBalancer getInstance(String serviceId) { + return new DiscoveryClientBasedReactiveLoadBalancer(serviceId, discoveryClient); } @Override @@ -196,16 +186,13 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { return null; } Map lifecycleProcessors = new HashMap<>(); - lifecycleProcessors.put("loadBalancerLifecycle", - testLoadBalancerLifecycle); - lifecycleProcessors.put("anotherLoadBalancerLifecycle", - anotherLoadBalancerLifecycle); + lifecycleProcessors.put("loadBalancerLifecycle", testLoadBalancerLifecycle); + lifecycleProcessors.put("anotherLoadBalancerLifecycle", anotherLoadBalancerLifecycle); return lifecycleProcessors; } @Override - public X getInstance(String name, Class clazz, - Class... generics) { + public X getInstance(String name, Class clazz, Class... generics) { return null; } }; @@ -218,8 +205,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { } - protected static class TestLoadBalancerLifecycle - implements LoadBalancerLifecycle { + protected static class TestLoadBalancerLifecycle implements LoadBalancerLifecycle { ConcurrentHashMap> startLog = new ConcurrentHashMap<>(); @@ -231,8 +217,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { } @Override - public void onComplete( - CompletionContext completionContext) { + public void onComplete(CompletionContext completionContext) { completeLog.put(getName() + UUID.randomUUID(), completionContext); } @@ -250,8 +235,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { } - protected static class AnotherLoadBalancerLifecycle - extends TestLoadBalancerLifecycle { + protected static class AnotherLoadBalancerLifecycle extends TestLoadBalancerLifecycle { @Override protected String getName() { @@ -262,8 +246,7 @@ class ReactorLoadBalancerExchangeFilterFunctionTests { } -class DiscoveryClientBasedReactiveLoadBalancer - implements ReactiveLoadBalancer { +class DiscoveryClientBasedReactiveLoadBalancer implements ReactiveLoadBalancer { private final Random random = new Random(); @@ -271,8 +254,7 @@ class DiscoveryClientBasedReactiveLoadBalancer private final DiscoveryClient discoveryClient; - DiscoveryClientBasedReactiveLoadBalancer(String serviceId, - DiscoveryClient discoveryClient) { + DiscoveryClientBasedReactiveLoadBalancer(String serviceId, DiscoveryClient discoveryClient) { this.serviceId = serviceId; this.discoveryClient = discoveryClient; } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/TestReactiveLoadBalancer.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/TestReactiveLoadBalancer.java index 16234de8..45b02661 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/TestReactiveLoadBalancer.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/TestReactiveLoadBalancer.java @@ -40,8 +40,8 @@ class TestReactiveLoadBalancer implements ReactiveLoadBalancer @Override public Publisher> choose() { - return Mono.just(new DefaultResponse(new DefaultServiceInstance(TEST_SERVICE_ID, - TEST_SERVICE_ID, TEST_SERVICE_ID, random.nextInt(40000), false))); + return Mono.just(new DefaultResponse(new DefaultServiceInstance(TEST_SERVICE_ID, TEST_SERVICE_ID, + TEST_SERVICE_ID, random.nextInt(40000), false))); } @Override diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java index a547d3b3..830372a2 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java @@ -57,8 +57,7 @@ public class AbstractAutoServiceRegistrationMgmtDisabledTests { public static class Config { @Bean - public TestAutoServiceRegistration testAutoServiceRegistration( - AutoServiceRegistrationProperties properties) { + public TestAutoServiceRegistration testAutoServiceRegistration(AutoServiceRegistrationProperties properties) { return new TestAutoServiceRegistration(properties); } @@ -163,8 +162,7 @@ public class AbstractAutoServiceRegistrationMgmtDisabledTests { } - public static class TestAutoServiceRegistration - extends AbstractAutoServiceRegistration { + public static class TestAutoServiceRegistration extends AbstractAutoServiceRegistration { private int port = 0; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java index bfd5ecf4..f5f820f4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java @@ -44,8 +44,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @RunWith(SpringRunner.class) // @checkstyle:off -@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, - properties = "management.port=0", webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, properties = "management.port=0", + webEnvironment = RANDOM_PORT) // @checkstyle:on public class AbstractAutoServiceRegistrationTests { @@ -66,28 +66,22 @@ public class AbstractAutoServiceRegistrationTests { @Test public void portsWork() { - then(this.autoRegistration.getPort().get()).isNotEqualTo(0) - .as("Lifecycle port is zero"); + then(this.autoRegistration.getPort().get()).isNotEqualTo(0).as("Lifecycle port is zero"); then(this.managementPort).isNotEqualTo(this.autoRegistration.getPort().get()) .as("Lifecycle port is management port"); - then(this.port).isEqualTo(this.autoRegistration.getPort().get()) - .as("Lifecycle port is wrong"); + then(this.port).isEqualTo(this.autoRegistration.getPort().get()).as("Lifecycle port is wrong"); then(this.autoRegistration.isRunning()).isTrue().as("Lifecycle not running"); - then(this.autoRegistration.getServiceRegistry()) - .isInstanceOf(TestServiceRegistry.class) + then(this.autoRegistration.getServiceRegistry()).isInstanceOf(TestServiceRegistry.class) .as("ServiceRegistry is wrong type"); - TestServiceRegistry serviceRegistry = (TestServiceRegistry) this.autoRegistration - .getServiceRegistry(); + TestServiceRegistry serviceRegistry = (TestServiceRegistry) this.autoRegistration.getServiceRegistry(); then(serviceRegistry.isRegistered()).isTrue().as("Lifecycle not registered"); - then(this.autoRegistration.getAppName()).as("Lifecycle appName is wrong") - .isEqualTo("application"); + then(this.autoRegistration.getAppName()).as("Lifecycle appName is wrong").isEqualTo("application"); } @Test public void eventsFireTest() { then(this.preEventListener.wasFired).isTrue(); - then(this.preEventListener.registration.getServiceId()) - .isEqualTo("testRegistration2"); + then(this.preEventListener.registration.getServiceId()).isEqualTo("testRegistration2"); then(this.postEventListener.wasFired).isTrue(); then(this.postEventListener.config.getServiceId()).isEqualTo("testRegistration2"); } @@ -113,8 +107,7 @@ public class AbstractAutoServiceRegistrationTests { } - public static class PreEventListener - implements ApplicationListener { + public static class PreEventListener implements ApplicationListener { public boolean wasFired = false; @@ -128,8 +121,7 @@ public class AbstractAutoServiceRegistrationTests { } - public static class PostEventListener - implements ApplicationListener { + public static class PostEventListener implements ApplicationListener { public boolean wasFired = false; @@ -242,8 +234,7 @@ public class AbstractAutoServiceRegistrationTests { } - public static class TestAutoServiceRegistration - extends AbstractAutoServiceRegistration { + public static class TestAutoServiceRegistration extends AbstractAutoServiceRegistration { private int port = 0; diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java index 37215c0a..bdeb4073 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfigurationTests.java @@ -44,10 +44,8 @@ public class AutoServiceRegistrationAutoConfigurationTests { @Test public void hasAutoServiceRegistration() { - try (AnnotationConfigApplicationContext context = setup( - HasAutoServiceRegistrationConfiguration.class)) { - AutoServiceRegistration autoServiceRegistration = context - .getBean(AutoServiceRegistration.class); + try (AnnotationConfigApplicationContext context = setup(HasAutoServiceRegistrationConfiguration.class)) { + AutoServiceRegistration autoServiceRegistration = context.getBean(AutoServiceRegistration.class); then(autoServiceRegistration).isNotNull(); } } @@ -55,8 +53,7 @@ public class AutoServiceRegistrationAutoConfigurationTests { @Test public void noAutoServiceRegistrationAndFailFast() { this.exception.expect(BeanCreationException.class); - this.exception - .expectMessage(Matchers.containsString("no AutoServiceRegistration")); + this.exception.expectMessage(Matchers.containsString("no AutoServiceRegistration")); try (AnnotationConfigApplicationContext context = setup( "spring.cloud.service-registry.auto-registration.failFast=true")) { assertNoBean(context); @@ -71,8 +68,7 @@ public class AutoServiceRegistrationAutoConfigurationTests { } private void assertNoBean(AnnotationConfigApplicationContext context) { - Map beans = context - .getBeansOfType(AutoServiceRegistration.class); + Map beans = context.getBeansOfType(AutoServiceRegistration.class); then(beans).isEmpty(); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java index 7a9f482b..0cccbae5 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfigurationTests.java @@ -33,14 +33,13 @@ import static org.assertj.core.api.Assertions.fail; * @author Spencer Gibb */ @RunWith(ModifiedClassPathRunner.class) -@ClassPathExclusions({ "spring-boot-actuator-*.jar", - "spring-boot-starter-actuator-*.jar" }) +@ClassPathExclusions({ "spring-boot-actuator-*.jar", "spring-boot-starter-actuator-*.jar" }) public class ServiceRegistryAutoConfigurationTests { @Test public void runsWithoutActuator() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestConfig.class).web(WebApplicationType.NONE).run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class) + .web(WebApplicationType.NONE).run(); try { context.getBean("serviceRegistryEndpoint"); fail("found a bean that shouldn't be there"); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java index ec022e3a..11e889af 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java @@ -42,8 +42,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest( - classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class) +@SpringBootTest(classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class) @AutoConfigureMockMvc public class ServiceRegistryEndpointNoRegistrationTests { @@ -52,8 +51,7 @@ public class ServiceRegistryEndpointNoRegistrationTests { @Test public void testGet() throws Exception { - this.mvc.perform(get("/service-registry/instance-status")) - .andExpect(status().isNotFound()); + this.mvc.perform(get("/service-registry/instance-status")).andExpect(status().isNotFound()); } @Test @@ -62,9 +60,8 @@ public class ServiceRegistryEndpointNoRegistrationTests { .andExpect(status().isNotFound()); } - @Import({ JacksonAutoConfiguration.class, - HttpMessageConvertersAutoConfiguration.class, EndpointAutoConfiguration.class, - WebMvcAutoConfiguration.class + @Import({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, + EndpointAutoConfiguration.class, WebMvcAutoConfiguration.class // ManagementServerPropertiesAutoConfiguration.class }) @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java index 36a97d22..f1cc7adb 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java @@ -78,8 +78,7 @@ public class ServiceRegistryEndpointTests { @Test public void testPost() throws Exception { Map status = Collections.singletonMap("status", UPDATED_STATUS); - this.mvc.perform(post(BASE_PATH + "/serviceregistry") - .content(new ObjectMapper().writeValueAsString(status)) + this.mvc.perform(post(BASE_PATH + "/serviceregistry").content(new ObjectMapper().writeValueAsString(status)) .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()); then(this.serviceRegistry.getUpdatedStatus().get()).isEqualTo(UPDATED_STATUS); } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java index b78e3f31..b7aed99d 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientBuilderConfigurationTests.java @@ -44,8 +44,7 @@ public class CustomHttpClientBuilderConfigurationTests { @Test public void testCustomBuilder() { HttpClientBuilder builder = this.apacheHttpClientFactory.createBuilder(); - then(CustomHttpClientBuilderApplication.MyHttpClientBuilder.class - .isInstance(builder)).isTrue(); + then(CustomHttpClientBuilderApplication.MyHttpClientBuilder.class.isInstance(builder)).isTrue(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java index 8cf48bc6..693b9216 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java @@ -40,8 +40,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = CustomApplication.class, - properties = { "spring.cloud.httpclient.ok.enabled: true" }) +@SpringBootTest(classes = CustomApplication.class, properties = { "spring.cloud.httpclient.ok.enabled: true" }) public class CustomHttpClientConfigurationTests { @Autowired @@ -58,8 +57,7 @@ public class CustomHttpClientConfigurationTests { @Test public void connManFactory() throws Exception { - then(ApacheHttpClientConnectionManagerFactory.class - .isInstance(this.connectionManagerFactory)).isTrue(); + then(ApacheHttpClientConnectionManagerFactory.class.isInstance(this.connectionManagerFactory)).isTrue(); then(CustomApplication.MyApacheHttpClientConnectionManagerFactory.class .isInstance(this.connectionManagerFactory)).isTrue(); } @@ -67,23 +65,20 @@ public class CustomHttpClientConfigurationTests { @Test public void apacheHttpClientFactory() throws Exception { then(ApacheHttpClientFactory.class.isInstance(this.httpClientFactory)).isTrue(); - then(CustomApplication.MyApacheHttpClientFactory.class - .isInstance(this.httpClientFactory)).isTrue(); + then(CustomApplication.MyApacheHttpClientFactory.class.isInstance(this.httpClientFactory)).isTrue(); } @Test public void connectionPoolFactory() throws Exception { - then(OkHttpClientConnectionPoolFactory.class - .isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); - then(CustomApplication.MyOkHttpConnectionPoolFactory.class - .isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); + then(OkHttpClientConnectionPoolFactory.class.isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); + then(CustomApplication.MyOkHttpConnectionPoolFactory.class.isInstance(this.okHttpClientConnectionPoolFactory)) + .isTrue(); } @Test public void okHttpClientFactory() throws Exception { then(OkHttpClientFactory.class.isInstance(this.okHttpClientFactory)).isTrue(); - then(CustomApplication.MyOkHttpClientFactory.class - .isInstance(this.okHttpClientFactory)).isTrue(); + then(CustomApplication.MyOkHttpClientFactory.class.isInstance(this.okHttpClientFactory)).isTrue(); } } @@ -130,14 +125,11 @@ class CustomApplication { } - static class MyApacheHttpClientConnectionManagerFactory - implements ApacheHttpClientConnectionManagerFactory { + static class MyApacheHttpClientConnectionManagerFactory implements ApacheHttpClientConnectionManagerFactory { @Override - public HttpClientConnectionManager newConnectionManager( - boolean disableSslValidation, int maxTotalConnections, - int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, - RegistryBuilder registryBuilder) { + public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, + int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registryBuilder) { return null; } @@ -152,12 +144,10 @@ class CustomApplication { } - static class MyOkHttpConnectionPoolFactory - implements OkHttpClientConnectionPoolFactory { + static class MyOkHttpConnectionPoolFactory implements OkHttpClientConnectionPoolFactory { @Override - public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, - TimeUnit timeUnit) { + public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit) { return null; } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java index e97334ac..f056166e 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java @@ -44,10 +44,8 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { public void newConnectionManager() { HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() .newConnectionManager(false, 2, 6); - then(((PoolingHttpClientConnectionManager) connectionManager) - .getDefaultMaxPerRoute()).isEqualTo(6); - then(((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()) - .isEqualTo(2); + then(((PoolingHttpClientConnectionManager) connectionManager).getDefaultMaxPerRoute()).isEqualTo(6); + then(((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()).isEqualTo(2); Object pool = getField((connectionManager), "pool"); then((Long) getField(pool, "timeToLive")).isEqualTo(new Long(-1)); TimeUnit timeUnit = getField(pool, "timeUnit"); @@ -58,10 +56,8 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { public void newConnectionManagerWithTTL() { HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() .newConnectionManager(false, 2, 6, 56L, TimeUnit.DAYS, null); - then(((PoolingHttpClientConnectionManager) connectionManager) - .getDefaultMaxPerRoute()).isEqualTo(6); - then(((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()) - .isEqualTo(2); + then(((PoolingHttpClientConnectionManager) connectionManager).getDefaultMaxPerRoute()).isEqualTo(6); + then(((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()).isEqualTo(2); Object pool = getField((connectionManager), "pool"); then((Long) getField(pool, "timeToLive")).isEqualTo(new Long(56)); TimeUnit timeUnit = getField(pool, "timeUnit"); @@ -73,8 +69,7 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() .newConnectionManager(false, 2, 6); - Lookup socketFactoryRegistry = getConnectionSocketFactoryLookup( - connectionManager); + Lookup socketFactoryRegistry = getConnectionSocketFactoryLookup(connectionManager); then(socketFactoryRegistry.lookup("https")).isNotNull(); then(getX509TrustManager(socketFactoryRegistry).getAcceptedIssuers()).isNotNull(); } @@ -84,25 +79,20 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() .newConnectionManager(true, 2, 6); - Lookup socketFactoryRegistry = getConnectionSocketFactoryLookup( - connectionManager); + Lookup socketFactoryRegistry = getConnectionSocketFactoryLookup(connectionManager); then(socketFactoryRegistry.lookup("https")).isNotNull(); then(getX509TrustManager(socketFactoryRegistry).getAcceptedIssuers()).isNull(); } private Lookup getConnectionSocketFactoryLookup( HttpClientConnectionManager connectionManager) { - DefaultHttpClientConnectionOperator connectionOperator = getField( - connectionManager, "connectionOperator"); + DefaultHttpClientConnectionOperator connectionOperator = getField(connectionManager, "connectionOperator"); return getField(connectionOperator, "socketFactoryRegistry"); } - private X509TrustManager getX509TrustManager( - Lookup socketFactoryRegistry) { - ConnectionSocketFactory connectionSocketFactory = socketFactoryRegistry - .lookup("https"); - SSLSocketFactory sslSocketFactory = getField(connectionSocketFactory, - "socketfactory"); + private X509TrustManager getX509TrustManager(Lookup socketFactoryRegistry) { + ConnectionSocketFactory connectionSocketFactory = socketFactoryRegistry.lookup("https"); + SSLSocketFactory sslSocketFactory = getField(connectionSocketFactory, "socketfactory"); SSLContextSpi sslContext = getField(sslSocketFactory, "context"); return getField(sslContext, "trustManager"); } @@ -111,8 +101,7 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { protected T getField(Object target, String name) { Field field = ReflectionUtils.findField(target.getClass(), name); if (field == null) { - throw new IllegalArgumentException( - "Can not find field " + name + " in " + target.getClass()); + throw new IllegalArgumentException("Can not find field " + name + " in " + target.getClass()); } ReflectionUtils.makeAccessible(field); Object value = ReflectionUtils.getField(field, target); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java index f6ad3477..2c7a4907 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java @@ -39,12 +39,11 @@ public class DefaultApacheHttpClientFactoryTests { @Test public void createClient() throws Exception { - final RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(100) - .setConnectTimeout(200).setCookieSpec(CookieSpecs.IGNORE_COOKIES).build(); - CloseableHttpClient httpClient = new DefaultApacheHttpClientFactory( - HttpClientBuilder.create()).createBuilder() - .setConnectionManager(mock(HttpClientConnectionManager.class)) - .setDefaultRequestConfig(requestConfig).build(); + final RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(100).setConnectTimeout(200) + .setCookieSpec(CookieSpecs.IGNORE_COOKIES).build(); + CloseableHttpClient httpClient = new DefaultApacheHttpClientFactory(HttpClientBuilder.create()).createBuilder() + .setConnectionManager(mock(HttpClientConnectionManager.class)).setDefaultRequestConfig(requestConfig) + .build(); BDDAssertions.then(httpClient).isInstanceOf(Configurable.class); RequestConfig config = ((Configurable) httpClient).getConfig(); then(config.getSocketTimeout()).isEqualTo(100); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java index 5a5071c4..c5517cb4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java @@ -32,8 +32,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = MyApplication.class, - properties = { "spring.cloud.httpclient.ok.enabled: true" }) +@SpringBootTest(classes = MyApplication.class, properties = { "spring.cloud.httpclient.ok.enabled: true" }) public class DefaultHttpClientConfigurationTests { @Autowired @@ -50,32 +49,27 @@ public class DefaultHttpClientConfigurationTests { @Test public void connManFactory() throws Exception { - then(ApacheHttpClientConnectionManagerFactory.class - .isInstance(this.connectionManagerFactory)).isTrue(); - then(DefaultApacheHttpClientConnectionManagerFactory.class - .isInstance(this.connectionManagerFactory)).isTrue(); + then(ApacheHttpClientConnectionManagerFactory.class.isInstance(this.connectionManagerFactory)).isTrue(); + then(DefaultApacheHttpClientConnectionManagerFactory.class.isInstance(this.connectionManagerFactory)).isTrue(); } @Test public void apacheHttpClientFactory() throws Exception { then(ApacheHttpClientFactory.class.isInstance(this.httpClientFactory)).isTrue(); - then(DefaultApacheHttpClientFactory.class.isInstance(this.httpClientFactory)) - .isTrue(); + then(DefaultApacheHttpClientFactory.class.isInstance(this.httpClientFactory)).isTrue(); } @Test public void connPoolFactory() throws Exception { - then(OkHttpClientConnectionPoolFactory.class - .isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); - then(DefaultOkHttpClientConnectionPoolFactory.class - .isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); + then(OkHttpClientConnectionPoolFactory.class.isInstance(this.okHttpClientConnectionPoolFactory)).isTrue(); + then(DefaultOkHttpClientConnectionPoolFactory.class.isInstance(this.okHttpClientConnectionPoolFactory)) + .isTrue(); } @Test public void setOkHttpClientFactory() throws Exception { then(OkHttpClientFactory.class.isInstance(this.okHttpClientFactory)).isTrue(); - then(DefaultOkHttpClientFactory.class.isInstance(this.okHttpClientFactory)) - .isTrue(); + then(DefaultOkHttpClientFactory.class.isInstance(this.okHttpClientFactory)).isTrue(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactoryTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactoryTest.java index a68c4ff8..cbe75687 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactoryTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientConnectionPoolFactoryTest.java @@ -35,8 +35,7 @@ public class DefaultOkHttpClientConnectionPoolFactoryTest { @Test public void create() { DefaultOkHttpClientConnectionPoolFactory connectionPoolFactory = new DefaultOkHttpClientConnectionPoolFactory(); - ConnectionPool connectionPool = connectionPoolFactory.create(2, 3, - TimeUnit.MILLISECONDS); + ConnectionPool connectionPool = connectionPoolFactory.create(2, 3, TimeUnit.MILLISECONDS); RealConnectionPool delegate = getField(connectionPool, "delegate"); int idleConnections = getField(delegate, "maxIdleConnections"); long keepAliveDuration = getField(delegate, "keepAliveDurationNs"); @@ -47,8 +46,7 @@ public class DefaultOkHttpClientConnectionPoolFactoryTest { protected T getField(Object target, String name) { Field field = ReflectionUtils.findField(target.getClass(), name); if (field == null) { - throw new IllegalArgumentException( - "Can not find field " + name + " in " + target.getClass()); + throw new IllegalArgumentException("Can not find field " + name + " in " + target.getClass()); } ReflectionUtils.makeAccessible(field); Object value = ReflectionUtils.getField(field, target); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java index d765c39c..89111ce9 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java @@ -36,13 +36,11 @@ public class DefaultOkHttpClientFactoryTest { @Test public void create() throws Exception { - DefaultOkHttpClientFactory okHttpClientFactory = new DefaultOkHttpClientFactory( - new OkHttpClient.Builder()); + DefaultOkHttpClientFactory okHttpClientFactory = new DefaultOkHttpClientFactory(new OkHttpClient.Builder()); DefaultOkHttpClientConnectionPoolFactory poolFactory = new DefaultOkHttpClientConnectionPoolFactory(); ConnectionPool pool = poolFactory.create(4, 5, TimeUnit.DAYS); - OkHttpClient httpClient = okHttpClientFactory.createBuilder(true) - .connectTimeout(2, TimeUnit.MILLISECONDS).readTimeout(3, TimeUnit.HOURS) - .followRedirects(true).connectionPool(pool).build(); + OkHttpClient httpClient = okHttpClientFactory.createBuilder(true).connectTimeout(2, TimeUnit.MILLISECONDS) + .readTimeout(3, TimeUnit.HOURS).followRedirects(true).connectionPool(pool).build(); int connectTimeout = getField(httpClient, "connectTimeout"); then(connectTimeout).isEqualTo(2); int readTimeout = getField(httpClient, "readTimeout"); @@ -52,8 +50,7 @@ public class DefaultOkHttpClientFactoryTest { ConnectionPool poolFromClient = getField(httpClient, "connectionPool"); then(poolFromClient).isEqualTo(pool); HostnameVerifier hostnameVerifier = getField(httpClient, "hostnameVerifier"); - then(OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier)) - .isTrue(); + then(OkHttpClientFactory.TrustAllHostnames.class.isInstance(hostnameVerifier)).isTrue(); } protected T getField(Object target, String name) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java index a3ed701d..c90022dd 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java @@ -75,8 +75,7 @@ public class IdUtilsTests { this.env.setProperty("spring.application.name", DEFAULT_ID); this.env.setProperty("spring.cloud.client.hostname", DEFAULT_ID + "2"); String instanceId = IdUtils.getDefaultInstanceId(this.env); - then(instanceId).as("instanceId was wrong") - .isEqualTo(DEFAULT_ID + "2" + ":" + DEFAULT_ID); + then(instanceId).as("instanceId was wrong").isEqualTo(DEFAULT_ID + "2" + ":" + DEFAULT_ID); } @Test @@ -107,14 +106,12 @@ public class IdUtilsTests { this.env.setProperty("spring.application.name", DEFAULT_ID); this.env.setProperty("server.port", "80"); String instanceId = IdUtils.getDefaultInstanceId(this.env); - then("myhost:" + DEFAULT_ID + ":80").isEqualTo(instanceId) - .as("instanceId was wrong"); + then("myhost:" + DEFAULT_ID + ":80").isEqualTo(instanceId).as("instanceId was wrong"); } @Test public void testUnresolvedServiceId() { - then(IdUtils.DEFAULT_SERVICE_ID_STRING) - .isEqualTo(IdUtils.getUnresolvedServiceId()); + then(IdUtils.DEFAULT_SERVICE_ID_STRING).isEqualTo(IdUtils.getUnresolvedServiceId()); } @Test @@ -136,8 +133,7 @@ public class IdUtilsTests { env.setProperty("spring.application.name", "springname"); env.setProperty("spring.application.index", "springindex"); env.setProperty("cachedrandom.springname.value", "123abc"); - then("springname:springindex:123abc") - .isEqualTo(IdUtils.getResolvedServiceId(env)); + then("springname:springindex:123abc").isEqualTo(IdUtils.getResolvedServiceId(env)); } @Test diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java index d55d6f51..dbae581f 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/InetUtilsTests.java @@ -72,8 +72,7 @@ public class InetUtilsTests { try (InetUtils inetUtils = new InetUtils(properties)) { then(inetUtils.ignoreInterface("docker0")).isTrue().as("docker0 not ignored"); - then(inetUtils.ignoreInterface("vethAQI2QT")).as("vethAQI2QT0 not ignored") - .isTrue(); + then(inetUtils.ignoreInterface("vethAQI2QT")).as("vethAQI2QT0 not ignored").isTrue(); then(inetUtils.ignoreInterface("docker1")).as("docker1 ignored").isFalse(); } } @@ -105,8 +104,7 @@ public class InetUtilsTests { then(utils.isPreferredAddress(InetAddress.getByName("192.168.0.1"))).isTrue(); then(utils.isPreferredAddress(InetAddress.getByName("5.5.8.1"))).isFalse(); then(utils.isPreferredAddress(InetAddress.getByName("10.0.10.1"))).isTrue(); - then(utils.isPreferredAddress(InetAddress.getByName("10.255.10.1"))) - .isFalse(); + then(utils.isPreferredAddress(InetAddress.getByName("10.255.10.1"))).isFalse(); } } @@ -118,8 +116,7 @@ public class InetUtilsTests { try (InetUtils utils = new InetUtils(properties)) { then(utils.isPreferredAddress(InetAddress.getByName("192.168.0.1"))).isTrue(); then(utils.isPreferredAddress(InetAddress.getByName("5.5.8.1"))).isFalse(); - then(utils.isPreferredAddress(InetAddress.getByName("10.255.10.1"))) - .isFalse(); + then(utils.isPreferredAddress(InetAddress.getByName("10.255.10.1"))).isFalse(); then(utils.isPreferredAddress(InetAddress.getByName("10.0.10.1"))).isTrue(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java index 6cda5cd4..185590e2 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/SpringFactoryImportSelectorTests.java @@ -28,16 +28,14 @@ public class SpringFactoryImportSelectorTests { @Test public void testFindAnnotation() { MyAnnotationImportSelector selector = new MyAnnotationImportSelector(); - then(selector.getAnnotationClass()).as("annotationClass was wrong") - .isEqualTo(MyAnnotation.class); + then(selector.getAnnotationClass()).as("annotationClass was wrong").isEqualTo(MyAnnotation.class); } public @interface MyAnnotation { } - public static class MyAnnotationImportSelector - extends SpringFactoryImportSelector { + public static class MyAnnotationImportSelector extends SpringFactoryImportSelector { @Override protected boolean isEnabled() { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java index 48eaf621..4e13d987 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/CompatibilityVerifierTests.java @@ -42,8 +42,7 @@ public class CompatibilityVerifierTests { verifier.verifyDependencies(); - then(this.outputCapture.toString()) - .doesNotContain("SPRING CLOUD VERIFICATION FAILED"); + then(this.outputCapture.toString()).doesNotContain("SPRING CLOUD VERIFICATION FAILED"); } @Test @@ -52,19 +51,16 @@ public class CompatibilityVerifierTests { list.add(new CompatibilityVerifier() { @Override public VerificationResult verify() { - return VerificationResult.notCompatible("Wrong Boot version", - "Use Boot version 1.2"); + return VerificationResult.notCompatible("Wrong Boot version", "Use Boot version 1.2"); } }); list.add(new CompatibilityVerifier() { @Override public VerificationResult verify() { - return VerificationResult.notCompatible("Wrong JDK version", - "Use JDK 25"); + return VerificationResult.notCompatible("Wrong JDK version", "Use JDK 25"); } }); - CompositeCompatibilityVerifier verifier = new CompositeCompatibilityVerifier( - list); + CompositeCompatibilityVerifier verifier = new CompositeCompatibilityVerifier(list); try { verifier.verifyDependencies(); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyAndCert.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyAndCert.java index e2c7e006..40c03ec4 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyAndCert.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyAndCert.java @@ -70,8 +70,7 @@ public class KeyAndCert { KeyStore result = KeyStore.getInstance("PKCS12"); result.load(null); - result.setKeyEntry(subject(), keyPair.getPrivate(), keyPassword.toCharArray(), - certChain()); + result.setKeyEntry(subject(), keyPair.getPrivate(), keyPassword.toCharArray(), certChain()); return result; } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyTool.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyTool.java index 48d4c888..ea403d16 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyTool.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyTool.java @@ -50,15 +50,12 @@ public class KeyTool { return new KeyAndCert(keyPair, certificate); } - public KeyAndCert signCertificate(String subject, KeyAndCert signer) - throws Exception { + public KeyAndCert signCertificate(String subject, KeyAndCert signer) throws Exception { return signCertificate(createKeyPair(), subject, signer); } - public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer) - throws Exception { - X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(), - signer.subject(), subject); + public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer) throws Exception { + X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(), signer.subject(), subject); KeyAndCert result = new KeyAndCert(keyPair, certificate); return result; @@ -76,32 +73,25 @@ public class KeyTool { public X509Certificate createCert(KeyPair keyPair, String ca) throws Exception { JcaX509v3CertificateBuilder builder = certBuilder(keyPair.getPublic(), ca, ca); - builder.addExtension(Extension.keyUsage, true, - new KeyUsage(KeyUsage.keyCertSign)); - builder.addExtension(Extension.basicConstraints, false, - new BasicConstraints(true)); + builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign)); + builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(true)); return signCert(builder, keyPair.getPrivate()); } - public X509Certificate createCert(PublicKey publicKey, PrivateKey privateKey, - String issuer, String subject) throws Exception { + public X509Certificate createCert(PublicKey publicKey, PrivateKey privateKey, String issuer, String subject) + throws Exception { JcaX509v3CertificateBuilder builder = certBuilder(publicKey, issuer, subject); - builder.addExtension(Extension.keyUsage, true, - new KeyUsage(KeyUsage.digitalSignature)); - builder.addExtension(Extension.basicConstraints, false, - new BasicConstraints(false)); + builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.digitalSignature)); + builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(false)); - GeneralName[] names = new GeneralName[] { - new GeneralName(GeneralName.dNSName, "localhost") }; - builder.addExtension(Extension.subjectAlternativeName, false, - GeneralNames.getInstance(new DERSequence(names))); + GeneralName[] names = new GeneralName[] { new GeneralName(GeneralName.dNSName, "localhost") }; + builder.addExtension(Extension.subjectAlternativeName, false, GeneralNames.getInstance(new DERSequence(names))); return signCert(builder, privateKey); } - private JcaX509v3CertificateBuilder certBuilder(PublicKey publicKey, String issuer, - String subject) { + private JcaX509v3CertificateBuilder certBuilder(PublicKey publicKey, String issuer, String subject) { X500Name issuerName = new X500Name(String.format("dc=%s", issuer)); X500Name subjectName = new X500Name(String.format("dc=%s", subject)); @@ -110,14 +100,11 @@ public class KeyTool { Date notBefore = new Date(now - ONE_DAY); Date notAfter = new Date(now + TEN_YEARS); - return new JcaX509v3CertificateBuilder(issuerName, serialNum, notBefore, notAfter, - subjectName, publicKey); + return new JcaX509v3CertificateBuilder(issuerName, serialNum, notBefore, notAfter, subjectName, publicKey); } - private X509Certificate signCert(JcaX509v3CertificateBuilder builder, - PrivateKey privateKey) throws Exception { - ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA") - .build(privateKey); + private X509Certificate signCert(JcaX509v3CertificateBuilder builder, PrivateKey privateKey) throws Exception { + ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA").build(privateKey); X509CertificateHolder holder = builder.build(signer); return new JcaX509CertificateConverter().getCertificate(holder); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java index 049a6481..9868e844 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java @@ -64,16 +64,14 @@ public class SSHContextFactoryTests { } private static File saveKeyAndCert(KeyAndCert keyCert) throws Exception { - return saveKeyStore(keyCert.subject(), - () -> keyCert.storeKeyAndCert(KEY_PASSWORD)); + return saveKeyStore(keyCert.subject(), () -> keyCert.storeKeyAndCert(KEY_PASSWORD)); } private static File saveCert(KeyAndCert keyCert) throws Exception { return saveKeyStore(keyCert.subject(), () -> keyCert.storeCert()); } - private static File saveKeyStore(String prefix, KeyStoreSupplier func) - throws Exception { + private static File saveKeyStore(String prefix, KeyStoreSupplier func) throws Exception { File result = File.createTempFile(prefix, ".p12"); result.deleteOnExit(); @@ -103,8 +101,7 @@ public class SSHContextFactoryTests { } @Test - public void createKeyStoreFromProperties() - throws GeneralSecurityException, IOException { + public void createKeyStoreFromProperties() throws GeneralSecurityException, IOException { SSLContextFactory factory = new SSLContextFactory(properties); KeyStore store = factory.createKeyStore(); @@ -116,8 +113,7 @@ public class SSHContextFactoryTests { } @Test - public void createTrustStoreFromProperties() - throws GeneralSecurityException, IOException { + public void createTrustStoreFromProperties() throws GeneralSecurityException, IOException { SSLContextFactory factory = new SSLContextFactory(properties); KeyStore store = factory.createTrustStore(); @@ -126,8 +122,7 @@ public class SSHContextFactoryTests { } @Test - public void createSSLContextFromProperties() - throws GeneralSecurityException, IOException { + public void createSSLContextFromProperties() throws GeneralSecurityException, IOException { SSLContextFactory factory = new SSLContextFactory(properties); SSLContext context = factory.createSSLContext(); assertThat(context).isNotNull(); diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java index 341b24e8..fb81940d 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java @@ -32,8 +32,7 @@ public class SpringBootDependencyTests { @Test public void should_read_concrete_version_from_manifest() { List acceptedVersions = Collections.singletonList("2.1.3.RELEASE"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.1.3.RELEASE"; @@ -50,8 +49,7 @@ public class SpringBootDependencyTests { @Test public void should_read_concrete_version_from_manifest_and_return_false_when_version_is_not_matched() { List acceptedVersions = Collections.singletonList("2.1.9.RELEASE"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.1.3.RELEASE"; @@ -68,8 +66,7 @@ public class SpringBootDependencyTests { @Test public void should_read_concrete_version_from_manifest_and_return_false_when_minor_version_is_not_matched() { List acceptedVersions = Collections.singletonList("2.1"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.99.3.RELEASE"; @@ -86,8 +83,7 @@ public class SpringBootDependencyTests { @Test public void should_read_concrete_version_from_manifest_and_match_it_against_minor_version() { List acceptedVersions = Collections.singletonList("2.1"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.1.3.RELEASE"; @@ -104,8 +100,7 @@ public class SpringBootDependencyTests { @Test public void should_match_against_predicate() { List acceptedVersions = Collections.singletonList("2.5"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return ""; @@ -128,8 +123,7 @@ public class SpringBootDependencyTests { @Test public void should_fail_to_match_against_predicate_when_none_is_matching() { List acceptedVersions = Collections.singletonList("2.5"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.1"; @@ -152,8 +146,7 @@ public class SpringBootDependencyTests { private void verifyCurrentVersionFromManifest(String version) { List acceptedVersions = Collections.singletonList(version); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions); + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions); versionVerifier.ACCEPTED_VERSIONS.clear(); VerificationResult verificationResult = versionVerifier.verify(); @@ -165,8 +158,7 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_predicate() { List acceptedVersions = Collections.singletonList("2.1"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return ""; @@ -184,8 +176,7 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_predicate_with_version_ending_with_x() { List acceptedVersions = Collections.singletonList("2.1.x"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return ""; @@ -203,8 +194,7 @@ public class SpringBootDependencyTests { @Test public void should_fail_to_match_against_predicate_for_non_current_versions() { List acceptedVersions = Collections.singletonList("2.1"); - SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( - acceptedVersions) { + SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) { @Override String getVersionFromManifest() { return "2.0"; diff --git a/spring-cloud-commons/src/test/java/reactor/core/publisher/FluxFirstNonEmptyEmittingTests.java b/spring-cloud-commons/src/test/java/reactor/core/publisher/FluxFirstNonEmptyEmittingTests.java index 2a32bc5e..d3ecc86f 100644 --- a/spring-cloud-commons/src/test/java/reactor/core/publisher/FluxFirstNonEmptyEmittingTests.java +++ b/spring-cloud-commons/src/test/java/reactor/core/publisher/FluxFirstNonEmptyEmittingTests.java @@ -37,20 +37,17 @@ public class FluxFirstNonEmptyEmittingTests { @Test public void arrayNull() { - assertThatNullPointerException() - .isThrownBy(() -> CloudFlux.firstNonEmpty((Publisher[]) null)); + assertThatNullPointerException().isThrownBy(() -> CloudFlux.firstNonEmpty((Publisher[]) null)); } @Test public void iterableNull() { - assertThatNullPointerException().isThrownBy( - () -> CloudFlux.firstNonEmpty((Iterable>) null)); + assertThatNullPointerException().isThrownBy(() -> CloudFlux.firstNonEmpty((Iterable>) null)); } @Test public void firstWinner() { - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.range(1, 10), Flux.range(11, 10))) + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.range(1, 10), Flux.range(11, 10))) .expectNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10).verifyComplete(); } @@ -62,75 +59,64 @@ public class FluxFirstNonEmptyEmittingTests { @Test public void firstWinnerBackpressured() { - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.range(1, 10), Flux.range(11, 10))) - .thenRequest(5).expectNext(1, 2, 3, 4, 5).thenCancel() - .verifyThenAssertThat().hasNotDiscardedElements().hasNotDroppedElements() - .hasNotDroppedErrors(); + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.range(1, 10), Flux.range(11, 10))).thenRequest(5) + .expectNext(1, 2, 3, 4, 5).thenCancel().verifyThenAssertThat().hasNotDiscardedElements() + .hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void secondWinner() { - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.never(), Flux.range(11, 10).log())) + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.never(), Flux.range(11, 10).log())) .expectNext(11, 12, 13, 14, 15, 16, 17, 18, 19, 20).verifyComplete(); } @Test public void secondWinnerFirstEmpty() { - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.range(11, 10).log())) + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.range(11, 10).log())) .expectNext(11, 12, 13, 14, 15, 16, 17, 18, 19, 20).verifyComplete(); } @Test public void bothEmpty() { - StepVerifier.create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.empty())) - .expectComplete().verifyThenAssertThat().hasNotDiscardedElements() - .hasNotDroppedElements().hasNotDroppedErrors(); + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.empty())).expectComplete().verifyThenAssertThat() + .hasNotDiscardedElements().hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void neverAndEmpty() { - StepVerifier - .withVirtualTime( - () -> CloudFlux.firstNonEmpty(Flux.never(), Flux.empty())) - .expectSubscription().expectNoEvent(Duration.ofDays(1)).thenCancel() - .verifyThenAssertThat().hasNotDiscardedElements().hasNotDroppedElements() - .hasNotDroppedErrors(); + StepVerifier.withVirtualTime(() -> CloudFlux.firstNonEmpty(Flux.never(), Flux.empty())).expectSubscription() + .expectNoEvent(Duration.ofDays(1)).thenCancel().verifyThenAssertThat().hasNotDiscardedElements() + .hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void firstEmitsError() { RuntimeException ex = new RuntimeException("forced failure"); - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.error(ex), Flux.empty())) - .expectErrorMessage("forced failure").verifyThenAssertThat() - .hasNotDiscardedElements().hasNotDroppedElements().hasNotDroppedErrors(); + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.error(ex), Flux.empty())) + .expectErrorMessage("forced failure").verifyThenAssertThat().hasNotDiscardedElements() + .hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void secondEmitsError() { RuntimeException ex = new RuntimeException("forced failure"); - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.error(ex))) - .expectErrorMessage("forced failure").verifyThenAssertThat() - .hasNotDiscardedElements().hasNotDroppedElements().hasNotDroppedErrors(); + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.empty(), Flux.error(ex))) + .expectErrorMessage("forced failure").verifyThenAssertThat().hasNotDiscardedElements() + .hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void neverAndSecondEmitsError() { RuntimeException ex = new RuntimeException("forced failure"); - StepVerifier - .create(CloudFlux.firstNonEmpty(Flux.never(), Flux.error(ex))) - .expectErrorMessage("forced failure").verifyThenAssertThat() - .hasNotDiscardedElements().hasNotDroppedElements().hasNotDroppedErrors(); + StepVerifier.create(CloudFlux.firstNonEmpty(Flux.never(), Flux.error(ex))) + .expectErrorMessage("forced failure").verifyThenAssertThat().hasNotDiscardedElements() + .hasNotDroppedElements().hasNotDroppedErrors(); } @Test public void singleArrayNullSource() { - StepVerifier.create(CloudFlux.firstNonEmpty((Publisher) null)) - .expectError(NullPointerException.class).verify(); + StepVerifier.create(CloudFlux.firstNonEmpty((Publisher) null)).expectError(NullPointerException.class) + .verify(); } @Test @@ -141,16 +127,14 @@ public class FluxFirstNonEmptyEmittingTests { @Test public void singleIterableNullSource() { - StepVerifier - .create(CloudFlux.firstNonEmpty(singletonList((Publisher) null))) + StepVerifier.create(CloudFlux.firstNonEmpty(singletonList((Publisher) null))) .expectError(NullPointerException.class).verify(); } @Test public void iterableOneIsNullSource() { StepVerifier - .create(CloudFlux.firstNonEmpty(Arrays.asList(Flux.never(), - (Publisher) null, Flux.never()))) + .create(CloudFlux.firstNonEmpty(Arrays.asList(Flux.never(), (Publisher) null, Flux.never()))) .expectError(NullPointerException.class).verify(); } @@ -158,8 +142,7 @@ public class FluxFirstNonEmptyEmittingTests { public void scanSubscriber() { CoreSubscriber actual = new LambdaSubscriber<>(null, e -> { }, null, null); - FluxFirstNonEmptyEmitting.RaceCoordinator parent = new FluxFirstNonEmptyEmitting.RaceCoordinator<>( - 1); + FluxFirstNonEmptyEmitting.RaceCoordinator parent = new FluxFirstNonEmptyEmitting.RaceCoordinator<>(1); FluxFirstNonEmptyEmitting.FirstNonEmptyEmittingSubscriber test = new FluxFirstNonEmptyEmitting.FirstNonEmptyEmittingSubscriber<>( actual, parent, 1); Subscription sub = Operators.emptySubscription(); @@ -176,8 +159,7 @@ public class FluxFirstNonEmptyEmittingTests { public void scanRaceCoordinator() { CoreSubscriber actual = new LambdaSubscriber<>(null, e -> { }, null, null); - FluxFirstNonEmptyEmitting.RaceCoordinator parent = new FluxFirstNonEmptyEmitting.RaceCoordinator<>( - 1); + FluxFirstNonEmptyEmitting.RaceCoordinator parent = new FluxFirstNonEmptyEmitting.RaceCoordinator<>(1); FluxFirstNonEmptyEmitting.FirstNonEmptyEmittingSubscriber test = new FluxFirstNonEmptyEmitting.FirstNonEmptyEmittingSubscriber<>( actual, parent, 1); Subscription sub = Operators.emptySubscription(); diff --git a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/JdbcConfigurationTests.java b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/JdbcConfigurationTests.java index f4ce776f..ada3a53a 100644 --- a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/JdbcConfigurationTests.java +++ b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/JdbcConfigurationTests.java @@ -45,8 +45,7 @@ public class JdbcConfigurationTests { protected static class BrokenApplication { public static void main(String[] args) { - new SpringApplicationBuilder(BrokenApplication.class) - .web(WebApplicationType.NONE).run(args); + new SpringApplicationBuilder(BrokenApplication.class).web(WebApplicationType.NONE).run(args); } } diff --git a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java index c3005901..e9b808bc 100644 --- a/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context-integration-tests/src/test/java/org/springframework/cloud/context/integration/RefreshScopeIntegrationTests.java @@ -98,8 +98,7 @@ public class RefreshScopeIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); + then(ExampleService.event.getName()).isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); } @Test @@ -118,8 +117,7 @@ public class RefreshScopeIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); + then(ExampleService.event.getName()).isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); } // see gh-349 @@ -137,8 +135,8 @@ public class RefreshScopeIntegrationTests { } - public static class ExampleService implements Service, InitializingBean, - DisposableBean, ApplicationListener { + public static class ExampleService + implements Service, InitializingBean, DisposableBean, ApplicationListener { private static Log logger = LogFactory.getLog(ExampleService.class); diff --git a/spring-cloud-context-webflux-integration-tests/src/test/java/org/springframework/cloud/context/integration/webflux/RefreshEndpointIntegrationTests.java b/spring-cloud-context-webflux-integration-tests/src/test/java/org/springframework/cloud/context/integration/webflux/RefreshEndpointIntegrationTests.java index 5c3dd23b..d393f693 100644 --- a/spring-cloud-context-webflux-integration-tests/src/test/java/org/springframework/cloud/context/integration/webflux/RefreshEndpointIntegrationTests.java +++ b/spring-cloud-context-webflux-integration-tests/src/test/java/org/springframework/cloud/context/integration/webflux/RefreshEndpointIntegrationTests.java @@ -38,8 +38,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @RunWith(SpringRunner.class) @SpringBootTest(classes = RefreshEndpointIntegrationTests.ClientApp.class, - properties = { "management.endpoints.web.exposure.include=*" }, - webEnvironment = RANDOM_PORT) + properties = { "management.endpoints.web.exposure.include=*" }, webEnvironment = RANDOM_PORT) public class RefreshEndpointIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); @@ -50,9 +49,8 @@ public class RefreshEndpointIntegrationTests { @Test public void webAccess() throws Exception { TestRestTemplate template = new TestRestTemplate(); - ResponseEntity entity = template.postForEntity( - "http://localhost:" + this.port + BASE_PATH + "/refresh", null, - String.class); + ResponseEntity entity = template.postForEntity("http://localhost:" + this.port + BASE_PATH + "/refresh", + null, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java index 6337fcc2..94dc8b4e 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java @@ -53,10 +53,8 @@ public class ConfigurationPropertiesRebinderAutoConfiguration @Bean @ConditionalOnMissingBean(search = SearchStrategy.CURRENT) - public ConfigurationPropertiesRebinder configurationPropertiesRebinder( - ConfigurationPropertiesBeans beans) { - ConfigurationPropertiesRebinder rebinder = new ConfigurationPropertiesRebinder( - beans); + public ConfigurationPropertiesRebinder configurationPropertiesRebinder(ConfigurationPropertiesBeans beans) { + ConfigurationPropertiesRebinder rebinder = new ConfigurationPropertiesRebinder(beans); return rebinder; } @@ -70,8 +68,7 @@ public class ConfigurationPropertiesRebinderAutoConfiguration if (this.context.getParent() != null) { // TODO: make this optional? (E.g. when creating child contexts that prefer to // be isolated.) - ConfigurationPropertiesRebinder rebinder = this.context - .getBean(ConfigurationPropertiesRebinder.class); + ConfigurationPropertiesRebinder rebinder = this.context.getBean(ConfigurationPropertiesRebinder.class); for (String name : this.context.getParent().getBeanDefinitionNames()) { rebinder.rebind(name); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 2dbadbd0..dc579ab7 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -66,8 +66,7 @@ import org.springframework.util.StringUtils; */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RefreshScope.class) -@ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED, - matchIfMissing = true) +@ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED, matchIfMissing = true) @AutoConfigureBefore(HibernateJpaAutoConfiguration.class) public class RefreshAutoConfiguration { @@ -101,16 +100,15 @@ public class RefreshAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnBootstrapEnabled - public LegacyContextRefresher legacyContextRefresher( - ConfigurableApplicationContext context, RefreshScope scope) { + public LegacyContextRefresher legacyContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) { return new LegacyContextRefresher(context, scope); } @Bean @ConditionalOnMissingBean @ConditionalOnBootstrapDisabled - public ConfigDataContextRefresher configDataContextRefresher( - ConfigurableApplicationContext context, RefreshScope scope) { + public ConfigDataContextRefresher configDataContextRefresher(ConfigurableApplicationContext context, + RefreshScope scope) { return new ConfigDataContextRefresher(context, scope); } @@ -170,33 +168,27 @@ public class RefreshAutoConfiguration { } @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) - throws BeansException { + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { } @Override - public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) - throws BeansException { + public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { bindEnvironmentIfNeeded(registry); for (String name : registry.getBeanDefinitionNames()) { BeanDefinition definition = registry.getBeanDefinition(name); if (isApplicable(registry, name, definition)) { - BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, - name); - BeanDefinitionHolder proxy = ScopedProxyUtils - .createScopedProxy(holder, registry, true); + BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, name); + BeanDefinitionHolder proxy = ScopedProxyUtils.createScopedProxy(holder, registry, true); definition.setScope("refresh"); if (registry.containsBeanDefinition(proxy.getBeanName())) { registry.removeBeanDefinition(proxy.getBeanName()); } - registry.registerBeanDefinition(proxy.getBeanName(), - proxy.getBeanDefinition()); + registry.registerBeanDefinition(proxy.getBeanName(), proxy.getBeanDefinition()); } } } - private boolean isApplicable(BeanDefinitionRegistry registry, String name, - BeanDefinition definition) { + private boolean isApplicable(BeanDefinitionRegistry registry, String name, BeanDefinition definition) { String scope = definition.getScope(); if (REFRESH_SCOPE_NAME.equals(scope)) { // Already refresh scoped @@ -220,8 +212,7 @@ public class RefreshAutoConfiguration { if (this.environment == null) { this.environment = new StandardEnvironment(); } - Binder.get(this.environment).bind("spring.cloud.refresh", - Bindable.ofInstance(this)); + Binder.get(this.environment).bind("spring.cloud.refresh", Bindable.ofInstance(this)); this.bound = true; } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java index cda381d8..b808a2f0 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java @@ -45,18 +45,15 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter; */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EndpointAutoConfiguration.class, Health.class }) -@AutoConfigureAfter({ LifecycleMvcEndpointAutoConfiguration.class, - RefreshAutoConfiguration.class }) -@Import({ RestartEndpointWithIntegrationConfiguration.class, - RestartEndpointWithoutIntegrationConfiguration.class, +@AutoConfigureAfter({ LifecycleMvcEndpointAutoConfiguration.class, RefreshAutoConfiguration.class }) +@Import({ RestartEndpointWithIntegrationConfiguration.class, RestartEndpointWithoutIntegrationConfiguration.class, PauseResumeEndpointsConfiguration.class }) public class RefreshEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnEnabledHealthIndicator("refresh") - RefreshScopeHealthIndicator refreshScopeHealthIndicator( - ObjectProvider scope, + RefreshScopeHealthIndicator refreshScopeHealthIndicator(ObjectProvider scope, ConfigurationPropertiesRebinder rebinder) { return new RefreshScopeHealthIndicator(scope, rebinder); } @@ -124,8 +121,7 @@ class PauseResumeEndpointsConfiguration { @ConditionalOnBean(RestartEndpoint.class) @ConditionalOnMissingBean @ConditionalOnAvailableEndpoint - public RestartEndpoint.ResumeEndpoint resumeEndpoint( - RestartEndpoint restartEndpoint) { + public RestartEndpoint.ResumeEndpoint resumeEndpoint(RestartEndpoint restartEndpoint) { return restartEndpoint.getResumeEndpoint(); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index 8a1d3287..cf088038 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -53,18 +53,15 @@ public class WritableEnvironmentEndpointAutoConfiguration { private final EnvironmentEndpointProperties properties; - public WritableEnvironmentEndpointAutoConfiguration( - EnvironmentEndpointProperties properties) { + public WritableEnvironmentEndpointAutoConfiguration(EnvironmentEndpointProperties properties) { this.properties = properties; } @Bean @ConditionalOnMissingBean @ConditionalOnAvailableEndpoint - public WritableEnvironmentEndpoint writableEnvironmentEndpoint( - Environment environment) { - WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint( - environment); + public WritableEnvironmentEndpoint writableEnvironmentEndpoint(Environment environment) { + WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint(environment); String[] keysToSanitize = this.properties.getKeysToSanitize(); if (keysToSanitize != null) { endpoint.setKeysToSanitize(keysToSanitize); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java index 63a9d80f..1fa08e6b 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java @@ -74,8 +74,7 @@ import static org.springframework.cloud.util.PropertyUtils.useLegacyProcessing; * @author Dave Syer * */ -public class BootstrapApplicationListener - implements ApplicationListener, Ordered { +public class BootstrapApplicationListener implements ApplicationListener, Ordered { /** * Property source name for bootstrap. @@ -105,33 +104,25 @@ public class BootstrapApplicationListener return; } ConfigurableApplicationContext context = null; - String configName = environment - .resolvePlaceholders("${spring.cloud.bootstrap.name:bootstrap}"); - for (ApplicationContextInitializer initializer : event.getSpringApplication() - .getInitializers()) { + String configName = environment.resolvePlaceholders("${spring.cloud.bootstrap.name:bootstrap}"); + for (ApplicationContextInitializer initializer : event.getSpringApplication().getInitializers()) { if (initializer instanceof ParentContextApplicationContextInitializer) { - context = findBootstrapContext( - (ParentContextApplicationContextInitializer) initializer, - configName); + context = findBootstrapContext((ParentContextApplicationContextInitializer) initializer, configName); } } if (context == null) { - context = bootstrapServiceContext(environment, event.getSpringApplication(), - configName); - event.getSpringApplication() - .addListeners(new CloseContextOnFailureApplicationListener(context)); + context = bootstrapServiceContext(environment, event.getSpringApplication(), configName); + event.getSpringApplication().addListeners(new CloseContextOnFailureApplicationListener(context)); } apply(context, event.getSpringApplication(), environment); } - private ConfigurableApplicationContext findBootstrapContext( - ParentContextApplicationContextInitializer initializer, String configName) { - Field field = ReflectionUtils - .findField(ParentContextApplicationContextInitializer.class, "parent"); + private ConfigurableApplicationContext findBootstrapContext(ParentContextApplicationContextInitializer initializer, + String configName) { + Field field = ReflectionUtils.findField(ParentContextApplicationContextInitializer.class, "parent"); ReflectionUtils.makeAccessible(field); - ConfigurableApplicationContext parent = safeCast( - ConfigurableApplicationContext.class, + ConfigurableApplicationContext parent = safeCast(ConfigurableApplicationContext.class, ReflectionUtils.getField(field, initializer)); if (parent != null && !configName.equals(parent.getId())) { parent = safeCast(ConfigurableApplicationContext.class, parent.getParent()); @@ -148,17 +139,14 @@ public class BootstrapApplicationListener } } - private ConfigurableApplicationContext bootstrapServiceContext( - ConfigurableEnvironment environment, final SpringApplication application, - String configName) { + private ConfigurableApplicationContext bootstrapServiceContext(ConfigurableEnvironment environment, + final SpringApplication application, String configName) { StandardEnvironment bootstrapEnvironment = new StandardEnvironment(); - MutablePropertySources bootstrapProperties = bootstrapEnvironment - .getPropertySources(); + MutablePropertySources bootstrapProperties = bootstrapEnvironment.getPropertySources(); for (PropertySource source : bootstrapProperties) { bootstrapProperties.remove(source.getName()); } - String configLocation = environment - .resolvePlaceholders("${spring.cloud.bootstrap.location:}"); + String configLocation = environment.resolvePlaceholders("${spring.cloud.bootstrap.location:}"); String configAdditionalLocation = environment .resolvePlaceholders("${spring.cloud.bootstrap.additional-location:}"); Map bootstrapMap = new HashMap<>(); @@ -173,11 +161,9 @@ public class BootstrapApplicationListener bootstrapMap.put("spring.config.location", configLocation); } if (StringUtils.hasText(configAdditionalLocation)) { - bootstrapMap.put("spring.config.additional-location", - configAdditionalLocation); + bootstrapMap.put("spring.config.additional-location", configAdditionalLocation); } - bootstrapProperties.addFirst( - new MapPropertySource(BOOTSTRAP_PROPERTY_SOURCE_NAME, bootstrapMap)); + bootstrapProperties.addFirst(new MapPropertySource(BOOTSTRAP_PROPERTY_SOURCE_NAME, bootstrapMap)); for (PropertySource source : environment.getPropertySources()) { if (source instanceof StubPropertySource) { continue; @@ -185,12 +171,10 @@ public class BootstrapApplicationListener bootstrapProperties.addLast(source); } // TODO: is it possible or sensible to share a ResourceLoader? - SpringApplicationBuilder builder = new SpringApplicationBuilder() - .profiles(environment.getActiveProfiles()).bannerMode(Mode.OFF) - .environment(bootstrapEnvironment) + SpringApplicationBuilder builder = new SpringApplicationBuilder().profiles(environment.getActiveProfiles()) + .bannerMode(Mode.OFF).environment(bootstrapEnvironment) // Don't use the default properties in this builder - .registerShutdownHook(false).logStartupInfo(false) - .web(WebApplicationType.NONE); + .registerShutdownHook(false).logStartupInfo(false).web(WebApplicationType.NONE); final SpringApplication builderApplication = builder.application(); if (builderApplication.getMainApplicationClass() == null) { // gh_425: @@ -207,8 +191,7 @@ public class BootstrapApplicationListener // Environment, and there are some toxic listeners (like the // LoggingApplicationListener) that affect global static state, so we need a // way to switch those off. - builderApplication - .setListeners(filterListeners(builderApplication.getListeners())); + builderApplication.setListeners(filterListeners(builderApplication.getListeners())); } builder.sources(BootstrapImportSelectorConfiguration.class); final ConfigurableApplicationContext context = builder.run(); @@ -226,8 +209,7 @@ public class BootstrapApplicationListener return context; } - private Collection> filterListeners( - Set> listeners) { + private Collection> filterListeners(Set> listeners) { Set> result = new LinkedHashSet<>(); for (ApplicationListener listener : listeners) { if (!(listener instanceof LoggingApplicationListener) @@ -238,8 +220,7 @@ public class BootstrapApplicationListener return result; } - private void mergeDefaultProperties(MutablePropertySources environment, - MutablePropertySources bootstrap) { + private void mergeDefaultProperties(MutablePropertySources environment, MutablePropertySources bootstrap) { String name = DEFAULT_PROPERTIES; if (bootstrap.contains(name)) { PropertySource source = bootstrap.get(name); @@ -248,10 +229,8 @@ public class BootstrapApplicationListener } else { PropertySource target = environment.get(name); - if (target instanceof MapPropertySource && target != source - && source instanceof MapPropertySource) { - Map targetMap = ((MapPropertySource) target) - .getSource(); + if (target instanceof MapPropertySource && target != source && source instanceof MapPropertySource) { + Map targetMap = ((MapPropertySource) target).getSource(); Map map = ((MapPropertySource) source).getSource(); for (String key : map.keySet()) { if (!target.containsProperty(key)) { @@ -264,13 +243,11 @@ public class BootstrapApplicationListener mergeAdditionalPropertySources(environment, bootstrap); } - private void mergeAdditionalPropertySources(MutablePropertySources environment, - MutablePropertySources bootstrap) { + private void mergeAdditionalPropertySources(MutablePropertySources environment, MutablePropertySources bootstrap) { PropertySource defaultProperties = environment.get(DEFAULT_PROPERTIES); ExtendedDefaultPropertySource result = defaultProperties instanceof ExtendedDefaultPropertySource ? (ExtendedDefaultPropertySource) defaultProperties - : new ExtendedDefaultPropertySource(DEFAULT_PROPERTIES, - defaultProperties); + : new ExtendedDefaultPropertySource(DEFAULT_PROPERTIES, defaultProperties); for (PropertySource source : bootstrap) { if (!environment.contains(source.getName())) { result.add(source); @@ -283,8 +260,7 @@ public class BootstrapApplicationListener addOrReplace(bootstrap, result); } - private void addOrReplace(MutablePropertySources environment, - PropertySource result) { + private void addOrReplace(MutablePropertySources environment, PropertySource result) { if (environment.contains(result.getName())) { environment.replace(result.getName(), result); } @@ -293,11 +269,9 @@ public class BootstrapApplicationListener } } - private void addAncestorInitializer(SpringApplication application, - ConfigurableApplicationContext context) { + private void addAncestorInitializer(SpringApplication application, ConfigurableApplicationContext context) { boolean installed = false; - for (ApplicationContextInitializer initializer : application - .getInitializers()) { + for (ApplicationContextInitializer initializer : application.getInitializers()) { if (initializer instanceof AncestorInitializer) { installed = true; // New parent @@ -311,16 +285,15 @@ public class BootstrapApplicationListener } @SuppressWarnings("unchecked") - private void apply(ConfigurableApplicationContext context, - SpringApplication application, ConfigurableEnvironment environment) { + private void apply(ConfigurableApplicationContext context, SpringApplication application, + ConfigurableEnvironment environment) { if (application.getAllSources().contains(BootstrapMarkerConfiguration.class)) { return; } application.addPrimarySources(Arrays.asList(BootstrapMarkerConfiguration.class)); @SuppressWarnings("rawtypes") Set target = new LinkedHashSet<>(application.getInitializers()); - target.addAll( - getOrderedBeansOfType(context, ApplicationContextInitializer.class)); + target.addAll(getOrderedBeansOfType(context, ApplicationContextInitializer.class)); application.setInitializers(target); addBootstrapDecryptInitializer(application); } @@ -349,8 +322,7 @@ public class BootstrapApplicationListener application.setInitializers(target); } - private List getOrderedBeansOfType(ListableBeanFactory context, - Class type) { + private List getOrderedBeansOfType(ListableBeanFactory context, Class type) { List result = new ArrayList(); for (String name : context.getBeanNamesForType(type)) { result.add(context.getBean(name, type)); @@ -372,8 +344,8 @@ public class BootstrapApplicationListener } - private static class AncestorInitializer implements - ApplicationContextInitializer, Ordered { + private static class AncestorInitializer + implements ApplicationContextInitializer, Ordered { private ConfigurableApplicationContext parent; @@ -400,22 +372,18 @@ public class BootstrapApplicationListener context = (ConfigurableApplicationContext) context.getParent(); } reorderSources(context.getEnvironment()); - new ParentContextApplicationContextInitializer(this.parent) - .initialize(context); + new ParentContextApplicationContextInitializer(this.parent).initialize(context); } private void reorderSources(ConfigurableEnvironment environment) { - PropertySource removed = environment.getPropertySources() - .remove(DEFAULT_PROPERTIES); + PropertySource removed = environment.getPropertySources().remove(DEFAULT_PROPERTIES); if (removed instanceof ExtendedDefaultPropertySource) { ExtendedDefaultPropertySource defaultProperties = (ExtendedDefaultPropertySource) removed; - environment.getPropertySources().addLast(new MapPropertySource( - DEFAULT_PROPERTIES, defaultProperties.getSource())); - for (PropertySource source : defaultProperties.getPropertySources() - .getPropertySources()) { + environment.getPropertySources() + .addLast(new MapPropertySource(DEFAULT_PROPERTIES, defaultProperties.getSource())); + for (PropertySource source : defaultProperties.getPropertySources().getPropertySources()) { if (!environment.getPropertySources().contains(source.getName())) { - environment.getPropertySources().addBefore(DEFAULT_PROPERTIES, - source); + environment.getPropertySources().addBefore(DEFAULT_PROPERTIES, source); } } } @@ -445,8 +413,8 @@ public class BootstrapApplicationListener } - private static class ExtendedDefaultPropertySource - extends SystemEnvironmentPropertySource implements OriginLookup { + private static class ExtendedDefaultPropertySource extends SystemEnvironmentPropertySource + implements OriginLookup { private final OriginTrackedCompositePropertySource sources; @@ -475,8 +443,7 @@ public class BootstrapApplicationListener public void add(PropertySource source) { // Only add map property sources added by boot, see gh-476 - if (source instanceof OriginTrackedMapPropertySource - && !this.names.contains(source.getName())) { + if (source instanceof OriginTrackedMapPropertySource && !this.names.contains(source.getName())) { this.sources.addPropertySource(source); this.names.add(source.getName()); } @@ -513,8 +480,7 @@ public class BootstrapApplicationListener } - private static class CloseContextOnFailureApplicationListener - implements SmartApplicationListener { + private static class CloseContextOnFailureApplicationListener implements SmartApplicationListener { private final ConfigurableApplicationContext context; diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java index d2f19176..9e3ef98c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java @@ -26,8 +26,7 @@ import org.springframework.context.ApplicationEvent; * @since 3.0.0 */ @SuppressWarnings("deprecation") -public class BootstrapConfigFileApplicationListener - extends ConfigFileApplicationListener { +public class BootstrapConfigFileApplicationListener extends ConfigFileApplicationListener { @Override public void onApplicationEvent(ApplicationEvent event) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java index 4f93aef8..62994c62 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapImportSelector.java @@ -61,16 +61,15 @@ public class BootstrapImportSelector implements EnvironmentAware, DeferredImport public String[] selectImports(AnnotationMetadata annotationMetadata) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); // Use names and ensure unique to protect against duplicates - List names = new ArrayList<>(SpringFactoriesLoader - .loadFactoryNames(BootstrapConfiguration.class, classLoader)); - names.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray( - this.environment.getProperty("spring.cloud.bootstrap.sources", "")))); + List names = new ArrayList<>( + SpringFactoriesLoader.loadFactoryNames(BootstrapConfiguration.class, classLoader)); + names.addAll(Arrays.asList(StringUtils + .commaDelimitedListToStringArray(this.environment.getProperty("spring.cloud.bootstrap.sources", "")))); List elements = new ArrayList<>(); for (String name : names) { try { - elements.add( - new OrderedAnnotatedElement(this.metadataReaderFactory, name)); + elements.add(new OrderedAnnotatedElement(this.metadataReaderFactory, name)); } catch (IOException e) { continue; @@ -91,12 +90,10 @@ public class BootstrapImportSelector implements EnvironmentAware, DeferredImport private Integer value; - OrderedAnnotatedElement(MetadataReaderFactory metadataReaderFactory, String name) - throws IOException { + OrderedAnnotatedElement(MetadataReaderFactory metadataReaderFactory, String name) throws IOException { MetadataReader metadataReader = metadataReaderFactory.getMetadataReader(name); AnnotationMetadata metadata = metadataReader.getAnnotationMetadata(); - Map attributes = metadata - .getAnnotationAttributes(Order.class.getName()); + Map attributes = metadata.getAnnotationAttributes(Order.class.getName()); this.name = name; if (attributes != null && attributes.containsKey("value")) { this.value = (Integer) attributes.get("value"); @@ -125,8 +122,7 @@ public class BootstrapImportSelector implements EnvironmentAware, DeferredImport @Override public Annotation[] getAnnotations() { - return this.order == null ? new Annotation[0] - : new Annotation[] { this.order }; + return this.order == null ? new Annotation[0] : new Annotation[] { this.order }; } @Override @@ -136,8 +132,7 @@ public class BootstrapImportSelector implements EnvironmentAware, DeferredImport @Override public String toString() { - return new ToStringCreator(this).append("name", this.name) - .append("value", this.value).toString(); + return new ToStringCreator(this).append("name", this.name).append("value", this.value).toString(); } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/LoggingSystemShutdownListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/LoggingSystemShutdownListener.java index e767a28b..7240594e 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/LoggingSystemShutdownListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/LoggingSystemShutdownListener.java @@ -36,8 +36,7 @@ public class LoggingSystemShutdownListener /** * Default order for the listener. */ - public static final int DEFAULT_ORDER = BootstrapApplicationListener.DEFAULT_ORDER - + 1; + public static final int DEFAULT_ORDER = BootstrapApplicationListener.DEFAULT_ORDER + 1; private int order = DEFAULT_ORDER; @@ -48,8 +47,7 @@ public class LoggingSystemShutdownListener private void shutdownLogging() { // TODO: only enable if bootstrap and legacy - LoggingSystem loggingSystem = LoggingSystem - .get(ClassUtils.getDefaultClassLoader()); + LoggingSystem loggingSystem = LoggingSystem.get(ClassUtils.getDefaultClassLoader()); loggingSystem.cleanUp(); loggingSystem.beforeInitialize(); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/BootstrapPropertySource.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/BootstrapPropertySource.java index 848cd3df..3a0dae2c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/BootstrapPropertySource.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/BootstrapPropertySource.java @@ -36,8 +36,7 @@ public class BootstrapPropertySource extends EnumerablePropertySource { private EnumerablePropertySource delegate; public BootstrapPropertySource(EnumerablePropertySource delegate) { - super(BOOTSTRAP_PROPERTY_SOURCE_NAME + "-" + delegate.getName(), - delegate.getSource()); + super(BOOTSTRAP_PROPERTY_SOURCE_NAME + "-" + delegate.getName(), delegate.getSource()); this.delegate = delegate; } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java index c7ab224a..4d45ef18 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java @@ -61,8 +61,8 @@ import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMEN */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PropertySourceBootstrapProperties.class) -public class PropertySourceBootstrapConfiguration implements - ApplicationContextInitializer, Ordered { +public class PropertySourceBootstrapConfiguration + implements ApplicationContextInitializer, Ordered { /** * Bootstrap property source name. @@ -70,8 +70,7 @@ public class PropertySourceBootstrapConfiguration implements public static final String BOOTSTRAP_PROPERTY_SOURCE_NAME = BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME + "Properties"; - private static Log logger = LogFactory - .getLog(PropertySourceBootstrapConfiguration.class); + private static Log logger = LogFactory.getLog(PropertySourceBootstrapConfiguration.class); private int order = Ordered.HIGHEST_PRECEDENCE + 10; @@ -83,8 +82,7 @@ public class PropertySourceBootstrapConfiguration implements return this.order; } - public void setPropertySourceLocators( - Collection propertySourceLocators) { + public void setPropertySourceLocators(Collection propertySourceLocators) { this.propertySourceLocators = new ArrayList<>(propertySourceLocators); } @@ -129,16 +127,14 @@ public class PropertySourceBootstrapConfiguration implements } } - private void reinitializeLoggingSystem(ConfigurableEnvironment environment, - String oldLogConfig, LogFile oldLogFile) { - Map props = Binder.get(environment) - .bind("logging", Bindable.mapOf(String.class, Object.class)) + private void reinitializeLoggingSystem(ConfigurableEnvironment environment, String oldLogConfig, + LogFile oldLogFile) { + Map props = Binder.get(environment).bind("logging", Bindable.mapOf(String.class, Object.class)) .orElseGet(Collections::emptyMap); if (!props.isEmpty()) { String logConfig = environment.resolvePlaceholders("${logging.config:}"); LogFile logFile = LogFile.get(environment); - LoggingSystem system = LoggingSystem - .get(LoggingSystem.class.getClassLoader()); + LoggingSystem system = LoggingSystem.get(LoggingSystem.class.getClassLoader()); try { ResourceUtils.getURL(logConfig).openStream().close(); // Three step initialization that accounts for the clean up of the logging @@ -146,28 +142,23 @@ public class PropertySourceBootstrapConfiguration implements // system that hasn't had this sequence applied (since 1.4.1). system.cleanUp(); system.beforeInitialize(); - system.initialize(new LoggingInitializationContext(environment), - logConfig, logFile); + system.initialize(new LoggingInitializationContext(environment), logConfig, logFile); } catch (Exception ex) { - PropertySourceBootstrapConfiguration.logger - .warn("Error opening logging config file " + logConfig, ex); + PropertySourceBootstrapConfiguration.logger.warn("Error opening logging config file " + logConfig, ex); } } } - private void setLogLevels(ConfigurableApplicationContext applicationContext, - ConfigurableEnvironment environment) { + private void setLogLevels(ConfigurableApplicationContext applicationContext, ConfigurableEnvironment environment) { LoggingRebinder rebinder = new LoggingRebinder(); rebinder.setEnvironment(environment); // We can't fire the event in the ApplicationContext here (too early), but we can // create our own listener and poke it (it doesn't need the key changes) - rebinder.onApplicationEvent(new EnvironmentChangeEvent(applicationContext, - Collections.emptySet())); + rebinder.onApplicationEvent(new EnvironmentChangeEvent(applicationContext, Collections.emptySet())); } - private void insertPropertySources(MutablePropertySources propertySources, - List> composite) { + private void insertPropertySources(MutablePropertySources propertySources, List> composite) { MutablePropertySources incoming = new MutablePropertySources(); List> reversedComposite = new ArrayList<>(composite); // Reverse the list so that when we call addFirst below we are maintaining the @@ -179,10 +170,9 @@ public class PropertySourceBootstrapConfiguration implements incoming.addFirst(p); } PropertySourceBootstrapProperties remoteProperties = new PropertySourceBootstrapProperties(); - Binder.get(environment(incoming)).bind("spring.cloud.config", - Bindable.ofInstance(remoteProperties)); - if (!remoteProperties.isAllowOverride() || (!remoteProperties.isOverrideNone() - && remoteProperties.isOverrideSystemProperties())) { + Binder.get(environment(incoming)).bind("spring.cloud.config", Bindable.ofInstance(remoteProperties)); + if (!remoteProperties.isAllowOverride() + || (!remoteProperties.isOverrideNone() && remoteProperties.isOverrideSystemProperties())) { for (PropertySource p : reversedComposite) { propertySources.addFirst(p); } @@ -241,12 +231,10 @@ public class PropertySourceBootstrapConfiguration implements for (String profile : includeProfiles) { activeProfiles.add(0, profile); } - environment.setActiveProfiles( - activeProfiles.toArray(new String[activeProfiles.size()])); + environment.setActiveProfiles(activeProfiles.toArray(new String[activeProfiles.size()])); } - private Set addIncludedProfilesTo(Set profiles, - PropertySource propertySource) { + private Set addIncludedProfilesTo(Set profiles, PropertySource propertySource) { if (propertySource instanceof CompositePropertySource) { for (PropertySource nestedPropertySource : ((CompositePropertySource) propertySource) .getPropertySources()) { @@ -254,16 +242,15 @@ public class PropertySourceBootstrapConfiguration implements } } else { - Collections.addAll(profiles, getProfilesForValue(propertySource.getProperty( - ConfigFileApplicationListener.INCLUDE_PROFILES_PROPERTY))); + Collections.addAll(profiles, getProfilesForValue( + propertySource.getProperty(ConfigFileApplicationListener.INCLUDE_PROFILES_PROPERTY))); } return profiles; } private String[] getProfilesForValue(Object property) { final String value = (property == null ? null : property.toString()); - return property == null ? new String[0] - : StringUtils.tokenizeToStringArray(value, ","); + return property == null ? new String[0] : StringUtils.tokenizeToStringArray(value, ","); } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceLocator.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceLocator.java index 8e33f3b4..cbac1bd8 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceLocator.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceLocator.java @@ -47,15 +47,13 @@ public interface PropertySourceLocator { return locateCollection(this, environment); } - static Collection> locateCollection(PropertySourceLocator locator, - Environment environment) { + static Collection> locateCollection(PropertySourceLocator locator, Environment environment) { PropertySource propertySource = locator.locate(environment); if (propertySource == null) { return Collections.emptyList(); } if (CompositePropertySource.class.isInstance(propertySource)) { - Collection> sources = ((CompositePropertySource) propertySource) - .getPropertySources(); + Collection> sources = ((CompositePropertySource) propertySource).getPropertySources(); List> filteredSources = new ArrayList<>(); for (PropertySource p : sources) { if (p != null) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/SimpleBootstrapPropertySource.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/SimpleBootstrapPropertySource.java index 3d17653b..f0132c7a 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/SimpleBootstrapPropertySource.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/SimpleBootstrapPropertySource.java @@ -30,8 +30,7 @@ public class SimpleBootstrapPropertySource extends PropertySource { private PropertySource delegate; public SimpleBootstrapPropertySource(PropertySource delegate) { - super(BOOTSTRAP_PROPERTY_SOURCE_NAME + "-" + delegate.getName(), - delegate.getSource()); + super(BOOTSTRAP_PROPERTY_SOURCE_NAME + "-" + delegate.getName(), delegate.getSource()); this.delegate = delegate; } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java index 8106e80e..2619ad86 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java @@ -81,12 +81,10 @@ public class EncryptionBootstrapConfiguration { if (keyStore.getLocation() != null) { if (keyStore.getLocation().exists()) { return new RsaSecretEncryptor( - new KeyStoreKeyFactory(keyStore.getLocation(), - keyStore.getPassword().toCharArray()).getKeyPair( - keyStore.getAlias(), - keyStore.getSecret().toCharArray()), - this.rsaProperties.getAlgorithm(), - this.rsaProperties.getSalt(), this.rsaProperties.isStrong()); + new KeyStoreKeyFactory(keyStore.getLocation(), keyStore.getPassword().toCharArray()) + .getKeyPair(keyStore.getAlias(), keyStore.getSecret().toCharArray()), + this.rsaProperties.getAlgorithm(), this.rsaProperties.getSalt(), + this.rsaProperties.isStrong()); } throw new IllegalStateException("Invalid keystore location"); @@ -119,15 +117,13 @@ public class EncryptionBootstrapConfiguration { public static class KeyCondition extends SpringBootCondition { @Override - public ConditionOutcome getMatchOutcome(ConditionContext context, - AnnotatedTypeMetadata metadata) { + public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { Environment environment = context.getEnvironment(); if (hasProperty(environment, "encrypt.key-store.location")) { if (hasProperty(environment, "encrypt.key-store.password")) { return ConditionOutcome.match("Keystore found in Environment"); } - return ConditionOutcome - .noMatch("Keystore found but no password in Environment"); + return ConditionOutcome.noMatch("Keystore found but no password in Environment"); } else if (hasProperty(environment, "encrypt.key")) { return ConditionOutcome.match("Key found in Environment"); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java index 2b23a7b4..1b061398 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java @@ -50,8 +50,8 @@ import org.springframework.security.crypto.encrypt.TextEncryptor; * @author Dave Syer * @author Tim Ysewyn */ -public class EnvironmentDecryptApplicationInitializer implements - ApplicationContextInitializer, Ordered { +public class EnvironmentDecryptApplicationInitializer + implements ApplicationContextInitializer, Ordered { /** * Name of the decrypted property source. @@ -68,11 +68,9 @@ public class EnvironmentDecryptApplicationInitializer implements */ public static final String ENCRYPTED_PROPERTY_PREFIX = "{cipher}"; - private static final Pattern COLLECTION_PROPERTY = Pattern - .compile("(\\S+)?\\[(\\d+)\\](\\.\\S+)?"); + private static final Pattern COLLECTION_PROPERTY = Pattern.compile("(\\S+)?\\[(\\d+)\\](\\.\\S+)?"); - private static Log logger = LogFactory - .getLog(EnvironmentDecryptApplicationInitializer.class); + private static Log logger = LogFactory.getLog(EnvironmentDecryptApplicationInitializer.class); private int order = Ordered.HIGHEST_PRECEDENCE + 15; @@ -115,8 +113,8 @@ public class EnvironmentDecryptApplicationInitializer implements Map map = decrypt(bootstrap); if (!map.isEmpty()) { found.addAll(map.keySet()); - insert(applicationContext, new SystemEnvironmentPropertySource( - DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME, map)); + insert(applicationContext, + new SystemEnvironmentPropertySource(DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME, map)); } } } @@ -125,8 +123,7 @@ public class EnvironmentDecryptApplicationInitializer implements if (!map.isEmpty()) { // We have some decrypted properties found.addAll(map.keySet()); - insert(applicationContext, new SystemEnvironmentPropertySource( - DECRYPTED_PROPERTY_SOURCE_NAME, map)); + insert(applicationContext, new SystemEnvironmentPropertySource(DECRYPTED_PROPERTY_SOURCE_NAME, map)); } if (!found.isEmpty()) { ApplicationContext parent = applicationContext.getParent(); @@ -140,33 +137,24 @@ public class EnvironmentDecryptApplicationInitializer implements } } - private void insert(ApplicationContext applicationContext, - PropertySource propertySource) { + private void insert(ApplicationContext applicationContext, PropertySource propertySource) { ApplicationContext parent = applicationContext; while (parent != null) { if (parent.getEnvironment() instanceof ConfigurableEnvironment) { - ConfigurableEnvironment mutable = (ConfigurableEnvironment) parent - .getEnvironment(); + ConfigurableEnvironment mutable = (ConfigurableEnvironment) parent.getEnvironment(); insert(mutable.getPropertySources(), propertySource); } parent = parent.getParent(); } } - private void insert(MutablePropertySources propertySources, - PropertySource propertySource) { - if (propertySources - .contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) { - if (DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME - .equals(propertySource.getName())) { - propertySources.addBefore( - BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME, - propertySource); + private void insert(MutablePropertySources propertySources, PropertySource propertySource) { + if (propertySources.contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) { + if (DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME.equals(propertySource.getName())) { + propertySources.addBefore(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME, propertySource); } else { - propertySources.addAfter( - BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME, - propertySource); + propertySources.addAfter(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME, propertySource); } } else { @@ -218,8 +206,7 @@ public class EnvironmentDecryptApplicationInitializer implements private void merge(PropertySource source, Map properties) { if (source instanceof CompositePropertySource) { - List> sources = new ArrayList<>( - ((CompositePropertySource) source).getPropertySources()); + List> sources = new ArrayList<>(((CompositePropertySource) source).getPropertySources()); Collections.reverse(sources); for (PropertySource nested : sources) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/support/OriginTrackedCompositePropertySource.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/support/OriginTrackedCompositePropertySource.java index 9c639cbd..c4e3e0bb 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/support/OriginTrackedCompositePropertySource.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/support/OriginTrackedCompositePropertySource.java @@ -21,8 +21,7 @@ import org.springframework.boot.origin.OriginLookup; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.PropertySource; -public class OriginTrackedCompositePropertySource extends CompositePropertySource - implements OriginLookup { +public class OriginTrackedCompositePropertySource extends CompositePropertySource implements OriginLookup { /** * Create a new {@code CompositePropertySource}. diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java index 0d172a18..71bf521c 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java @@ -56,8 +56,7 @@ public class EncryptorFactory { try { String normalizedPemData = normalizePem(data); - encryptor = new RsaSecretEncryptor( - NEWLINE_ESCAPE_PATTERN.matcher(normalizedPemData).replaceAll("")); + encryptor = new RsaSecretEncryptor(NEWLINE_ESCAPE_PATTERN.matcher(normalizedPemData).replaceAll("")); } catch (IllegalArgumentException e) { throw new KeyFormatException(e); @@ -82,8 +81,7 @@ public class EncryptorFactory { StringWriter textWriter = new StringWriter(); try (PemWriter pemWriter = new PemWriter(textWriter)) { - PemObjectGenerator pemObjectGenerator = new MiscPEMGenerator( - privateKeyInfo); + PemObjectGenerator pemObjectGenerator = new MiscPEMGenerator(privateKeyInfo); pemWriter.writeObject(pemObjectGenerator); pemWriter.flush(); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java index 3a6606d8..f32db63f 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java @@ -55,8 +55,7 @@ public class EnvironmentManager implements ApplicationEventPublisherAware { MutablePropertySources sources = environment.getPropertySources(); if (sources.contains(MANAGER_PROPERTY_SOURCE)) { @SuppressWarnings("unchecked") - Map map = (Map) sources - .get(MANAGER_PROPERTY_SOURCE).getSource(); + Map map = (Map) sources.get(MANAGER_PROPERTY_SOURCE).getSource(); this.map = map; } } @@ -81,10 +80,8 @@ public class EnvironmentManager implements ApplicationEventPublisherAware { if (!this.environment.getPropertySources().contains(MANAGER_PROPERTY_SOURCE)) { synchronized (this.map) { - if (!this.environment.getPropertySources() - .contains(MANAGER_PROPERTY_SOURCE)) { - MapPropertySource source = new MapPropertySource( - MANAGER_PROPERTY_SOURCE, this.map); + if (!this.environment.getPropertySources().contains(MANAGER_PROPERTY_SOURCE)) { + MapPropertySource source = new MapPropertySource(MANAGER_PROPERTY_SOURCE, this.map); this.environment.getPropertySources().addFirst(source); } } @@ -92,8 +89,7 @@ public class EnvironmentManager implements ApplicationEventPublisherAware { if (!value.equals(this.environment.getProperty(name))) { this.map.put(name, value); - publish(new EnvironmentChangeEvent(this.publisher, - Collections.singleton(name))); + publish(new EnvironmentChangeEvent(this.publisher, Collections.singleton(name))); } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/WritableEnvironmentEndpointWebExtension.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/WritableEnvironmentEndpointWebExtension.java index 227742eb..135038d5 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/WritableEnvironmentEndpointWebExtension.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/WritableEnvironmentEndpointWebExtension.java @@ -32,8 +32,7 @@ import org.springframework.boot.actuate.env.EnvironmentEndpointWebExtension; * */ @EndpointWebExtension(endpoint = WritableEnvironmentEndpoint.class) -public class WritableEnvironmentEndpointWebExtension - extends EnvironmentEndpointWebExtension { +public class WritableEnvironmentEndpointWebExtension extends EnvironmentEndpointWebExtension { private EnvironmentManager environment; diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java index 9463143f..2ce04041 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/ClientFactoryObjectProvider.java @@ -42,8 +42,7 @@ class ClientFactoryObjectProvider implements ObjectProvider { private ObjectProvider provider; - ClientFactoryObjectProvider(NamedContextFactory clientFactory, String name, - Class type) { + ClientFactoryObjectProvider(NamedContextFactory clientFactory, String name, Class type) { this.clientFactory = clientFactory; this.name = name; this.type = type; diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java index 54ae7d64..5b046cd0 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java @@ -62,8 +62,7 @@ public abstract class NamedContextFactory defaultConfigType; - public NamedContextFactory(Class defaultConfigType, String propertySourceName, - String propertyName) { + public NamedContextFactory(Class defaultConfigType, String propertySourceName, String propertyName) { this.defaultConfigType = defaultConfigType; this.propertySourceName = propertySourceName; this.propertyName = propertyName; @@ -109,8 +108,7 @@ public abstract class NamedContextFactory configuration : this.configurations.get(name) - .getConfiguration()) { + for (Class configuration : this.configurations.get(name).getConfiguration()) { context.register(configuration); } } @@ -121,10 +119,8 @@ public abstract class NamedContextFactorysingletonMap(this.propertyName, name))); if (this.parent != null) { // Uses Environment from parent as well as beans @@ -170,8 +166,7 @@ public abstract class NamedContextFactory T getInstance(String name, ResolvableType type) { AnnotationConfigApplicationContext context = getContext(name); - String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, - type); + String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, type); if (beanNames.length > 0) { for (String beanName : beanNames) { if (context.isTypeMatch(beanName, type)) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java index 1d5b38ec..35ffc8d6 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java @@ -36,8 +36,7 @@ import org.springframework.stereotype.Component; * @author Dave Syer */ @Component -public class ConfigurationPropertiesBeans - implements BeanPostProcessor, ApplicationContextAware { +public class ConfigurationPropertiesBeans implements BeanPostProcessor, ApplicationContextAware { private Map beans = new HashMap<>(); @@ -52,20 +51,16 @@ public class ConfigurationPropertiesBeans private ConfigurationPropertiesBeans parent; @Override - public void setApplicationContext(ApplicationContext applicationContext) - throws BeansException { + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; - if (applicationContext - .getAutowireCapableBeanFactory() instanceof ConfigurableListableBeanFactory) { - this.beanFactory = (ConfigurableListableBeanFactory) applicationContext - .getAutowireCapableBeanFactory(); + if (applicationContext.getAutowireCapableBeanFactory() instanceof ConfigurableListableBeanFactory) { + this.beanFactory = (ConfigurableListableBeanFactory) applicationContext.getAutowireCapableBeanFactory(); } if (applicationContext.getParent() != null && applicationContext.getParent() .getAutowireCapableBeanFactory() instanceof ConfigurableListableBeanFactory) { - ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) applicationContext - .getParent().getAutowireCapableBeanFactory(); - String[] names = listable - .getBeanNamesForType(ConfigurationPropertiesBeans.class); + ConfigurableListableBeanFactory listable = (ConfigurableListableBeanFactory) applicationContext.getParent() + .getAutowireCapableBeanFactory(); + String[] names = listable.getBeanNamesForType(ConfigurationPropertiesBeans.class); if (names.length == 1) { this.parent = (ConfigurationPropertiesBeans) listable.getBean(names[0]); this.beans.putAll(this.parent.beans); @@ -74,13 +69,12 @@ public class ConfigurationPropertiesBeans } @Override - public Object postProcessBeforeInitialization(Object bean, String beanName) - throws BeansException { + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (isRefreshScoped(beanName)) { return bean; } - ConfigurationPropertiesBean propertiesBean = ConfigurationPropertiesBean - .get(this.applicationContext, bean, beanName); + ConfigurationPropertiesBean propertiesBean = ConfigurationPropertiesBean.get(this.applicationContext, bean, + beanName); if (propertiesBean != null) { this.beans.put(beanName, propertiesBean); } @@ -101,13 +95,12 @@ public class ConfigurationPropertiesBeans if (beanName == null || this.refreshScope == null) { return false; } - return this.beanFactory.containsBeanDefinition(beanName) && this.refreshScope - .equals(this.beanFactory.getBeanDefinition(beanName).getScope()); + return this.beanFactory.containsBeanDefinition(beanName) + && this.refreshScope.equals(this.beanFactory.getBeanDefinition(beanName).getScope()); } @Override - public Object postProcessAfterInitialization(Object bean, String beanName) - throws BeansException { + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java index f3f766fe..bd15bd69 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java @@ -64,8 +64,7 @@ public class ConfigurationPropertiesRebinder } @Override - public void setApplicationContext(ApplicationContext applicationContext) - throws BeansException { + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } @@ -102,10 +101,8 @@ public class ConfigurationPropertiesRebinder if (getNeverRefreshable().contains(bean.getClass().getName())) { return false; // ignore } - this.applicationContext.getAutowireCapableBeanFactory() - .destroyBean(bean); - this.applicationContext.getAutowireCapableBeanFactory() - .initializeBean(bean, name); + this.applicationContext.getAutowireCapableBeanFactory().destroyBean(bean); + this.applicationContext.getAutowireCapableBeanFactory().initializeBean(bean, name); return true; } } @@ -123,9 +120,8 @@ public class ConfigurationPropertiesRebinder @ManagedAttribute public Set getNeverRefreshable() { - String neverRefresh = this.applicationContext.getEnvironment().getProperty( - "spring.cloud.refresh.never-refreshable", - "com.zaxxer.hikari.HikariDataSource"); + String neverRefresh = this.applicationContext.getEnvironment() + .getProperty("spring.cloud.refresh.never-refreshable", "com.zaxxer.hikari.HikariDataSource"); return StringUtils.commaDelimitedListToSet(neverRefresh); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java index 980e8423..7380b82e 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java @@ -53,23 +53,20 @@ public abstract class ContextRefresher { protected static final String[] DEFAULT_PROPERTY_SOURCES = new String[] { // order matters, if cli args aren't first, things get messy - CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME, - "defaultProperties" }; + CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME, "defaultProperties" }; protected Set standardSources = new HashSet<>( Arrays.asList(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, StandardServletEnvironment.JNDI_PROPERTY_SOURCE_NAME, StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME, - StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, - "configurationProperties")); + StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, "configurationProperties")); private ConfigurableApplicationContext context; private RefreshScope scope; - protected ContextRefresher(ConfigurableApplicationContext context, - RefreshScope scope) { + protected ContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) { this.context = context; this.scope = scope; } @@ -89,11 +86,9 @@ public abstract class ContextRefresher { } public synchronized Set refreshEnvironment() { - Map before = extract( - this.context.getEnvironment().getPropertySources()); + Map before = extract(this.context.getEnvironment().getPropertySources()); updateEnvironment(); - Set keys = changes(before, - extract(this.context.getEnvironment().getPropertySources())).keySet(); + Set keys = changes(before, extract(this.context.getEnvironment().getPropertySources())).keySet(); this.context.publishEvent(new EnvironmentChangeEvent(this.context, keys)); return keys; } @@ -110,8 +105,7 @@ public abstract class ContextRefresher { for (String name : DEFAULT_PROPERTY_SOURCES) { if (input.getPropertySources().contains(name)) { if (capturedPropertySources.contains(name)) { - capturedPropertySources.replace(name, - input.getPropertySources().get(name)); + capturedPropertySources.replace(name, input.getPropertySources().get(name)); } else { capturedPropertySources.addLast(input.getPropertySources().get(name)); @@ -125,13 +119,11 @@ public abstract class ContextRefresher { map.put("spring.main.sources", ""); // gh-678 without this apps with this property set to REACTIVE or SERVLET fail map.put("spring.main.web-application-type", "NONE"); - capturedPropertySources - .addFirst(new MapPropertySource(REFRESH_ARGS_PROPERTY_SOURCE, map)); + capturedPropertySources.addFirst(new MapPropertySource(REFRESH_ARGS_PROPERTY_SOURCE, map)); return environment; } - private Map changes(Map before, - Map after) { + private Map changes(Map before, Map after) { Map result = new HashMap(); for (String key : before.keySet()) { if (!after.containsKey(key)) { @@ -177,8 +169,7 @@ public abstract class ContextRefresher { if (parent instanceof CompositePropertySource) { try { List> sources = new ArrayList>(); - for (PropertySource source : ((CompositePropertySource) parent) - .getPropertySources()) { + for (PropertySource source : ((CompositePropertySource) parent).getPropertySources()) { sources.add(0, source); } for (PropertySource source : sources) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java index a38e0f60..c9980712 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java @@ -37,8 +37,7 @@ import static org.springframework.cloud.util.PropertyUtils.BOOTSTRAP_ENABLED_PRO */ public class LegacyContextRefresher extends ContextRefresher { - public LegacyContextRefresher(ConfigurableApplicationContext context, - RefreshScope scope) { + public LegacyContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) { super(context, scope); } @@ -50,23 +49,19 @@ public class LegacyContextRefresher extends ContextRefresher { /* For testing. */ ConfigurableApplicationContext addConfigFilesToEnvironment() { ConfigurableApplicationContext capture = null; try { - StandardEnvironment environment = copyEnvironment( - getContext().getEnvironment()); + StandardEnvironment environment = copyEnvironment(getContext().getEnvironment()); SpringApplicationBuilder builder = new SpringApplicationBuilder(Empty.class) - .properties(BOOTSTRAP_ENABLED_PROPERTY + "=true") - .bannerMode(Banner.Mode.OFF).web(WebApplicationType.NONE) - .environment(environment); + .properties(BOOTSTRAP_ENABLED_PROPERTY + "=true").bannerMode(Banner.Mode.OFF) + .web(WebApplicationType.NONE).environment(environment); // Just the listeners that affect the environment (e.g. excluding logging // listener because it has side effects) - builder.application() - .setListeners(Arrays.asList(new BootstrapApplicationListener(), - new BootstrapConfigFileApplicationListener())); + builder.application().setListeners( + Arrays.asList(new BootstrapApplicationListener(), new BootstrapConfigFileApplicationListener())); capture = builder.run(); if (environment.getPropertySources().contains(REFRESH_ARGS_PROPERTY_SOURCE)) { environment.getPropertySources().remove(REFRESH_ARGS_PROPERTY_SOURCE); } - MutablePropertySources target = getContext().getEnvironment() - .getPropertySources(); + MutablePropertySources target = getContext().getEnvironment().getPropertySources(); String targetName = null; for (PropertySource source : environment.getPropertySources()) { String name = source.getName(); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java index 8f049b5c..345e53ca 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java @@ -176,12 +176,10 @@ public class RestartEndpoint implements ApplicationListener { + class PostProcessorInitializer implements ApplicationContextInitializer { @Override public void initialize(GenericApplicationContext context) { @@ -193,8 +191,7 @@ public class RestartEndpoint implements ApplicationListener objectFactory) { - BeanLifecycleWrapper value = this.cache.put(name, - new BeanLifecycleWrapper(name, objectFactory)); + BeanLifecycleWrapper value = this.cache.put(name, new BeanLifecycleWrapper(name, objectFactory)); this.locks.putIfAbsent(name, new ReentrantReadWriteLock()); try { return value.getBean(); @@ -230,8 +228,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, return parser.parseExpression(input); } catch (ParseException e) { - throw new IllegalArgumentException("Cannot parse expression: " + input, - e); + throw new IllegalArgumentException("Cannot parse expression: " + input, e); } } @@ -241,24 +238,21 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, } @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) - throws BeansException { + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { this.beanFactory = beanFactory; beanFactory.registerScope(this.name, this); setSerializationId(beanFactory); } @Override - public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) - throws BeansException { + public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { for (String name : registry.getBeanDefinitionNames()) { BeanDefinition definition = registry.getBeanDefinition(name); if (definition instanceof RootBeanDefinition) { RootBeanDefinition root = (RootBeanDefinition) definition; if (root.getDecoratedDefinition() != null && root.hasBeanClass() && root.getBeanClass() == ScopedProxyFactoryBean.class) { - if (getName().equals(root.getDecoratedDefinition().getBeanDefinition() - .getScope())) { + if (getName().equals(root.getDecoratedDefinition().getBeanDefinition().getScope())) { root.setBeanClass(LockedScopedProxyFactoryBean.class); root.getConstructorArgumentValues().addGenericArgumentValue(this); // surprising that a scoped proxy bean definition is not already @@ -284,8 +278,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, String id = this.id; if (id == null) { - List list = new ArrayList<>( - Arrays.asList(beanFactory.getBeanDefinitionNames())); + List list = new ArrayList<>(Arrays.asList(beanFactory.getBeanDefinitionNames())); Collections.sort(list); String names = list.toString(); logger.debug("Generating bean factory id from names: " + names); @@ -298,8 +291,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, } else { logger.warn( - "BeanFactory was not a DefaultListableBeanFactory, scoped proxy beans " - + "cannot be serialized."); + "BeanFactory was not a DefaultListableBeanFactory, scoped proxy beans " + "cannot be serialized."); } } @@ -446,8 +438,8 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, * @param - a generic scope extension */ @SuppressWarnings("serial") - public static class LockedScopedProxyFactoryBean - extends ScopedProxyFactoryBean implements MethodInterceptor { + public static class LockedScopedProxyFactoryBean extends ScopedProxyFactoryBean + implements MethodInterceptor { private final S scope; @@ -477,8 +469,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, public Object invoke(MethodInvocation invocation) throws Throwable { Method method = invocation.getMethod(); if (AopUtils.isEqualsMethod(method) || AopUtils.isToStringMethod(method) - || AopUtils.isHashCodeMethod(method) - || isScopedObjectGetTargetObject(method)) { + || AopUtils.isHashCodeMethod(method) || isScopedObjectGetTargetObject(method)) { return invocation.proceed(); } Object proxy = getObject(); @@ -496,8 +487,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, if (proxy instanceof Advised) { Advised advised = (Advised) proxy; ReflectionUtils.makeAccessible(method); - return ReflectionUtils.invokeMethod(method, - advised.getTargetSource().getTarget(), + return ReflectionUtils.invokeMethod(method, advised.getTargetSource().getTarget(), invocation.getArguments()); } return invocation.proceed(); @@ -513,8 +503,7 @@ public class GenericScope implements Scope, BeanFactoryPostProcessor, } private boolean isScopedObjectGetTargetObject(Method method) { - return method.getDeclaringClass().equals(ScopedObject.class) - && method.getName().equals("getTargetObject") + return method.getDeclaringClass().equals(ScopedObject.class) && method.getName().equals("getTargetObject") && method.getParameterTypes().length == 0; } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java index 052db459..42c4b451 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/scope/refresh/RefreshScope.java @@ -64,8 +64,8 @@ import org.springframework.jmx.export.annotation.ManagedResource; * */ @ManagedResource -public class RefreshScope extends GenericScope implements ApplicationContextAware, - ApplicationListener, Ordered { +public class RefreshScope extends GenericScope + implements ApplicationContextAware, ApplicationListener, Ordered { private ApplicationContext context; @@ -101,8 +101,7 @@ public class RefreshScope extends GenericScope implements ApplicationContextAwar } @Override - public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) - throws BeansException { + public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { this.registry = registry; super.postProcessBeanDefinitionRegistry(registry); } @@ -113,8 +112,7 @@ public class RefreshScope extends GenericScope implements ApplicationContextAwar } public void start(ContextRefreshedEvent event) { - if (event.getApplicationContext() == this.context && this.eager - && this.registry != null) { + if (event.getApplicationContext() == this.context && this.eager && this.registry != null) { eagerlyInitialize(); } } @@ -122,8 +120,7 @@ public class RefreshScope extends GenericScope implements ApplicationContextAwar private void eagerlyInitialize() { for (String name : this.context.getBeanDefinitionNames()) { BeanDefinition definition = this.registry.getBeanDefinition(name); - if (this.getName().equals(definition.getScope()) - && !definition.isLazyInit()) { + if (this.getName().equals(definition.getScope()) && !definition.isLazyInit()) { Object bean = this.context.getBean(name); if (bean != null) { bean.getClass(); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/env/EnvironmentUtils.java b/spring-cloud-context/src/main/java/org/springframework/cloud/env/EnvironmentUtils.java index 9470969a..7ec952b8 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/env/EnvironmentUtils.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/env/EnvironmentUtils.java @@ -32,10 +32,8 @@ public final class EnvironmentUtils { throw new IllegalStateException("Can't instantiate a utility class"); } - public static Map getSubProperties(Environment environment, - String keyPrefix) { - return Binder.get(environment) - .bind(keyPrefix, Bindable.mapOf(String.class, String.class)) + public static Map getSubProperties(Environment environment, String keyPrefix) { + return Binder.get(environment).bind(keyPrefix, Bindable.mapOf(String.class, String.class)) .orElseGet(Collections::emptyMap); } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/health/RefreshScopeHealthIndicator.java b/spring-cloud-context/src/main/java/org/springframework/cloud/health/RefreshScopeHealthIndicator.java index 6e803d8d..1b3b60c3 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/health/RefreshScopeHealthIndicator.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/health/RefreshScopeHealthIndicator.java @@ -38,8 +38,7 @@ public class RefreshScopeHealthIndicator extends AbstractHealthIndicator { private ConfigurationPropertiesRebinder rebinder; - public RefreshScopeHealthIndicator(ObjectProvider scope, - ConfigurationPropertiesRebinder rebinder) { + public RefreshScopeHealthIndicator(ObjectProvider scope, ConfigurationPropertiesRebinder rebinder) { this.scope = scope; this.rebinder = rebinder; } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java b/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java index 3ab82fac..6250a0bb 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/logging/LoggingRebinder.java @@ -41,11 +41,9 @@ import org.springframework.core.env.Environment; * @author Olga Maciaszek-Sharma * */ -public class LoggingRebinder - implements ApplicationListener, EnvironmentAware { +public class LoggingRebinder implements ApplicationListener, EnvironmentAware { - private static final Bindable> STRING_STRING_MAP = Bindable - .mapOf(String.class, String.class); + private static final Bindable> STRING_STRING_MAP = Bindable.mapOf(String.class, String.class); private final Log logger = LogFactory.getLog(getClass()); @@ -66,16 +64,14 @@ public class LoggingRebinder } protected void setLogLevels(LoggingSystem system, Environment environment) { - Map levels = Binder.get(environment) - .bind("logging.level", STRING_STRING_MAP) + Map levels = Binder.get(environment).bind("logging.level", STRING_STRING_MAP) .orElseGet(Collections::emptyMap); for (Entry entry : levels.entrySet()) { setLogLevel(system, environment, entry.getKey(), entry.getValue().toString()); } } - private void setLogLevel(LoggingSystem system, Environment environment, String name, - String level) { + private void setLogLevel(LoggingSystem system, Environment environment, String name, String level) { try { if (name.equalsIgnoreCase("root")) { name = null; diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java index 1565057a..a2fedcae 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/PropertyUtils.java @@ -56,13 +56,11 @@ public abstract class PropertyUtils { } public static boolean bootstrapEnabled(Environment environment) { - return environment.getProperty(BOOTSTRAP_ENABLED_PROPERTY, Boolean.class, false) - || MARKER_CLASS_EXISTS; + return environment.getProperty(BOOTSTRAP_ENABLED_PROPERTY, Boolean.class, false) || MARKER_CLASS_EXISTS; } public static boolean useLegacyProcessing(Environment environment) { - return environment.getProperty(USE_LEGACY_PROCESSING_PROPERTY, Boolean.class, - false); + return environment.getProperty(USE_LEGACY_PROCESSING_PROPERTY, Boolean.class, false); } } diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java index 351f21d0..bbb60d05 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java @@ -38,8 +38,7 @@ public class CachedRandomPropertySource extends PropertySource { } - CachedRandomPropertySource(PropertySource randomValuePropertySource, - Map> cache) { + CachedRandomPropertySource(PropertySource randomValuePropertySource, Map> cache) { super(NAME, randomValuePropertySource); this.cache = cache; } @@ -78,8 +77,7 @@ public class CachedRandomPropertySource extends PropertySource { } return randomValueCache.computeIfAbsent(type, (theType) -> { if (logger.isDebugEnabled()) { - logger.debug( - "No random value found in cache for key and value, generating a new value"); + logger.debug("No random value found in cache for key and value, generating a new value"); } return getSource().getProperty("random." + type); }); diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySourceAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySourceAutoConfiguration.java index b18fb692..aeb3dc91 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySourceAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySourceAutoConfiguration.java @@ -37,8 +37,7 @@ public class CachedRandomPropertySourceAutoConfiguration { @PostConstruct public void initialize() { MutablePropertySources propertySources = environment.getPropertySources(); - PropertySource propertySource = propertySources - .get(RandomValuePropertySource.RANDOM_PROPERTY_SOURCE_NAME); + PropertySource propertySource = propertySources.get(RandomValuePropertySource.RANDOM_PROPERTY_SOURCE_NAME); if (propertySource != null) { propertySources.addLast(new CachedRandomPropertySource(propertySource)); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java index d3fa0ffb..b995d724 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java @@ -37,35 +37,29 @@ import static org.assertj.core.api.BDDAssertions.then; // TODO: super slow. Port to @SpringBootTest public class LifecycleMvcAutoConfigurationTests { - private static ConfigurableApplicationContext getApplicationContext( - Class configuration, String... properties) { + private static ConfigurableApplicationContext getApplicationContext(Class configuration, String... properties) { List defaultProperties = Lists.newArrayList(properties); defaultProperties.add("server.port=0"); defaultProperties.add("spring.jmx.default-domain=${random.uuid}"); - return new SpringApplicationBuilder(configuration) - .properties(defaultProperties.toArray(new String[] {})).run(); + return new SpringApplicationBuilder(configuration).properties(defaultProperties.toArray(new String[] {})).run(); } @Test public void environmentWebEndpointExtensionDisabled() { - beanNotCreated("writableEnvironmentEndpointWebExtension", - "management.endpoint.env.enabled=false"); + beanNotCreated("writableEnvironmentEndpointWebExtension", "management.endpoint.env.enabled=false"); } @Test public void environmentWebEndpointExtensionGloballyDisabled() { - beanNotCreated("writableEnvironmentEndpointWebExtension", - "management.endpoints.enabled-by-default=false"); + beanNotCreated("writableEnvironmentEndpointWebExtension", "management.endpoints.enabled-by-default=false"); } @Test public void environmentWebEndpointExtensionEnabled() { - beanCreated("writableEnvironmentEndpointWebExtension", - "management.endpoint.env.enabled=true", - "management.endpoint.env.post.enabled=true", - "management.endpoints.web.exposure.include=env"); + beanCreated("writableEnvironmentEndpointWebExtension", "management.endpoint.env.enabled=true", + "management.endpoint.env.post.enabled=true", "management.endpoints.web.exposure.include=env"); } // restartEndpoint @@ -81,9 +75,8 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void restartEndpointEnabled() { - beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class, - RestartEndpoint::restart, "management.endpoint.restart.enabled=true", - "management.endpoints.web.exposure.include=restart"); + beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class, RestartEndpoint::restart, + "management.endpoint.restart.enabled=true", "management.endpoints.web.exposure.include=restart"); } // pauseEndpoint @@ -105,26 +98,22 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void pauseEndpointEnabled() { - beanCreatedAndEndpointEnabled("pauseEndpoint", - RestartEndpoint.PauseEndpoint.class, RestartEndpoint.PauseEndpoint::pause, - "management.endpoint.restart.enabled=true", - "management.endpoints.web.exposure.include=restart,pause", - "management.endpoint.pause.enabled=true"); + beanCreatedAndEndpointEnabled("pauseEndpoint", RestartEndpoint.PauseEndpoint.class, + RestartEndpoint.PauseEndpoint::pause, "management.endpoint.restart.enabled=true", + "management.endpoints.web.exposure.include=restart,pause", "management.endpoint.pause.enabled=true"); } // resumeEndpoint @Test public void resumeEndpointDisabled() { beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=true", - "management.endpoints.web.exposure.include=restart", - "management.endpoint.resume.enabled=false"); + "management.endpoints.web.exposure.include=restart", "management.endpoint.resume.enabled=false"); } @Test public void resumeEndpointRestartDisabled() { beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=false", - "management.endpoints.web.exposure.include=resume", - "management.endpoint.resume.enabled=true"); + "management.endpoints.web.exposure.include=resume", "management.endpoint.resume.enabled=true"); } @Test @@ -134,37 +123,28 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void resumeEndpointEnabled() { - beanCreatedAndEndpointEnabled("resumeEndpoint", - RestartEndpoint.ResumeEndpoint.class, - RestartEndpoint.ResumeEndpoint::resume, - "management.endpoint.restart.enabled=true", - "management.endpoint.resume.enabled=true", - "management.endpoints.web.exposure.include=restart,resume"); + beanCreatedAndEndpointEnabled("resumeEndpoint", RestartEndpoint.ResumeEndpoint.class, + RestartEndpoint.ResumeEndpoint::resume, "management.endpoint.restart.enabled=true", + "management.endpoint.resume.enabled=true", "management.endpoints.web.exposure.include=restart,resume"); } private void beanNotCreated(String beanName, String... contextProperties) { - try (ConfigurableApplicationContext context = getApplicationContext(Config.class, - contextProperties)) { - then(context.containsBeanDefinition(beanName)) - .as("%s bean was created", beanName).isFalse(); + try (ConfigurableApplicationContext context = getApplicationContext(Config.class, contextProperties)) { + then(context.containsBeanDefinition(beanName)).as("%s bean was created", beanName).isFalse(); } } private void beanCreated(String beanName, String... contextProperties) { - try (ConfigurableApplicationContext context = getApplicationContext(Config.class, - contextProperties)) { - then(context.containsBeanDefinition(beanName)) - .as("%s bean was not created", beanName).isTrue(); + try (ConfigurableApplicationContext context = getApplicationContext(Config.class, contextProperties)) { + then(context.containsBeanDefinition(beanName)).as("%s bean was not created", beanName).isTrue(); } } @SuppressWarnings("unchecked") - private void beanCreatedAndEndpointEnabled(String beanName, Class type, - Function function, String... properties) { - try (ConfigurableApplicationContext context = getApplicationContext(Config.class, - properties)) { - then(context.containsBeanDefinition(beanName)) - .as("%s bean was not created", beanName).isTrue(); + private void beanCreatedAndEndpointEnabled(String beanName, Class type, Function function, + String... properties) { + try (ConfigurableApplicationContext context = getApplicationContext(Config.class, properties)) { + then(context.containsBeanDefinition(beanName)).as("%s bean was not created", beanName).isTrue(); Object endpoint = context.getBean(beanName, type); Object result = function.apply((T) endpoint); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java index 43c7d1e9..0ae9196c 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java @@ -34,24 +34,19 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Spencer Gibb */ @RunWith(ModifiedClassPathRunner.class) -@ClassPathExclusions({ "spring-boot-actuator-*.jar", - "spring-boot-starter-actuator-*.jar" }) +@ClassPathExclusions({ "spring-boot-actuator-*.jar", "spring-boot-starter-actuator-*.jar" }) public class RefreshAutoConfigurationClassPathTests { - private static ConfigurableApplicationContext getApplicationContext( - Class configuration, String... properties) { - return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE) - .properties(properties).run(); + private static ConfigurableApplicationContext getApplicationContext(Class configuration, String... properties) { + return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE).properties(properties).run(); } @Test public void refreshEventListenerCreated() { - try (ConfigurableApplicationContext context = getApplicationContext( - Config.class)) { - then(context.getBeansOfType(RefreshEventListener.class)) - .as("RefreshEventListeners not created").isNotEmpty(); - then(context.containsBean("refreshEndpoint")).as("refreshEndpoint created") - .isFalse(); + try (ConfigurableApplicationContext context = getApplicationContext(Config.class)) { + then(context.getBeansOfType(RefreshEventListener.class)).as("RefreshEventListeners not created") + .isNotEmpty(); + then(context.containsBean("refreshEndpoint")).as("refreshEndpoint created").isFalse(); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java index 50f61205..70492ba8 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationMoreClassPathTests.java @@ -35,26 +35,23 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Spencer Gibb */ @RunWith(ModifiedClassPathRunner.class) -@ClassPathExclusions({ "spring-boot-actuator-autoconfigure-*.jar", - "spring-boot-starter-actuator-*.jar" }) +@ClassPathExclusions({ "spring-boot-actuator-autoconfigure-*.jar", "spring-boot-starter-actuator-*.jar" }) public class RefreshAutoConfigurationMoreClassPathTests { @Rule public OutputCaptureRule outputCapture = new OutputCaptureRule(); - private static ConfigurableApplicationContext getApplicationContext( - Class configuration, String... properties) { - return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE) - .properties(properties).run(); + private static ConfigurableApplicationContext getApplicationContext(Class configuration, String... properties) { + return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE).properties(properties).run(); } @Test public void unknownClassProtected() { - try (ConfigurableApplicationContext context = getApplicationContext(Config.class, - "debug=true")) { + try (ConfigurableApplicationContext context = getApplicationContext(Config.class, "debug=true")) { String output = this.outputCapture.toString(); - then(output).doesNotContain("Failed to introspect annotations on " - + "[class org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration") + then(output) + .doesNotContain("Failed to introspect annotations on " + + "[class org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration") .doesNotContain("TypeNotPresentExceptionProxy"); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java index 14ffc567..e7b4f30d 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java @@ -43,16 +43,15 @@ public class RefreshAutoConfigurationTests { @Rule public OutputCaptureRule output = new OutputCaptureRule(); - private static ConfigurableApplicationContext getApplicationContext( - WebApplicationType type, Class configuration, String... properties) { - return new SpringApplicationBuilder(configuration).web(type) - .properties(properties).properties("server.port=0").run(); + private static ConfigurableApplicationContext getApplicationContext(WebApplicationType type, Class configuration, + String... properties) { + return new SpringApplicationBuilder(configuration).web(type).properties(properties).properties("server.port=0") + .run(); } @Test public void noWarnings() { - try (ConfigurableApplicationContext context = getApplicationContext( - WebApplicationType.NONE, Config.class)) { + try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class)) { then(context.containsBean("refreshScope")).isTrue(); then(this.output.toString()).doesNotContain("WARN"); } @@ -60,8 +59,7 @@ public class RefreshAutoConfigurationTests { @Test public void disabled() { - try (ConfigurableApplicationContext context = getApplicationContext( - WebApplicationType.SERVLET, Config.class, + try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.SERVLET, Config.class, "spring.cloud.refresh.enabled:false")) { then(context.containsBean("refreshScope")).isFalse(); } @@ -69,10 +67,8 @@ public class RefreshAutoConfigurationTests { @Test public void refreshables() { - try (ConfigurableApplicationContext context = getApplicationContext( - WebApplicationType.NONE, Config.class, "config.foo=bar", - "spring.cloud.refresh.refreshable:" - + SealedConfigProps.class.getName())) { + try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class, + "config.foo=bar", "spring.cloud.refresh.refreshable:" + SealedConfigProps.class.getName())) { context.getBean(SealedConfigProps.class); context.getBean(ContextRefresher.class).refresh(); } @@ -80,10 +76,9 @@ public class RefreshAutoConfigurationTests { @Test public void extraRefreshables() { - try (ConfigurableApplicationContext context = getApplicationContext( - WebApplicationType.NONE, Config.class, "sealedconfig.foo=bar", - "spring.cloud.refresh.extra-refreshable:" - + SealedConfigProps.class.getName())) { + try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class, + "sealedconfig.foo=bar", + "spring.cloud.refresh.extra-refreshable:" + SealedConfigProps.class.getName())) { context.getBean(SealedConfigProps.class); context.getBean(ContextRefresher.class).refresh(); } @@ -91,15 +86,12 @@ public class RefreshAutoConfigurationTests { @Test public void neverRefreshable() { - try (ConfigurableApplicationContext context = getApplicationContext( - WebApplicationType.NONE, Config.class, "countingconfig.foo=bar", - "spring.cloud.refresh.never-refreshable:" - + CountingConfigProps.class.getName())) { + try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class, + "countingconfig.foo=bar", + "spring.cloud.refresh.never-refreshable:" + CountingConfigProps.class.getName())) { CountingConfigProps configProps = context.getBean(CountingConfigProps.class); context.getBean(ContextRefresher.class).refresh(); - assertThat(configProps.count) - .as("config props was rebound when it should not have been") - .hasValue(1); + assertThat(configProps.count).as("config props was rebound when it should not have been").hasValue(1); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java index 521ad786..e5afe584 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java @@ -30,8 +30,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, - properties = "spring.cloud.bootstrap.enabled:false") +@SpringBootTest(classes = Application.class, properties = "spring.cloud.bootstrap.enabled:false") public class BootstrapDisabledAutoConfigurationIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java index 853465bc..e594156e 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingAutoConfigurationIntegrationTests.java @@ -31,8 +31,8 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, properties = { "encrypt.key:deadbeef", - "spring.config.use-legacy-processing=true" }) +@SpringBootTest(classes = Application.class, + properties = { "encrypt.key:deadbeef", "spring.config.use-legacy-processing=true" }) @ActiveProfiles("encrypt") public class BootstrapOrderingAutoConfigurationIntegrationTests { @@ -41,9 +41,8 @@ public class BootstrapOrderingAutoConfigurationIntegrationTests { @Test public void bootstrapPropertiesExist() { - then(this.environment.getPropertySources() - .contains("applicationConfig: [classpath:/bootstrap.properties]")) - .isTrue(); + then(this.environment.getPropertySources().contains("applicationConfig: [classpath:/bootstrap.properties]")) + .isTrue(); } @Test diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests.java index b43143e4..fe9a5a4e 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests.java @@ -42,8 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class, - properties = { "spring.config.use-legacy-processing=true", - "spring.cloud.bootstrap.name:ordering" }) + properties = { "spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name:ordering" }) public class BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests { @Autowired @@ -52,12 +51,9 @@ public class BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests { @Test public void orderingIsCorrect() { MutablePropertySources propertySources = environment.getPropertySources(); - PropertySource test1 = propertySources - .get("bootstrapProperties-testBootstrap1"); - PropertySource test2 = propertySources - .get("bootstrapProperties-testBootstrap2"); - PropertySource test3 = propertySources - .get("bootstrapProperties-testBootstrap3"); + PropertySource test1 = propertySources.get("bootstrapProperties-testBootstrap1"); + PropertySource test2 = propertySources.get("bootstrapProperties-testBootstrap2"); + PropertySource test3 = propertySources.get("bootstrapProperties-testBootstrap3"); int index1 = propertySources.precedenceOf(test1); int index2 = propertySources.precedenceOf(test2); int index3 = propertySources.precedenceOf(test3); @@ -83,10 +79,8 @@ public class BootstrapOrderingCustomOverrideSystemPropertiesIntegrationTests { @Override public Collection> locateCollection(Environment environment) { ArrayList> sources = new ArrayList<>(); - sources.add(new MapPropertySource("testBootstrap1", - singletonMap("key1", "value1"))); - sources.add(new MapPropertySource("testBootstrap2", - singletonMap("key2", "value2"))); + sources.add(new MapPropertySource("testBootstrap1", singletonMap("key1", "value1"))); + sources.add(new MapPropertySource("testBootstrap2", singletonMap("key2", "value2"))); Map map = new HashMap<>(); map.put("key3", "value3"); map.put("spring.cloud.config.override-system-properties", "false"); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java index 8ed46ff3..c29b7296 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java @@ -39,9 +39,8 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, - properties = { "encrypt.key:deadbeef", "spring.cloud.bootstrap.name:custom", - "spring.config.use-legacy-processing=true" }) +@SpringBootTest(classes = Application.class, properties = { "encrypt.key:deadbeef", + "spring.cloud.bootstrap.name:custom", "spring.config.use-legacy-processing=true" }) @ActiveProfiles("encrypt") public class BootstrapOrderingCustomPropertySourceIntegrationTests { @@ -50,8 +49,8 @@ public class BootstrapOrderingCustomPropertySourceIntegrationTests { @Test public void bootstrapPropertiesExist() { - then(this.environment.getPropertySources() - .contains("applicationConfig: [classpath:/custom.properties]")).isTrue(); + then(this.environment.getPropertySources().contains("applicationConfig: [classpath:/custom.properties]")) + .isTrue(); } @Test @@ -69,9 +68,8 @@ public class BootstrapOrderingCustomPropertySourceIntegrationTests { // This is added to bootstrap context as a source in bootstrap.properties protected static class PropertySourceConfiguration implements PropertySourceLocator { - public static Map MAP = new HashMap( - Collections.singletonMap("custom.foo", - "{cipher}6154ca04d4bb6144d672c4e3d750b5147116dd381946d51fa44f8bc25dc256f4")); + public static Map MAP = new HashMap(Collections.singletonMap( + "custom.foo", "{cipher}6154ca04d4bb6144d672c4e3d750b5147116dd381946d51fa44f8bc25dc256f4")); @Override public PropertySource locate(Environment environment) { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java index 8cf93230..1cdd4ac7 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java @@ -32,8 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, - properties = "spring.cloud.bootstrap.name:json") +@SpringBootTest(classes = Application.class, properties = "spring.cloud.bootstrap.name:json") public class BootstrapOrderingSpringApplicationJsonIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java index 3f939362..6ff2f885 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapSourcesOrderingTests.java @@ -29,8 +29,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.springframework.cloud.bootstrap.TestHigherPriorityBootstrapConfiguration.firstToBeCreated; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, - properties = "spring.config.use-legacy-processing=true") +@SpringBootTest(classes = Application.class, properties = "spring.config.use-legacy-processing=true") public class BootstrapSourcesOrderingTests { @Test diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java index 28cdc9e6..168f3b01 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java @@ -45,8 +45,7 @@ public class MessageSourceConfigurationTests { @Test public void loadsMessage() { - then(this.messageSource.getMessage("hello.message", null, Locale.getDefault())) - .isEqualTo("Hello World!"); + then(this.messageSource.getMessage("hello.message", null, Locale.getDefault())).isEqualTo("Hello World!"); } @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java index bd4c45dc..adb66060 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestBootstrapConfiguration.java @@ -48,8 +48,7 @@ public class TestBootstrapConfiguration { @Bean @Qualifier("foo-during-bootstrap") - public String fooDuringBootstrap(ConfigurableEnvironment environment, - ApplicationEventPublisher publisher) { + public String fooDuringBootstrap(ConfigurableEnvironment environment, ApplicationEventPublisher publisher) { String property = environment.getProperty("test.bootstrap.foo", "undefined"); if (fooSightings != null) { @@ -66,11 +65,9 @@ public class TestBootstrapConfiguration { @Override public void initialize(ConfigurableApplicationContext applicationContext) { ConfigurableEnvironment environment = applicationContext.getEnvironment(); - environment.getPropertySources() - .addLast(new MapPropertySource("customProperties", - Collections.singletonMap("custom.foo", - environment.resolvePlaceholders( - "${spring.application.name:bar}")))); + environment.getPropertySources().addLast( + new MapPropertySource("customProperties", Collections.singletonMap("custom.foo", + environment.resolvePlaceholders("${spring.application.name:bar}")))); } }; diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestHigherPriorityBootstrapConfiguration.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestHigherPriorityBootstrapConfiguration.java index a72de8d7..40e9626e 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestHigherPriorityBootstrapConfiguration.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/TestHigherPriorityBootstrapConfiguration.java @@ -33,8 +33,7 @@ public class TestHigherPriorityBootstrapConfiguration { public TestHigherPriorityBootstrapConfiguration() { count.incrementAndGet(); - firstToBeCreated.compareAndSet(null, - TestHigherPriorityBootstrapConfiguration.class); + firstToBeCreated.compareAndSet(null, TestHigherPriorityBootstrapConfiguration.class); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index cba7e015..1194f78c 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -82,57 +82,46 @@ public class BootstrapConfigurationTests { public void pickupOnlyExternalBootstrapProperties() { String externalPropertiesPath = getExternalProperties(); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(BareConfiguration.class) + this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class) .properties("spring.cloud.bootstrap.location=" + externalPropertiesPath, "spring.config.use-legacy-processing=true") .run(); - then(this.context.getEnvironment().getProperty("info.name")) - .isEqualTo("externalPropertiesInfoName"); + then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); then(this.context.getEnvironment().getProperty("info.desc")).isNull(); - then(this.context.getEnvironment().getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + then(this.context.getEnvironment().getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); } @Test public void pickupAdditionalExternalBootstrapProperties() { String externalPropertiesPath = getExternalProperties(); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(BareConfiguration.class) - .properties( - "spring.cloud.bootstrap.additional-location=" - + externalPropertiesPath, + this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class) + .properties("spring.cloud.bootstrap.additional-location=" + externalPropertiesPath, "spring.config.use-legacy-processing=true") .run(); - then(this.context.getEnvironment().getProperty("info.name")) - .isEqualTo("externalPropertiesInfoName"); - then(this.context.getEnvironment().getProperty("info.desc")) - .isEqualTo("defaultPropertiesInfoDesc"); - then(this.context.getEnvironment().getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName"); + then(this.context.getEnvironment().getProperty("info.desc")).isEqualTo("defaultPropertiesInfoDesc"); + then(this.context.getEnvironment().getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); } @Test public void bootstrapPropertiesAvailableInInitializer() { this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).initializers( - new ApplicationContextInitializer() { - @Override - public void initialize( - ConfigurableApplicationContext applicationContext) { - // This property is defined in bootstrap.properties - then(applicationContext.getEnvironment() - .getProperty("info.name")).isEqualTo("child"); - } - }) - .run(); - then(this.context.getEnvironment().getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class) + .initializers(new ApplicationContextInitializer() { + @Override + public void initialize(ConfigurableApplicationContext applicationContext) { + // This property is defined in bootstrap.properties + then(applicationContext.getEnvironment().getProperty("info.name")).isEqualTo("child"); + } + }).run(); + then(this.context.getEnvironment().getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); } /** @@ -149,12 +138,11 @@ public class BootstrapConfigurationTests { public void picksUpAdditionalPropertySource() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getEnvironment().getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + then(this.context.getEnvironment().getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); } @Test @@ -162,8 +150,7 @@ public class BootstrapConfigurationTests { System.setProperty("expected.fail", "true"); this.expected.expectMessage("Planned"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); } @Test @@ -171,52 +158,43 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); System.setProperty("bootstrap.foo", "system"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); } @Test public void systemPropertyOverrideFalse() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - PropertySourceConfiguration.MAP - .put("spring.cloud.config.overrideSystemProperties", "false"); + PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false"); System.setProperty("bootstrap.foo", "system"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")) - .isEqualTo("system"); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); + then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); } @Test public void systemPropertyOverrideWhenOverrideDisallowed() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - PropertySourceConfiguration.MAP - .put("spring.cloud.config.overrideSystemProperties", "false"); + PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false"); // If spring.cloud.config.allowOverride=false is in the remote property sources // with sufficiently high priority it always wins. Admins can enforce it by adding // their own remote property source. PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "false"); System.setProperty("bootstrap.foo", "system"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); } @Test public void systemPropertyOverrideFalseWhenOverrideAllowed() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); - PropertySourceConfiguration.MAP - .put("spring.cloud.config.overrideSystemProperties", "false"); + PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false"); PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "true"); System.setProperty("bootstrap.foo", "system"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class).run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")) - .isEqualTo("system"); + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class).run(); + then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system"); } @Test @@ -225,68 +203,56 @@ public class BootstrapConfigurationTests { PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideNone", "true"); PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "true"); ConfigurableEnvironment environment = new StandardEnvironment(); - environment.getPropertySources().addLast(new MapPropertySource("last", - Collections.singletonMap("bootstrap.foo", "splat"))); + environment.getPropertySources().addLast( + new MapPropertySource("last", Collections.singletonMap("bootstrap.foo", "splat"))); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true") - .environment(environment).sources(BareConfiguration.class).run(); - then(this.context.getEnvironment().getProperty("bootstrap.foo")) - .isEqualTo("splat"); + .properties("spring.config.use-legacy-processing=true").environment(environment) + .sources(BareConfiguration.class).run(); + then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("splat"); } @Test public void applicationNameInBootstrapAndMain() { System.setProperty("expected.name", "main"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.cloud.bootstrap.name:other", - "spring.config.use-legacy-processing=true", - "spring.config.name:plain") + this.context = new SpringApplicationBuilder() + .web(WebApplicationType.NONE).properties("spring.cloud.bootstrap.name:other", + "spring.config.use-legacy-processing=true", "spring.config.name:plain") .sources(BareConfiguration.class).run(); - then(this.context.getEnvironment().getProperty("spring.application.name")) - .isEqualTo("app"); + then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("app"); // The parent is called "main" because spring.application.name is specified in // other.properties (the bootstrap properties) - then(this.context.getParent().getEnvironment() - .getProperty("spring.application.name")).isEqualTo("main"); + then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The bootstrap context has the same "bootstrap" property source - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()) - .getPropertySources().get("bootstrap")) - .isEqualTo(this.context.getEnvironment().getPropertySources() - .get("bootstrap")); + then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() + .get("bootstrap")).isEqualTo(this.context.getEnvironment().getPropertySources().get("bootstrap")); then(this.context.getId()).isEqualTo("main-1"); } @Test public void applicationNameNotInBootstrap() { System.setProperty("expected.name", "main"); - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.cloud.bootstrap.name:application", - "spring.config.use-legacy-processing=true", - "spring.config.name:other") + this.context = new SpringApplicationBuilder() + .web(WebApplicationType.NONE).properties("spring.cloud.bootstrap.name:application", + "spring.config.use-legacy-processing=true", "spring.config.name:other") .sources(BareConfiguration.class).run(); - then(this.context.getEnvironment().getProperty("spring.application.name")) - .isEqualTo("main"); + then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The parent has no name because spring.application.name is not // defined in the bootstrap properties - then(this.context.getParent().getEnvironment() - .getProperty("spring.application.name")).isEqualTo(null); + then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo(null); } @Test public void applicationNameOnlyInBootstrap() { System.setProperty("expected.name", "main"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.cloud.bootstrap.name:other", - "spring.config.use-legacy-processing=true") + .properties("spring.cloud.bootstrap.name:other", "spring.config.use-legacy-processing=true") .sources(BareConfiguration.class).run(); // The main context is called "main" because spring.application.name is specified // in other.properties (and not in the main config file) - then(this.context.getEnvironment().getProperty("spring.application.name")) - .isEqualTo("main"); + then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); // The parent is called "main" because spring.application.name is specified in // other.properties (the bootstrap properties this time) - then(this.context.getParent().getEnvironment() - .getProperty("spring.application.name")).isEqualTo("main"); + then(this.context.getParent().getEnvironment().getProperty("spring.application.name")).isEqualTo("main"); then(this.context.getId()).isEqualTo("main-1"); } @@ -294,17 +260,13 @@ public class BootstrapConfigurationTests { public void environmentEnrichedOnceWhenSharedWithChildContext() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true") - .environment(new StandardEnvironment()).child(BareConfiguration.class) - .web(WebApplicationType.NONE).run(); + .properties("spring.config.use-legacy-processing=true").environment(new StandardEnvironment()) + .child(BareConfiguration.class).web(WebApplicationType.NONE).run(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getParent().getEnvironment()) - .isEqualTo(this.context.getEnvironment()); - MutablePropertySources sources = this.context.getEnvironment() - .getPropertySources(); + then(this.context.getParent().getEnvironment()).isEqualTo(this.context.getEnvironment()); + MutablePropertySources sources = this.context.getEnvironment().getPropertySources(); PropertySource bootstrap = sources - .get(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap"); + .get(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap"); then(bootstrap).isNotNull(); then(sources.precedenceOf(bootstrap)).isEqualTo(0); } @@ -314,8 +276,8 @@ public class BootstrapConfigurationTests { TestHigherPriorityBootstrapConfiguration.count.set(0); PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true") - .child(BareConfiguration.class).web(WebApplicationType.NONE).run(); + .properties("spring.config.use-legacy-processing=true").child(BareConfiguration.class) + .web(WebApplicationType.NONE).run(); then(TestHigherPriorityBootstrapConfiguration.count.get()).isEqualTo(1); then(this.context.getParent()).isNotNull(); then(this.context.getParent().getParent().getId()).isEqualTo("bootstrap"); @@ -326,11 +288,10 @@ public class BootstrapConfigurationTests { @Test public void listOverride() { this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true") - .child(BareConfiguration.class).web(WebApplicationType.NONE).run(); + .properties("spring.config.use-legacy-processing=true").child(BareConfiguration.class) + .web(WebApplicationType.NONE).run(); ListProperties listProperties = new ListProperties(); - Binder.get(this.context.getEnvironment()).bind("list", - Bindable.ofInstance(listProperties)); + Binder.get(this.context.getEnvironment()).bind("list", Bindable.ofInstance(listProperties)); then(listProperties.getFoo().size()).isEqualTo(1); then(listProperties.getFoo().get(0)).isEqualTo("hello world"); } @@ -340,47 +301,38 @@ public class BootstrapConfigurationTests { TestHigherPriorityBootstrapConfiguration.count.set(0); PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); SpringApplicationBuilder builder = new SpringApplicationBuilder() - .properties("spring.config.use-legacy-processing=true") - .sources(BareConfiguration.class); - this.sibling = builder.child(BareConfiguration.class) - .properties("spring.application.name=sibling") + .properties("spring.config.use-legacy-processing=true").sources(BareConfiguration.class); + this.sibling = builder.child(BareConfiguration.class).properties("spring.application.name=sibling") .web(WebApplicationType.NONE).run(); - this.context = builder.child(BareConfiguration.class) - .properties("spring.application.name=context") + this.context = builder.child(BareConfiguration.class).properties("spring.application.name=context") .web(WebApplicationType.NONE).run(); then(TestHigherPriorityBootstrapConfiguration.count.get()).isEqualTo(1); then(this.context.getParent()).isNotNull(); then(this.context.getParent().getParent().getId()).isEqualTo("bootstrap"); then(this.context.getParent().getParent().getParent()).isNull(); - then(this.context.getEnvironment().getProperty("custom.foo")) - .isEqualTo("context"); - then(this.context.getEnvironment().getProperty("spring.application.name")) - .isEqualTo("context"); + then(this.context.getEnvironment().getProperty("custom.foo")).isEqualTo("context"); + then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("context"); then(this.sibling.getParent()).isNotNull(); then(this.sibling.getParent().getParent().getId()).isEqualTo("bootstrap"); then(this.sibling.getParent().getParent().getParent()).isNull(); - then(this.sibling.getEnvironment().getProperty("custom.foo")) - .isEqualTo("sibling"); - then(this.sibling.getEnvironment().getProperty("spring.application.name")) - .isEqualTo("sibling"); + then(this.sibling.getEnvironment().getProperty("custom.foo")).isEqualTo("sibling"); + then(this.sibling.getEnvironment().getProperty("spring.application.name")).isEqualTo("sibling"); } @Test public void environmentEnrichedInParentContext() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); this.context = new SpringApplicationBuilder().sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true") - .child(BareConfiguration.class).web(WebApplicationType.NONE).run(); + .properties("spring.config.use-legacy-processing=true").child(BareConfiguration.class) + .web(WebApplicationType.NONE).run(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); - then(this.context.getParent().getEnvironment()) - .isNotSameAs(this.context.getEnvironment()); - then(this.context.getEnvironment().getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()) - .getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment()); + then(this.context.getEnvironment().getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); + then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); } @Test @@ -388,32 +340,26 @@ public class BootstrapConfigurationTests { public void differentProfileInChild() { PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar"); // Profiles are always merged with the child - ConfigurableApplicationContext parent = new SpringApplicationBuilder() - .sources(BareConfiguration.class).profiles("parent") - .web(WebApplicationType.NONE).run(); + ConfigurableApplicationContext parent = new SpringApplicationBuilder().sources(BareConfiguration.class) + .profiles("parent").web(WebApplicationType.NONE).run(); this.context = new SpringApplicationBuilder(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true").profiles("child") - .parent(parent).web(WebApplicationType.NONE).run(); - then(this.context.getParent().getEnvironment()) - .isNotSameAs(this.context.getEnvironment()); + .properties("spring.config.use-legacy-processing=true").profiles("child").parent(parent) + .web(WebApplicationType.NONE).run(); + then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment()); // The ApplicationContext merges profiles (profiles and property sources), see // AbstractEnvironment.merge() then(this.context.getEnvironment().acceptsProfiles("child", "parent")).isTrue(); // But the parent is not a child - then(this.context.getParent().getEnvironment().acceptsProfiles("child")) - .isFalse(); - then(this.context.getParent().getEnvironment().acceptsProfiles("parent")) - .isTrue(); - then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()) - .getPropertySources().contains( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-testBootstrap")).isTrue(); + then(this.context.getParent().getEnvironment().acceptsProfiles("child")).isFalse(); + then(this.context.getParent().getEnvironment().acceptsProfiles("parent")).isTrue(); + then(((ConfigurableEnvironment) this.context.getParent().getEnvironment()).getPropertySources() + .contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap")) + .isTrue(); then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); // The "bootstrap" property source is not shared now, but it has the same // properties in it because they are pulled from the PropertySourceConfiguration // below - then(this.context.getParent().getEnvironment().getProperty("bootstrap.foo")) - .isEqualTo("bar"); + then(this.context.getParent().getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar"); // The parent property source is there in the child because they are both in the // "parent" profile (by virtue of the merge in AbstractEnvironment) then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("parent"); @@ -423,30 +369,24 @@ public class BootstrapConfigurationTests { public void includeProfileFromBootstrapPropertySource() { PropertySourceConfiguration.MAP.put("spring.profiles.include", "bar,baz"); this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .properties("spring.config.use-legacy-processing=true").profiles("foo") - .sources(BareConfiguration.class).run(); + .properties("spring.config.use-legacy-processing=true").profiles("foo").sources(BareConfiguration.class) + .run(); then(this.context.getEnvironment().acceptsProfiles("baz")).isTrue(); then(this.context.getEnvironment().acceptsProfiles("bar")).isTrue(); } @Test public void includeProfileFromBootstrapProperties() { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true", - "spring.cloud.bootstrap.name=local") - .run(); + this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class) + .properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name=local").run(); then(this.context.getEnvironment().acceptsProfiles("local")).isTrue(); - then(this.context.getEnvironment().getProperty("added")) - .isEqualTo("Hello added!"); + then(this.context.getEnvironment().getProperty("added")).isEqualTo("Hello added!"); } @Test public void nonEnumerablePropertySourceWorks() { - this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(BareConfiguration.class) - .properties("spring.config.use-legacy-processing=true", - "spring.cloud.bootstrap.name=nonenumerable") + this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class) + .properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name=nonenumerable") .run(); then(this.context.getEnvironment().getProperty("foo")).isEqualTo("bar"); } @@ -459,8 +399,7 @@ public class BootstrapConfigurationTests { @Configuration(proxyBeanMethods = false) // This is added to bootstrap context as a source in bootstrap.properties - protected static class SimplePropertySourceConfiguration - implements PropertySourceLocator { + protected static class SimplePropertySourceConfiguration implements PropertySourceLocator { @Override public PropertySource locate(Environment environment) { @@ -489,8 +428,7 @@ public class BootstrapConfigurationTests { @Override public PropertySource locate(Environment environment) { if (this.name != null) { - then(this.name) - .isEqualTo(environment.getProperty("spring.application.name")); + then(this.name).isEqualTo(environment.getProperty("spring.application.name")); } if (this.fail) { throw new RuntimeException("Planned"); @@ -519,8 +457,7 @@ public class BootstrapConfigurationTests { @Configuration @ConfigurationProperties("compositeexpected") // This is added to bootstrap context as a source in bootstrap.properties - protected static class CompositePropertySourceConfiguration - implements PropertySourceLocator { + protected static class CompositePropertySourceConfiguration implements PropertySourceLocator { public static Map MAP1 = new HashMap(); @@ -539,18 +476,14 @@ public class BootstrapConfigurationTests { @Override public PropertySource locate(Environment environment) { if (this.name != null) { - then(this.name) - .isEqualTo(environment.getProperty("spring.application.name")); + then(this.name).isEqualTo(environment.getProperty("spring.application.name")); } if (this.fail) { throw new RuntimeException("Planned"); } - CompositePropertySource compositePropertySource = new CompositePropertySource( - "listTestBootstrap"); - compositePropertySource.addFirstPropertySource( - new MapPropertySource("testBootstrap1", MAP1)); - compositePropertySource.addFirstPropertySource( - new MapPropertySource("testBootstrap2", MAP2)); + CompositePropertySource compositePropertySource = new CompositePropertySource("listTestBootstrap"); + compositePropertySource.addFirstPropertySource(new MapPropertySource("testBootstrap1", MAP1)); + compositePropertySource.addFirstPropertySource(new MapPropertySource("testBootstrap2", MAP2)); return compositePropertySource; } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java index f2b64acf..4f117164 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapListenerHierarchyIntegrationTests.java @@ -37,8 +37,8 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInABootstrapContext() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .properties("spring.config.use-legacy-processing=true") - .sources(BasicConfiguration.class).web(NONE).run(); + .properties("spring.config.use-legacy-processing=true").sources(BasicConfiguration.class).web(NONE) + .run(); then(context.getParent()).isNotNull(); } @@ -46,20 +46,17 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInOneBootstrapForABasicParentChildHierarchy() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .properties("spring.config.use-legacy-processing=true") - .sources(RootConfiguration.class).web(NONE) + .properties("spring.config.use-legacy-processing=true").sources(RootConfiguration.class).web(NONE) .child(BasicConfiguration.class).web(NONE).run(); // Should be RootConfiguration based context - ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context - .getParent(); + ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context.getParent(); then(parent.getBean("rootBean", String.class)).isEqualTo("rootBean"); // Parent should have the bootstrap context as parent then(parent.getParent()).isNotNull(); - ConfigurableApplicationContext bootstrapContext = (ConfigurableApplicationContext) parent - .getParent(); + ConfigurableApplicationContext bootstrapContext = (ConfigurableApplicationContext) parent.getParent(); // Bootstrap should be the root, there should be no other parent then(bootstrapContext.getParent()).isNull(); @@ -68,21 +65,17 @@ public class BootstrapListenerHierarchyIntegrationTests { @Test public void shouldAddInOneBootstrapForSiblingsBasedHierarchy() { ConfigurableApplicationContext context = new SpringApplicationBuilder() - .properties("spring.config.use-legacy-processing=true") - .sources(RootConfiguration.class).web(NONE) - .child(BasicConfiguration.class).web(NONE) - .sibling(BasicConfiguration.class).web(NONE).run(); + .properties("spring.config.use-legacy-processing=true").sources(RootConfiguration.class).web(NONE) + .child(BasicConfiguration.class).web(NONE).sibling(BasicConfiguration.class).web(NONE).run(); // Should be RootConfiguration based context - ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context - .getParent(); + ConfigurableApplicationContext parent = (ConfigurableApplicationContext) context.getParent(); then(parent.getBean("rootBean", String.class)).isEqualTo("rootBean"); // Parent should have the bootstrap context as parent then(parent.getParent()).isNotNull(); - ConfigurableApplicationContext bootstrapContext = (ConfigurableApplicationContext) parent - .getParent(); + ConfigurableApplicationContext bootstrapContext = (ConfigurableApplicationContext) parent.getParent(); // Bootstrap should be the root, there should be no other parent then(bootstrapContext.getParent()).isNull(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfigurationTests.java index a137b3de..83e2dd7b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfigurationTests.java @@ -30,9 +30,8 @@ public class EncryptionBootstrapConfigurationTests { @Test public void symmetric() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - EncryptionBootstrapConfiguration.class).web(WebApplicationType.NONE) - .properties("encrypt.key:pie").run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class) + .web(WebApplicationType.NONE).properties("encrypt.key:pie").run(); TextEncryptor encryptor = context.getBean(TextEncryptor.class); then(encryptor.decrypt(encryptor.encrypt("foo"))).isEqualTo("foo"); context.close(); @@ -40,14 +39,11 @@ public class EncryptionBootstrapConfigurationTests { @Test public void rsaKeyStore() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - EncryptionBootstrapConfiguration.class) - .web(WebApplicationType.NONE) - .properties("encrypt.keyStore.location:classpath:/server.jks", - "encrypt.keyStore.password:letmein", - "encrypt.keyStore.alias:mytestkey", - "encrypt.keyStore.secret:changeme") - .run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class) + .web(WebApplicationType.NONE) + .properties("encrypt.keyStore.location:classpath:/server.jks", "encrypt.keyStore.password:letmein", + "encrypt.keyStore.alias:mytestkey", "encrypt.keyStore.secret:changeme") + .run(); TextEncryptor encryptor = context.getBean(TextEncryptor.class); then(encryptor.decrypt(encryptor.encrypt("foo"))).isEqualTo("foo"); context.close(); @@ -55,14 +51,11 @@ public class EncryptionBootstrapConfigurationTests { @Test public void rsaKeyStoreWithRelaxedProperties() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - EncryptionBootstrapConfiguration.class) - .web(WebApplicationType.NONE) - .properties("encrypt.key-store.location:classpath:/server.jks", - "encrypt.key-store.password:letmein", - "encrypt.key-store.alias:mytestkey", - "encrypt.key-store.secret:changeme") - .run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class) + .web(WebApplicationType.NONE) + .properties("encrypt.key-store.location:classpath:/server.jks", "encrypt.key-store.password:letmein", + "encrypt.key-store.alias:mytestkey", "encrypt.key-store.secret:changeme") + .run(); TextEncryptor encryptor = context.getBean(TextEncryptor.class); then(encryptor.decrypt(encryptor.encrypt("foo"))).isEqualTo("foo"); context.close(); @@ -70,15 +63,12 @@ public class EncryptionBootstrapConfigurationTests { @Test public void rsaProperties() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - EncryptionBootstrapConfiguration.class) - .web(WebApplicationType.NONE) - .properties("encrypt.key-store.location:classpath:/server.jks", - "encrypt.key-store.password:letmein", - "encrypt.key-store.alias:mytestkey", - "encrypt.key-store.secret:changeme", - "encrypt.rsa.strong:true", "encrypt.rsa.salt:foobar") - .run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class) + .web(WebApplicationType.NONE) + .properties("encrypt.key-store.location:classpath:/server.jks", "encrypt.key-store.password:letmein", + "encrypt.key-store.alias:mytestkey", "encrypt.key-store.secret:changeme", + "encrypt.rsa.strong:true", "encrypt.rsa.salt:foobar") + .run(); RsaProperties properties = context.getBean(RsaProperties.class); then(properties.getSalt()).isEqualTo("foobar"); then(properties.isStrong()).isTrue(); @@ -89,16 +79,12 @@ public class EncryptionBootstrapConfigurationTests { @Test public void nonExistentKeystoreLocationShouldNotBeAllowed() { try { - new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class) - .web(WebApplicationType.NONE) + new SpringApplicationBuilder(EncryptionBootstrapConfiguration.class).web(WebApplicationType.NONE) .properties("encrypt.key-store.location:classpath:/server.jks1", - "encrypt.key-store.password:letmein", - "encrypt.key-store.alias:mytestkey", + "encrypt.key-store.password:letmein", "encrypt.key-store.alias:mytestkey", "encrypt.key-store.secret:changeme") .run(); - then(false).as( - "Should not create an application context with invalid keystore location") - .isTrue(); + then(false).as("Should not create an application context with invalid keystore location").isTrue(); } catch (Exception e) { then(e).hasRootCauseInstanceOf(IllegalStateException.class); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java index be4eec52..9def18ec 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java @@ -31,21 +31,19 @@ public class EncryptionIntegrationTests { @Test public void symmetricPropertyValues() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestConfiguration.class).web(WebApplicationType.NONE).properties( - "spring.config.use-legacy-processing=true", "encrypt.key:pie", + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfiguration.class) + .web(WebApplicationType.NONE).properties("spring.config.use-legacy-processing=true", "encrypt.key:pie", "foo.password:{cipher}bf29452295df354e6153c5b31b03ef23c70e55fba24299aa85c63438f1c43c95") - .run(); + .run(); then(context.getEnvironment().getProperty("foo.password")).isEqualTo("test"); } @Test public void symmetricConfigurationProperties() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestConfiguration.class).web(WebApplicationType.NONE).properties( - "spring.config.use-legacy-processing=true", "encrypt.key:pie", + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfiguration.class) + .web(WebApplicationType.NONE).properties("spring.config.use-legacy-processing=true", "encrypt.key:pie", "foo.password:{cipher}bf29452295df354e6153c5b31b03ef23c70e55fba24299aa85c63438f1c43c95") - .run(); + .run(); then(context.getBean(PasswordProperties.class).getPassword()).isEqualTo("test"); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java index cb17aa4d..af42c2af 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptorFactoryTests.java @@ -34,8 +34,7 @@ public class EncryptorFactoryTests { @Test public void testWithRsaPrivateKey() throws Exception { - String key = StreamUtils.copyToString( - new ClassPathResource("/example-test-rsa-private-key").getInputStream(), + String key = StreamUtils.copyToString(new ClassPathResource("/example-test-rsa-private-key").getInputStream(), Charset.forName("ASCII")); TextEncryptor encryptor = new EncryptorFactory().create(key); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java index c5203ba9..eafdb957 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java @@ -82,16 +82,15 @@ public class EnvironmentDecryptApplicationInitializerTests { public void propertySourcesOrderedCorrectly() { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TestPropertyValues.of("foo: {cipher}bar").applyTo(context); - context.getEnvironment().getPropertySources().addFirst(new MapPropertySource( - "test_override", Collections.singletonMap("foo", "{cipher}spam"))); + context.getEnvironment().getPropertySources() + .addFirst(new MapPropertySource("test_override", Collections.singletonMap("foo", "{cipher}spam"))); this.listener.initialize(context); then(context.getEnvironment().getProperty("foo")).isEqualTo("spam"); } @Test public void errorOnDecrypt() { - this.listener = new EnvironmentDecryptApplicationInitializer( - Encryptors.text("deadbeef", "AFFE37")); + this.listener = new EnvironmentDecryptApplicationInitializer(Encryptors.text("deadbeef", "AFFE37")); ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TestPropertyValues.of("foo: {cipher}bar").applyTo(context); // catch IllegalStateException and verify @@ -108,8 +107,7 @@ public class EnvironmentDecryptApplicationInitializerTests { @Test public void errorOnDecryptWithEmpty() { - this.listener = new EnvironmentDecryptApplicationInitializer( - Encryptors.text("deadbeef", "AFFE37")); + this.listener = new EnvironmentDecryptApplicationInitializer(Encryptors.text("deadbeef", "AFFE37")); this.listener.setFailOnError(false); ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TestPropertyValues.of("foo: {cipher}bar").applyTo(context); @@ -127,15 +125,12 @@ public class EnvironmentDecryptApplicationInitializerTests { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); // tests that collections in another property source don't get copied into // "decrypted" property source - TestPropertyValues - .of("yours[0].someValue: yourFoo", "yours[1].someValue: yourBar") - .applyTo(context); + TestPropertyValues.of("yours[0].someValue: yourFoo", "yours[1].someValue: yourBar").applyTo(context); // collection with some encrypted keys and some not encrypted TestPropertyValues - .of("mine[0].someValue: Foo", "mine[0].someKey: {cipher}Foo0", - "mine[1].someValue: Bar", "mine[1].someKey: {cipher}Bar1", - "nonindexed: nonindexval") + .of("mine[0].someValue: Foo", "mine[0].someKey: {cipher}Foo0", "mine[1].someValue: Bar", + "mine[1].someKey: {cipher}Bar1", "nonindexed: nonindexval") .applyTo(context.getEnvironment(), Type.MAP, "combinedTest"); this.listener.initialize(context); @@ -143,17 +138,13 @@ public class EnvironmentDecryptApplicationInitializerTests { then(context.getEnvironment().getProperty("mine[0].someKey")).isEqualTo("Foo0"); then(context.getEnvironment().getProperty("mine[1].someValue")).isEqualTo("Bar"); then(context.getEnvironment().getProperty("mine[1].someKey")).isEqualTo("Bar1"); - then(context.getEnvironment().getProperty("yours[0].someValue")) - .isEqualTo("yourFoo"); - then(context.getEnvironment().getProperty("yours[1].someValue")) - .isEqualTo("yourBar"); + then(context.getEnvironment().getProperty("yours[0].someValue")).isEqualTo("yourFoo"); + then(context.getEnvironment().getProperty("yours[1].someValue")).isEqualTo("yourBar"); - MutablePropertySources propertySources = context.getEnvironment() - .getPropertySources(); + MutablePropertySources propertySources = context.getEnvironment().getPropertySources(); PropertySource> decrypted = (PropertySource>) propertySources .get(DECRYPTED_PROPERTY_SOURCE_NAME); - then(decrypted.getSource().size()).as("decrypted property source had wrong size") - .isEqualTo(4); + then(decrypted.getSource().size()).as("decrypted property source had wrong size").isEqualTo(4); } @Test @@ -189,8 +180,7 @@ public class EnvironmentDecryptApplicationInitializerTests { CompositePropertySource cps = mock(CompositePropertySource.class); when(cps.getName()).thenReturn("mock-composite-source"); when(cps.getPropertyNames()).thenReturn(devProfile.getPropertyNames()); - when(cps.getPropertySources()) - .thenReturn(Arrays.asList(devProfile, defaultProfile)); + when(cps.getPropertySources()).thenReturn(Arrays.asList(devProfile, defaultProfile)); ctx.getEnvironment().getPropertySources().addLast(cps); initializer.initialize(ctx); @@ -201,8 +191,8 @@ public class EnvironmentDecryptApplicationInitializerTests { public void propertySourcesOrderedCorrectlyWithUnencryptedOverrides() { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TestPropertyValues.of("foo: {cipher}bar").applyTo(context); - context.getEnvironment().getPropertySources().addFirst(new MapPropertySource( - "test_override", Collections.singletonMap("foo", "spam"))); + context.getEnvironment().getPropertySources() + .addFirst(new MapPropertySource("test_override", Collections.singletonMap("foo", "spam"))); this.listener.initialize(context); then(context.getEnvironment().getProperty("foo")).isEqualTo("spam"); } @@ -215,28 +205,25 @@ public class EnvironmentDecryptApplicationInitializerTests { when(encryptor.decrypt("bar3")).thenReturn("bar3"); when(encryptor.decrypt("baz")).thenReturn("baz"); - EnvironmentDecryptApplicationInitializer initializer = new EnvironmentDecryptApplicationInitializer( - encryptor); + EnvironmentDecryptApplicationInitializer initializer = new EnvironmentDecryptApplicationInitializer(encryptor); ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); - CompositePropertySource bootstrap = new CompositePropertySource( - BOOTSTRAP_PROPERTY_SOURCE_NAME); - bootstrap.addPropertySource(new MapPropertySource("configService", - Collections.singletonMap("foo", "{cipher}bar"))); + CompositePropertySource bootstrap = new CompositePropertySource(BOOTSTRAP_PROPERTY_SOURCE_NAME); + bootstrap.addPropertySource( + new MapPropertySource("configService", Collections.singletonMap("foo", "{cipher}bar"))); context.getEnvironment().getPropertySources().addFirst(bootstrap); Map props = new HashMap<>(); props.put("foo2", "{cipher}bar2"); props.put("bar", "{cipher}baz"); - context.getEnvironment().getPropertySources().addAfter( - BOOTSTRAP_PROPERTY_SOURCE_NAME, new MapPropertySource("remote", props)); + context.getEnvironment().getPropertySources().addAfter(BOOTSTRAP_PROPERTY_SOURCE_NAME, + new MapPropertySource("remote", props)); initializer.initialize(context); // Simulate retrieval of new properties via Spring Cloud Config props.put("foo2", "{cipher}bar3"); - context.getEnvironment().getPropertySources().replace("remote", - new MapPropertySource("remote", props)); + context.getEnvironment().getPropertySources().replace("remote", new MapPropertySource("remote", props)); initializer.initialize(context); @@ -246,12 +233,11 @@ public class EnvironmentDecryptApplicationInitializerTests { verify(encryptor, times(2)).decrypt("baz"); // Check if all encrypted properties are still decrypted - PropertySource decryptedBootstrap = context.getEnvironment() - .getPropertySources().get(DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME); + PropertySource decryptedBootstrap = context.getEnvironment().getPropertySources() + .get(DECRYPTED_BOOTSTRAP_PROPERTY_SOURCE_NAME); then(decryptedBootstrap.getProperty("foo")).isEqualTo("bar"); - PropertySource decrypted = context.getEnvironment().getPropertySources() - .get(DECRYPTED_PROPERTY_SOURCE_NAME); + PropertySource decrypted = context.getEnvironment().getPropertySources().get(DECRYPTED_PROPERTY_SOURCE_NAME); then(decrypted.getProperty("foo2")).isEqualTo("bar3"); then(decrypted.getProperty("bar")).isEqualTo("baz"); } @@ -261,11 +247,10 @@ public class EnvironmentDecryptApplicationInitializerTests { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TextEncryptor encryptor = mock(TextEncryptor.class); when(encryptor.decrypt("bar2")).thenReturn("bar2"); - EnvironmentDecryptApplicationInitializer initializer = new EnvironmentDecryptApplicationInitializer( - encryptor); + EnvironmentDecryptApplicationInitializer initializer = new EnvironmentDecryptApplicationInitializer(encryptor); TestPropertyValues.of("foo: {cipher}bar", "foo2: {cipher}bar2").applyTo(context); - context.getEnvironment().getPropertySources().addFirst(new MapPropertySource( - "test_override", Collections.singletonMap("foo", "spam"))); + context.getEnvironment().getPropertySources() + .addFirst(new MapPropertySource("test_override", Collections.singletonMap("foo", "spam"))); initializer.initialize(context); then(context.getEnvironment().getProperty("foo")).isEqualTo("spam"); then(context.getEnvironment().getProperty("foo2")).isEqualTo("bar2"); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/RsaDisabledTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/RsaDisabledTests.java index e5581748..7bc03db4 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/RsaDisabledTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/RsaDisabledTests.java @@ -43,10 +43,8 @@ public class RsaDisabledTests { @Before public void setUp() { this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) - .sources(EncryptionBootstrapConfiguration.class) - .web(WebApplicationType.NONE).properties("encrypt.key:mykey", - "encrypt.rsa.strong:true", "encrypt.rsa.salt:foobar") - .run(); + .sources(EncryptionBootstrapConfiguration.class).web(WebApplicationType.NONE) + .properties("encrypt.key:mykey", "encrypt.rsa.strong:true", "encrypt.rsa.salt:foobar").run(); } @After @@ -58,8 +56,7 @@ public class RsaDisabledTests { @Test public void testLoadBalancedRetryFactoryBean() throws Exception { - Map properties = this.context - .getBeansOfType(RsaProperties.class); + Map properties = this.context.getBeansOfType(RsaProperties.class); then(properties.values()).hasSize(0); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java index c167fc54..d27eab76 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java @@ -52,8 +52,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(classes = TestConfiguration.class, - properties = { "management.endpoints.web.exposure.include=*", - "management.endpoint.env.post.enabled=true" }) + properties = { "management.endpoints.web.exposure.include=*", "management.endpoint.env.post.enabled=true" }) @AutoConfigureMockMvc public class EnvironmentManagerIntegrationTests { @@ -76,9 +75,8 @@ public class EnvironmentManagerIntegrationTests { then(this.properties.getMessage()).isEqualTo("Hello scope!"); String content = property("message", "Foo"); - this.mvc.perform(post(BASE_PATH + "/env").content(content) - .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()) - .andExpect(content().string("{\"message\":\"Foo\"}")); + this.mvc.perform(post(BASE_PATH + "/env").content(content).contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()).andExpect(content().string("{\"message\":\"Foo\"}")); then(this.properties.getMessage()).isEqualTo("Foo"); } @@ -94,9 +92,9 @@ public class EnvironmentManagerIntegrationTests { @Test public void testRefreshFails() throws Exception { try { - this.mvc.perform(post(BASE_PATH + "/env").content(property("delay", "foo")) - .contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()) - .andExpect(status().is5xxServerError()); + this.mvc.perform( + post(BASE_PATH + "/env").content(property("delay", "foo")).contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()).andExpect(status().is5xxServerError()); fail("expected ServletException"); } catch (ServletException e) { @@ -107,17 +105,14 @@ public class EnvironmentManagerIntegrationTests { @Test public void coreWebExtensionAvailable() throws Exception { - this.mvc.perform(get(BASE_PATH + "/env/" + UUID.randomUUID().toString())) - .andExpect(status().isNotFound()); + this.mvc.perform(get(BASE_PATH + "/env/" + UUID.randomUUID().toString())).andExpect(status().isNotFound()); } @Test public void environmentBeansConfiguredCorrectly() { - Map envbeans = this.context - .getBeansOfType(EnvironmentEndpoint.class); + Map envbeans = this.context.getBeansOfType(EnvironmentEndpoint.class); then(envbeans).hasSize(1).containsKey("writableEnvironmentEndpoint"); - then(envbeans.get("writableEnvironmentEndpoint")) - .isInstanceOf(WritableEnvironmentEndpoint.class); + then(envbeans.get("writableEnvironmentEndpoint")).isInstanceOf(WritableEnvironmentEndpoint.class); Map extbeans = this.context .getBeansOfType(EnvironmentEndpointWebExtension.class); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java index da882c51..d9b5d882 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerTest.java @@ -41,8 +41,7 @@ public class EnvironmentManagerTest { environmentManager.setProperty("foo", "bar"); then(environment.getProperty("foo")).isEqualTo("bar"); - ArgumentCaptor eventCaptor = ArgumentCaptor - .forClass(ApplicationEvent.class); + ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(ApplicationEvent.class); verify(publisher, times(1)).publishEvent(eventCaptor.capture()); then(eventCaptor.getValue()).isInstanceOf(EnvironmentChangeEvent.class); EnvironmentChangeEvent event = (EnvironmentChangeEvent) eventCaptor.getValue(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java index b5d3720b..1e7ddc5d 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java @@ -39,8 +39,7 @@ public class NamedContextFactoryTests { parent.refresh(); TestClientFactory factory = new TestClientFactory(); factory.setApplicationContext(parent); - factory.setConfigurations(Arrays.asList(getSpec("foo", FooConfig.class), - getSpec("bar", BarConfig.class))); + factory.setConfigurations(Arrays.asList(getSpec("foo", FooConfig.class), getSpec("bar", BarConfig.class))); Foo foo = factory.getInstance("foo", Foo.class); then(foo).as("foo was null").isNotNull(); @@ -48,8 +47,7 @@ public class NamedContextFactoryTests { Bar bar = factory.getInstance("bar", Bar.class); then(bar).as("bar was null").isNotNull(); - then(factory.getContextNames()).as("context names not exposed").contains("foo", - "bar"); + then(factory.getContextNames()).as("context names not exposed").contains("foo", "bar"); Bar foobar = factory.getInstance("foo", Bar.class); then(foobar).as("bar was not null").isNull(); @@ -78,12 +76,10 @@ public class NamedContextFactoryTests { AnnotationConfigApplicationContext fooContext = factory.getContext("foo"); AnnotationConfigApplicationContext barContext = factory.getContext("bar"); - then(fooContext.getClassLoader()) - .as("foo context classloader does not match parent") + then(fooContext.getClassLoader()).as("foo context classloader does not match parent") .isSameAs(parent.getClassLoader()); - Assertions.assertThat(fooContext).hasFieldOrPropertyWithValue("customClassLoader", - true); + Assertions.assertThat(fooContext).hasFieldOrPropertyWithValue("customClassLoader", true); factory.destroy(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java index 39c7e6a9..b0a7ffa2 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java @@ -44,8 +44,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, - properties = "spring.config.use-legacy-processing=true") +@SpringBootTest(classes = TestConfiguration.class, properties = "spring.config.use-legacy-processing=true") @ActiveProfiles("config") public class ConfigurationPropertiesRebinderIntegrationTests { @@ -131,8 +130,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests { @Bean @ConfigurationProperties("some.service") public SomeService someService() { - return ProxyFactory.getProxy(SomeService.class, - (MethodInterceptor) methodInvocation -> null); + return ProxyFactory.getProxy(SomeService.class, (MethodInterceptor) methodInvocation -> null); } } @@ -141,8 +139,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests { protected static class RefreshConfiguration extends RefreshAutoConfiguration { @Configuration(proxyBeanMethods = false) - protected static class RebinderConfiguration - extends ConfigurationPropertiesRebinderAutoConfiguration { + protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java index 156f9139..9fa505d9 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderLifecycleIntegrationTests.java @@ -67,8 +67,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - @Import({ RefreshConfiguration.RebinderConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Bean @@ -82,8 +81,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests { protected static class RefreshConfiguration extends RefreshAutoConfiguration { @Configuration(proxyBeanMethods = false) - protected static class RebinderConfiguration - extends ConfigurationPropertiesRebinderAutoConfiguration { + protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java index 1e08d465..58434f77 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderListIntegrationTests.java @@ -102,8 +102,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - @Import({ RefreshConfiguration.RebinderConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshConfiguration.RebinderConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Bean @@ -117,8 +116,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests { protected static class RefreshConfiguration extends RefreshAutoConfiguration { @Configuration(proxyBeanMethods = false) - protected static class RebinderConfiguration - extends ConfigurationPropertiesRebinderAutoConfiguration { + protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java index 3821b133..d25cfe76 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java @@ -44,8 +44,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, - properties = { "messages.expiry.one=168", "messages.expiry.two=76" }) +@SpringBootTest(classes = TestConfiguration.class, properties = { "messages.expiry.one=168", "messages.expiry.two=76" }) public class ConfigurationPropertiesRebinderProxyIntegrationTests { @Autowired @@ -95,8 +94,7 @@ public class ConfigurationPropertiesRebinderProxyIntegrationTests { protected static class RefreshConfiguration extends RefreshAutoConfiguration { @Configuration(proxyBeanMethods = false) - protected static class RebinderConfiguration - extends ConfigurationPropertiesRebinderAutoConfiguration { + protected static class RebinderConfiguration extends ConfigurationPropertiesRebinderAutoConfiguration { } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java index 2f089b8c..ed5e8ea2 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderRefreshScopeIntegrationTests.java @@ -41,8 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, - properties = "spring.config.use-legacy-processing=true") +@SpringBootTest(classes = TestConfiguration.class, properties = "spring.config.use-legacy-processing=true") public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests { @Autowired @@ -89,8 +88,7 @@ public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - @Import({ RefreshAutoConfiguration.class, - ConfigurationPropertiesRebinderAutoConfiguration.class, + @Import({ RefreshAutoConfiguration.class, ConfigurationPropertiesRebinderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java index 139594a5..1a8e1a24 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java @@ -37,8 +37,7 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) @SpringBootTest(classes = TestConfiguration.class, - properties = { "spring.datasource.hikari.read-only=false", - "spring.config.use-legacy-processing=true" }) + properties = { "spring.datasource.hikari.read-only=false", "spring.config.use-legacy-processing=true" }) public class ContextRefresherIntegrationTests { @Autowired @@ -75,8 +74,7 @@ public class ContextRefresherIntegrationTests { @DirtiesContext public void testUpdateHikari() throws Exception { then(this.properties.getMessage()).isEqualTo("Hello scope!"); - TestPropertyValues.of("spring.datasource.hikari.read-only=true") - .applyTo(this.environment); + TestPropertyValues.of("spring.datasource.hikari.read-only=true").applyTo(this.environment); // ...and then refresh, so the bean is re-initialized: this.refresher.refresh(); then(this.properties.getMessage()).isEqualTo("Hello scope!"); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherOrderingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherOrderingIntegrationTests.java index 089ac810..11407e37 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherOrderingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherOrderingIntegrationTests.java @@ -77,12 +77,9 @@ public class ContextRefresherOrderingIntegrationTests { public void orderingIsCorrect() { refresher.refresh(); MutablePropertySources propertySources = environment.getPropertySources(); - PropertySource test1 = propertySources - .get("bootstrapProperties-testContextRefresherOrdering1"); - PropertySource test2 = propertySources - .get("bootstrapProperties-testContextRefresherOrdering2"); - PropertySource test3 = propertySources - .get("bootstrapProperties-testContextRefresherOrdering3"); + PropertySource test1 = propertySources.get("bootstrapProperties-testContextRefresherOrdering1"); + PropertySource test2 = propertySources.get("bootstrapProperties-testContextRefresherOrdering2"); + PropertySource test3 = propertySources.get("bootstrapProperties-testContextRefresherOrdering3"); int index1 = propertySources.precedenceOf(test1); int index2 = propertySources.precedenceOf(test2); int index3 = propertySources.precedenceOf(test3); @@ -114,12 +111,9 @@ public class ContextRefresherOrderingIntegrationTests { return Collections.emptyList(); } ArrayList> sources = new ArrayList<>(); - sources.add(new MapPropertySource("testContextRefresherOrdering1", - singletonMap("key1", "value1"))); - sources.add(new MapPropertySource("testContextRefresherOrdering2", - singletonMap("key2", "value2"))); - sources.add(new MapPropertySource("testContextRefresherOrdering3", - singletonMap("key3", "value3"))); + sources.add(new MapPropertySource("testContextRefresherOrdering1", singletonMap("key1", "value1"))); + sources.add(new MapPropertySource("testContextRefresherOrdering2", singletonMap("key2", "value2"))); + sources.add(new MapPropertySource("testContextRefresherOrdering3", singletonMap("key3", "value3"))); return sources; } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java index 199b4f7b..c498d5da 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java @@ -62,21 +62,16 @@ public class ContextRefresherTests { @Ignore // FIXME: legacy config public void orderNewPropertiesConsistentWithNewContext() { try (ConfigurableApplicationContext context = SpringApplication.run(Empty.class, - "--spring.config.use-legacy-processing=true", - "--spring.main.web-application-type=none", "--debug=false", - "--spring.main.bannerMode=OFF")) { + "--spring.config.use-legacy-processing=true", "--spring.main.web-application-type=none", + "--debug=false", "--spring.main.bannerMode=OFF")) { context.getEnvironment().setActiveProfiles("refresh"); List names = names(context.getEnvironment().getPropertySources()); - then(names).doesNotContain( - "applicationConfig: [classpath:/bootstrap-refresh.properties]"); - LegacyContextRefresher refresher = new LegacyContextRefresher(context, - this.scope); + then(names).doesNotContain("applicationConfig: [classpath:/bootstrap-refresh.properties]"); + LegacyContextRefresher refresher = new LegacyContextRefresher(context, this.scope); refresher.refresh(); names = names(context.getEnvironment().getPropertySources()); - then(names).contains( - "applicationConfig: [classpath:/bootstrap-refresh.properties]"); - then(names).containsSequence( - "applicationConfig: [classpath:/application.properties]", + then(names).contains("applicationConfig: [classpath:/bootstrap-refresh.properties]"); + then(names).containsSequence("applicationConfig: [classpath:/application.properties]", "applicationConfig: [classpath:/bootstrap-refresh.properties]", "applicationConfig: [classpath:/bootstrap.properties]"); } @@ -88,10 +83,8 @@ public class ContextRefresherTests { // Use spring.cloud.bootstrap.name to switch off the defaults (which would pick up // a bootstrapProperties immediately try (ConfigurableApplicationContext context = SpringApplication.run(Empty.class, - "--spring.config.use-legacy-processing=true", - "--spring.main.web-application-type=none", "--debug=false", - "--spring.main.bannerMode=OFF", - "--spring.cloud.bootstrap.name=refresh")) { + "--spring.config.use-legacy-processing=true", "--spring.main.web-application-type=none", + "--debug=false", "--spring.main.bannerMode=OFF", "--spring.cloud.bootstrap.name=refresh")) { List names = names(context.getEnvironment().getPropertySources()); System.err.println("***** " + context.getEnvironment().getPropertySources()); then(names).doesNotContain("bootstrapProperties"); @@ -101,9 +94,8 @@ public class ContextRefresherTests { .applyTo(context.getEnvironment(), Type.MAP, "defaultProperties"); refresher.refresh(); names = names(context.getEnvironment().getPropertySources()); - then(names).first().isEqualTo( - PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME - + "-refreshTest"); + then(names).first() + .isEqualTo(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-refreshTest"); } } @@ -111,39 +103,29 @@ public class ContextRefresherTests { public void parentContextIsClosed() { // Use spring.cloud.bootstrap.name to switch off the defaults (which would pick up // a bootstrapProperties immediately - try (ConfigurableApplicationContext context = SpringApplication.run( - ContextRefresherTests.class, "--spring.main.web-application-type=none", - "--spring.config.use-legacy-processing=true", "--debug=false", - "--spring.main.bannerMode=OFF", - "--spring.cloud.bootstrap.name=refresh")) { - LegacyContextRefresher refresher = new LegacyContextRefresher(context, - this.scope); + try (ConfigurableApplicationContext context = SpringApplication.run(ContextRefresherTests.class, + "--spring.main.web-application-type=none", "--spring.config.use-legacy-processing=true", + "--debug=false", "--spring.main.bannerMode=OFF", "--spring.cloud.bootstrap.name=refresh")) { + LegacyContextRefresher refresher = new LegacyContextRefresher(context, this.scope); TestPropertyValues.of("spring.cloud.bootstrap.sources: " + "org.springframework.cloud.context.refresh.ContextRefresherTests.PropertySourceConfiguration") .applyTo(context); - ConfigurableApplicationContext refresherContext = refresher - .addConfigFilesToEnvironment(); - then(refresherContext.getParent()).isNotNull() - .isInstanceOf(ConfigurableApplicationContext.class); - ConfigurableApplicationContext parent = (ConfigurableApplicationContext) refresherContext - .getParent(); + ConfigurableApplicationContext refresherContext = refresher.addConfigFilesToEnvironment(); + then(refresherContext.getParent()).isNotNull().isInstanceOf(ConfigurableApplicationContext.class); + ConfigurableApplicationContext parent = (ConfigurableApplicationContext) refresherContext.getParent(); then(parent.isActive()).isFalse(); } } @Test public void loggingSystemNotInitialized() { - System.setProperty(LoggingSystem.SYSTEM_PROPERTY, - TestLoggingSystem.class.getName()); - TestLoggingSystem system = (TestLoggingSystem) LoggingSystem - .get(getClass().getClassLoader()); + System.setProperty(LoggingSystem.SYSTEM_PROPERTY, TestLoggingSystem.class.getName()); + TestLoggingSystem system = (TestLoggingSystem) LoggingSystem.get(getClass().getClassLoader()); then(system.getCount()).isEqualTo(0); try (ConfigurableApplicationContext context = SpringApplication.run(Empty.class, - "--spring.config.use-legacy-processing=true", - "--spring.main.web-application-type=none", "--debug=false", - "--spring.main.bannerMode=OFF", - "--spring.cloud.bootstrap.name=refresh")) { + "--spring.config.use-legacy-processing=true", "--spring.main.web-application-type=none", + "--debug=false", "--spring.main.bannerMode=OFF", "--spring.cloud.bootstrap.name=refresh")) { then(system.getCount()).isEqualTo(4); ContextRefresher refresher = new LegacyContextRefresher(context, this.scope); refresher.refresh(); @@ -156,10 +138,9 @@ public class ContextRefresherTests { TestBootstrapConfiguration.fooSightings = new ArrayList<>(); - try (ConfigurableApplicationContext context = SpringApplication.run( - ContextRefresherTests.class, "--spring.main.web-application-type=none", - "--spring.config.use-legacy-processing=true", "--debug=false", - "--spring.main.bannerMode=OFF", "--spring.cloud.bootstrap.name=refresh", + try (ConfigurableApplicationContext context = SpringApplication.run(ContextRefresherTests.class, + "--spring.main.web-application-type=none", "--spring.config.use-legacy-processing=true", + "--debug=false", "--spring.main.bannerMode=OFF", "--spring.cloud.bootstrap.name=refresh", "--test.bootstrap.foo=bar")) { context.getEnvironment().setActiveProfiles("refresh"); ContextRefresher refresher = new LegacyContextRefresher(context, this.scope); @@ -172,10 +153,8 @@ public class ContextRefresherTests { @Test public void legacyContextRefresherCreatedUsingBootstrapEnabled() { - new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) - .withPropertyValues("spring.cloud.bootstrap.enabled=true") - .run(context -> { + new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) + .withPropertyValues("spring.cloud.bootstrap.enabled=true").run(context -> { assertThat(context).hasSingleBean(LegacyContextRefresher.class); assertThat(context).hasSingleBean(ContextRefresher.class); }); @@ -183,10 +162,8 @@ public class ContextRefresherTests { @Test public void legacyContextRefresherCreated() { - new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) - .withPropertyValues("spring.config.use-legacy-processing=true") - .run(context -> { + new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) + .withPropertyValues("spring.config.use-legacy-processing=true").run(context -> { assertThat(context).hasSingleBean(LegacyContextRefresher.class); assertThat(context).hasSingleBean(ContextRefresher.class); }); @@ -194,8 +171,7 @@ public class ContextRefresherTests { @Test public void configDataContextRefresherCreated() { - new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) + new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class)) .run(context -> { assertThat(context).hasSingleBean(ConfigDataContextRefresher.class); assertThat(context).hasSingleBean(ContextRefresher.class); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java index 342824ae..33605c08 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java @@ -45,11 +45,9 @@ public class RestartIntegrationTests { @Test public void testRestartTwice() throws Exception { - this.context = SpringApplication.run(TestConfiguration.class, - "--management.endpoint.restart.enabled=true", "--server.port=0", - "--spring.config.use-legacy-processing=true", - "--management.endpoints.web.exposure.include=restart", - "--spring.liveBeansView.mbeanDomain=livebeans"); + this.context = SpringApplication.run(TestConfiguration.class, "--management.endpoint.restart.enabled=true", + "--server.port=0", "--spring.config.use-legacy-processing=true", + "--management.endpoints.web.exposure.include=restart", "--spring.liveBeansView.mbeanDomain=livebeans"); RestartEndpoint endpoint = this.context.getBean(RestartEndpoint.class); then(this.context.getParent()).isNotNull(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java index 7b0095db..3b07a3e8 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/ImportRefreshScopeIntegrationTests.java @@ -47,8 +47,7 @@ public class ImportRefreshScopeIntegrationTests { @Test public void testSimpleProperties() throws Exception { then(this.service.getMessage()).isEqualTo("Hello scope!"); - then(this.beanFactory.getBeanDefinition("scopedTarget.service").getScope()) - .isEqualTo("refresh"); + then(this.beanFactory.getBeanDefinition("scopedTarget.service").getScope()).isEqualTo("refresh"); then(this.service.getMessage()).isEqualTo("Hello scope!"); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java index a4467c73..dd6cd2b5 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/MoreRefreshScopeIntegrationTests.java @@ -88,8 +88,7 @@ public class MoreRefreshScopeIntegrationTests { then(this.service.getMessage()).isEqualTo("Hello scope!"); String id1 = this.service.toString(); // Change the dynamic property source... - TestPropertyValues.of("message:Foo").applyTo(this.environment, Type.MAP, - "morerefreshtests"); + TestPropertyValues.of("message:Foo").applyTo(this.environment, Type.MAP, "morerefreshtests"); // ...and then refresh, so the bean is re-initialized: this.scope.refreshAll(); String id2 = this.service.toString(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java index c1af160b..b916bc61 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java @@ -52,8 +52,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @RunWith(SpringRunner.class) @SpringBootTest(classes = ClientApp.class, - properties = { "management.endpoints.web.exposure.include=*", - "management.endpoint.env.post.enabled=true" }, + properties = { "management.endpoints.web.exposure.include=*", "management.endpoint.env.post.enabled=true" }, webEnvironment = RANDOM_PORT) public class RefreshEndpointIntegrationTests { @@ -66,25 +65,21 @@ public class RefreshEndpointIntegrationTests { public void webAccess() throws Exception { TestRestTemplate template = new TestRestTemplate(); template.exchange( - getUrlEncodedEntity("http://localhost:" + this.port + BASE_PATH + "/env", - "message", "Hello Dave!"), - String.class); - template.postForObject("http://localhost:" + this.port + BASE_PATH + "/refresh", - null, String.class); - String message = template.getForObject("http://localhost:" + this.port + "/", + getUrlEncodedEntity("http://localhost:" + this.port + BASE_PATH + "/env", "message", "Hello Dave!"), String.class); + template.postForObject("http://localhost:" + this.port + BASE_PATH + "/refresh", null, String.class); + String message = template.getForObject("http://localhost:" + this.port + "/", String.class); then(message).isEqualTo("Hello Dave!"); } - private RequestEntity getUrlEncodedEntity(String uri, String key, String value) - throws URISyntaxException { + private RequestEntity getUrlEncodedEntity(String uri, String key, String value) throws URISyntaxException { Map property = new HashMap<>(); property.put("name", key); property.put("value", value); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - RequestEntity> entity = new RequestEntity<>(property, headers, - HttpMethod.POST, new URI(uri)); + RequestEntity> entity = new RequestEntity<>(property, headers, HttpMethod.POST, + new URI(uri)); return entity; } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java index 6390a30f..e380bfd1 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConcurrencyTests.java @@ -106,8 +106,7 @@ public class RefreshScopeConcurrencyTests { } - public static class ExampleService - implements Service, InitializingBean, DisposableBean { + public static class ExampleService implements Service, InitializingBean, DisposableBean { private static Log logger = LogFactory.getLog(ExampleService.class); @@ -152,8 +151,7 @@ public class RefreshScopeConcurrencyTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) - @Import({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java index 9e4cb267..78d96d23 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationScaleTests.java @@ -57,8 +57,7 @@ import static org.assertj.core.api.BDDAssertions.then; "logging.level.org.springframework.cloud.context.scope.refresh.RefreshScopeConfigurationScaleTests=DEBUG" }) public class RefreshScopeConfigurationScaleTests { - private static Log logger = LogFactory - .getLog(RefreshScopeConfigurationScaleTests.class); + private static Log logger = LogFactory.getLog(RefreshScopeConfigurationScaleTests.class); @Autowired org.springframework.cloud.context.scope.refresh.RefreshScope scope; @@ -90,8 +89,7 @@ public class RefreshScopeConfigurationScaleTests { public String call() throws Exception { logger.debug("Background started."); try { - return RefreshScopeConfigurationScaleTests.this.service - .getMessage(); + return RefreshScopeConfigurationScaleTests.this.service.getMessage(); } finally { latch.countDown(); @@ -120,8 +118,7 @@ public class RefreshScopeConfigurationScaleTests { } - public static class ExampleService - implements Service, InitializingBean, DisposableBean { + public static class ExampleService implements Service, InitializingBean, DisposableBean { private static Log logger = LogFactory.getLog(ExampleService.class); @@ -135,35 +132,30 @@ public class RefreshScopeConfigurationScaleTests { @Override public void afterPropertiesSet() throws Exception { - logger.debug("Initializing: " + ObjectUtils.getIdentityHexString(this) + ", " - + this.message); + logger.debug("Initializing: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); try { Thread.sleep(this.delay); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - logger.debug("Initialized: " + ObjectUtils.getIdentityHexString(this) + ", " - + this.message); + logger.debug("Initialized: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); } @Override public void destroy() throws Exception { - logger.debug("Destroying message: " + ObjectUtils.getIdentityHexString(this) - + ", " + this.message); + logger.debug("Destroying message: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); this.message = null; } @Override public String getMessage() { - logger.debug("Returning message: " + ObjectUtils.getIdentityHexString(this) - + ", " + this.message); + logger.debug("Returning message: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); return this.message; } public void setMessage(String message) { - logger.debug("Setting message: " + ObjectUtils.getIdentityHexString(this) - + ", " + message); + logger.debug("Setting message: " + ObjectUtils.getIdentityHexString(this) + ", " + message); this.message = message; } @@ -171,8 +163,7 @@ public class RefreshScopeConfigurationScaleTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - @Import({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java index 7eda403a..8214d58c 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java @@ -56,12 +56,10 @@ public class RefreshScopeConfigurationTests { } private void refresh() { - EnvironmentManager environmentManager = this.context - .getBean(EnvironmentManager.class); + EnvironmentManager environmentManager = this.context.getBean(EnvironmentManager.class); environmentManager.setProperty("message", "Hello Dave!"); org.springframework.cloud.context.scope.refresh.RefreshScope scope = this.context - .getBean( - org.springframework.cloud.context.scope.refresh.RefreshScope.class); + .getBean(org.springframework.cloud.context.scope.refresh.RefreshScope.class); scope.refreshAll(); } @@ -71,12 +69,10 @@ public class RefreshScopeConfigurationTests { @Test public void configurationWithRefreshScope() throws Exception { this.context = new AnnotationConfigApplicationContext(Application.class, - PropertyPlaceholderAutoConfiguration.class, - RefreshAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, RefreshAutoConfiguration.class, LifecycleMvcEndpointAutoConfiguration.class); Application application = this.context.getBean(Application.class); - then(this.context.getBeanDefinition("scopedTarget.application").getScope()) - .isEqualTo("refresh"); + then(this.context.getBeanDefinition("scopedTarget.application").getScope()).isEqualTo("refresh"); application.hello(); refresh(); String message = application.hello(); @@ -86,8 +82,7 @@ public class RefreshScopeConfigurationTests { @Test public void refreshScopeOnBean() throws Exception { this.context = new AnnotationConfigApplicationContext(ClientApp.class, - PropertyPlaceholderAutoConfiguration.class, - RefreshAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, RefreshAutoConfiguration.class, LifecycleMvcEndpointAutoConfiguration.class); Controller application = this.context.getBean(Controller.class); application.hello(); @@ -99,8 +94,7 @@ public class RefreshScopeConfigurationTests { @Test public void refreshScopeOnNested() throws Exception { this.context = new AnnotationConfigApplicationContext(NestedApp.class, - PropertyPlaceholderAutoConfiguration.class, - RefreshAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, RefreshAutoConfiguration.class, LifecycleMvcEndpointAutoConfiguration.class); NestedController application = this.context.getBean(NestedController.class); application.hello(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java index 55117c01..4f24354a 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeIntegrationTests.java @@ -96,8 +96,7 @@ public class RefreshScopeIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); + then(ExampleService.event.getName()).isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); } @Test @@ -116,8 +115,7 @@ public class RefreshScopeIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); + then(ExampleService.event.getName()).isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); } // see gh-349 @@ -135,8 +133,8 @@ public class RefreshScopeIntegrationTests { } - public static class ExampleService implements Service, InitializingBean, - DisposableBean, ApplicationListener { + public static class ExampleService + implements Service, InitializingBean, DisposableBean, ApplicationListener { private static Log logger = LogFactory.getLog(ExampleService.class); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java index 281da40e..669b0927 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeLazyIntegrationTests.java @@ -99,8 +99,7 @@ public class RefreshScopeLazyIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); + then(ExampleService.event.getName()).isEqualTo(RefreshScopeRefreshedEvent.DEFAULT_NAME); } @Test @@ -118,8 +117,7 @@ public class RefreshScopeLazyIntegrationTests { then(ExampleService.getDestroyCount()).isEqualTo(1); then(id2).isNotSameAs(id1); then(ExampleService.event).isNotNull(); - then(ExampleService.event.getName()) - .isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); + then(ExampleService.event.getName()).isEqualTo(GenericScope.SCOPED_TARGET_PREFIX + "service"); } public interface Service { @@ -128,8 +126,8 @@ public class RefreshScopeLazyIntegrationTests { } - public static class ExampleService implements Service, InitializingBean, - DisposableBean, ApplicationListener { + public static class ExampleService + implements Service, InitializingBean, DisposableBean, ApplicationListener { private static Log logger = LogFactory.getLog(ExampleService.class); @@ -201,8 +199,7 @@ public class RefreshScopeLazyIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) - @ImportAutoConfiguration({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @ImportAutoConfiguration({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java index 11e44ff1..dd880ac1 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java @@ -45,8 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, - properties = { "test.messages[0]=one", "test.messages[1]=two" }) +@SpringBootTest(classes = TestConfiguration.class, properties = { "test.messages[0]=one", "test.messages[1]=two" }) public class RefreshScopeListBindingIntegrationTests { @Autowired @@ -93,8 +92,7 @@ public class RefreshScopeListBindingIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - @Import({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java index d312d002..9e578bdc 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java @@ -33,8 +33,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest( - classes = { RefreshScopeNullBeanIntegrationTests.TestConfiguration.class }) +@SpringBootTest(classes = { RefreshScopeNullBeanIntegrationTests.TestConfiguration.class }) public class RefreshScopeNullBeanIntegrationTests { @Autowired @@ -78,8 +77,7 @@ public class RefreshScopeNullBeanIntegrationTests { } @Configuration(proxyBeanMethods = false) - @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - OptionalConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, OptionalConfiguration.class }) protected static class TestConfiguration { @Autowired(required = false) diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java index 48da9607..6af6e026 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopePureScaleTests.java @@ -109,8 +109,7 @@ public class RefreshScopePureScaleTests { } - public static class ExampleService - implements Service, InitializingBean, DisposableBean { + public static class ExampleService implements Service, InitializingBean, DisposableBean { private static Log logger = LogFactory.getLog(ExampleService.class); @@ -124,43 +123,37 @@ public class RefreshScopePureScaleTests { @Override public void afterPropertiesSet() throws Exception { - logger.debug("Initializing: " + ObjectUtils.getIdentityHexString(this) + ", " - + this.message); + logger.debug("Initializing: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); try { Thread.sleep(this.delay); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - logger.debug("Initialized: " + ObjectUtils.getIdentityHexString(this) + ", " - + this.message); + logger.debug("Initialized: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); } @Override public void destroy() throws Exception { - logger.debug("Destroying message: " + ObjectUtils.getIdentityHexString(this) - + ", " + this.message); + logger.debug("Destroying message: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); this.message = null; } @Override public String getMessage() { - logger.debug("Returning message: " + ObjectUtils.getIdentityHexString(this) - + ", " + this.message); + logger.debug("Returning message: " + ObjectUtils.getIdentityHexString(this) + ", " + this.message); return this.message; } public void setMessage(String message) { - logger.debug("Setting message: " + ObjectUtils.getIdentityHexString(this) - + ", " + message); + logger.debug("Setting message: " + ObjectUtils.getIdentityHexString(this) + ", " + message); this.message = message; } } @Configuration(proxyBeanMethods = false) - @Import({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Bean diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java index ae492bd9..39ce6ed8 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeScaleTests.java @@ -107,8 +107,7 @@ public class RefreshScopeScaleTests { } - public static class ExampleService - implements Service, InitializingBean, DisposableBean { + public static class ExampleService implements Service, InitializingBean, DisposableBean { private static Log logger = LogFactory.getLog(ExampleService.class); @@ -155,8 +154,7 @@ public class RefreshScopeScaleTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TestProperties.class) - @Import({ RefreshAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class TestConfiguration { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java index d964ed59..3cc2ef0a 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeSerializationTests.java @@ -34,10 +34,8 @@ public class RefreshScopeSerializationTests { @Test public void defaultApplicationContextId() throws Exception { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestConfiguration.class) - .properties("spring.config.use-legacy-processing=true") - .web(WebApplicationType.NONE).run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfiguration.class) + .properties("spring.config.use-legacy-processing=true").web(WebApplicationType.NONE).run(); then(context.getId()).isEqualTo("application-1"); } @@ -51,10 +49,9 @@ public class RefreshScopeSerializationTests { } private DefaultListableBeanFactory getBeanFactory() { - ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestConfiguration.class).web(WebApplicationType.NONE).run(); - DefaultListableBeanFactory factory = (DefaultListableBeanFactory) context - .getAutowireCapableBeanFactory(); + ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfiguration.class) + .web(WebApplicationType.NONE).run(); + DefaultListableBeanFactory factory = (DefaultListableBeanFactory) context.getAutowireCapableBeanFactory(); return factory; } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java index 7b7a577a..ff4e45a0 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeWebIntegrationTests.java @@ -58,8 +58,7 @@ public class RefreshScopeWebIntegrationTests { @Test public void scopeOnBeanDefinition() throws Exception { - then(this.beanFactory.getBeanDefinition("scopedTarget.application").getScope()) - .isEqualTo("refresh"); + then(this.beanFactory.getBeanDefinition("scopedTarget.application").getScope()).isEqualTo("refresh"); } @Test diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java index c5af2301..b153bb6f 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/endpoint/RefreshEndpointTests.java @@ -69,16 +69,12 @@ public class RefreshEndpointTests { @Test @Ignore // FIXME: legacy public void keysComputedWhenAdded() throws Exception { - this.context = new SpringApplicationBuilder(Empty.class) - .web(WebApplicationType.NONE).bannerMode(Mode.OFF) - .properties("spring.config.use-legacy-processing=true", - "spring.cloud.bootstrap.name:none") - .run(); + this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF) + .properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name:none").run(); RefreshScope scope = new RefreshScope(); scope.setApplicationContext(this.context); this.context.getEnvironment().setActiveProfiles("local"); - ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); Collection keys = endpoint.refresh(); then(keys.contains("added")).isTrue().as("Wrong keys: " + keys); @@ -87,16 +83,12 @@ public class RefreshEndpointTests { @Test @Ignore // FIXME: legacy public void keysComputedWhenOveridden() throws Exception { - this.context = new SpringApplicationBuilder(Empty.class) - .web(WebApplicationType.NONE).bannerMode(Mode.OFF) - .properties("spring.config.use-legacy-processing=true", - "spring.cloud.bootstrap.name:none") - .run(); + this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF) + .properties("spring.config.use-legacy-processing=true", "spring.cloud.bootstrap.name:none").run(); RefreshScope scope = new RefreshScope(); scope.setApplicationContext(this.context); this.context.getEnvironment().setActiveProfiles("override"); - ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); Collection keys = endpoint.refresh(); then(keys.contains("message")).isTrue().as("Wrong keys: " + keys); @@ -105,19 +97,13 @@ public class RefreshEndpointTests { @Test @Ignore // FIXME: legacy public void keysComputedWhenChangesInExternalProperties() throws Exception { - this.context = new SpringApplicationBuilder(Empty.class) - .web(WebApplicationType.NONE).bannerMode(Mode.OFF) - .properties("spring.cloud.bootstrap.name:none", - "spring.config.use-legacy-processing=true") - .run(); + this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF) + .properties("spring.cloud.bootstrap.name:none", "spring.config.use-legacy-processing=true").run(); RefreshScope scope = new RefreshScope(); scope.setApplicationContext(this.context); - TestPropertyValues - .of("spring.cloud.bootstrap.sources=" - + ExternalPropertySourceLocator.class.getName()) + TestPropertyValues.of("spring.cloud.bootstrap.sources=" + ExternalPropertySourceLocator.class.getName()) .applyTo(this.context.getEnvironment(), Type.MAP, "defaultProperties"); - ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); Collection keys = endpoint.refresh(); then(keys.contains("external.message")).isTrue().as("Wrong keys: " + keys); @@ -125,20 +111,16 @@ public class RefreshEndpointTests { @Test public void springMainSourcesEmptyInRefreshCycle() throws Exception { - this.context = new SpringApplicationBuilder(Empty.class) - .web(WebApplicationType.NONE).bannerMode(Mode.OFF) + this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF) .properties("spring.cloud.bootstrap.name:none").run(); RefreshScope scope = new RefreshScope(); scope.setApplicationContext(this.context); // spring.main.sources should be empty when the refresh cycle starts (we don't // want any config files from the application context getting into the one used to // construct the environment for refresh) - TestPropertyValues - .of("spring.main.sources=" - + ExternalPropertySourceLocator.class.getName()) + TestPropertyValues.of("spring.main.sources=" + ExternalPropertySourceLocator.class.getName()) .applyTo(this.context); - ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); Collection keys = endpoint.refresh(); then(keys.contains("external.message")).as("Wrong keys: " + keys).isFalse(); @@ -146,12 +128,11 @@ public class RefreshEndpointTests { @Test public void eventsPublishedInOrder() throws Exception { - this.context = new SpringApplicationBuilder(Empty.class) - .web(WebApplicationType.NONE).bannerMode(Mode.OFF).run(); + this.context = new SpringApplicationBuilder(Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF) + .run(); RefreshScope scope = new RefreshScope(); scope.setApplicationContext(this.context); - ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(this.context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); Empty empty = this.context.getBean(Empty.class); endpoint.refresh(); @@ -162,12 +143,11 @@ public class RefreshEndpointTests { @Test public void shutdownHooksCleaned() { - try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - Empty.class).web(WebApplicationType.NONE).bannerMode(Mode.OFF).run()) { + try (ConfigurableApplicationContext context = new SpringApplicationBuilder(Empty.class) + .web(WebApplicationType.NONE).bannerMode(Mode.OFF).run()) { RefreshScope scope = new RefreshScope(); scope.setApplicationContext(context); - ContextRefresher contextRefresher = new LegacyContextRefresher(context, - scope); + ContextRefresher contextRefresher = new LegacyContextRefresher(context, scope); RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher); int count = countShutdownHooks(); endpoint.refresh(); @@ -177,8 +157,7 @@ public class RefreshEndpointTests { } private int countShutdownHooks() { - Class type = ClassUtils.resolveClassName("java.lang.ApplicationShutdownHooks", - null); + Class type = ClassUtils.resolveClassName("java.lang.ApplicationShutdownHooks", null); Field field = ReflectionUtils.findField(type, "hooks"); ReflectionUtils.makeAccessible(field); @SuppressWarnings("rawtypes") @@ -199,8 +178,7 @@ public class RefreshEndpointTests { @Override public void onApplicationEvent(ApplicationEvent event) { - if (event instanceof EnvironmentChangeEvent - || event instanceof RefreshScopeRefreshedEvent) { + if (event instanceof EnvironmentChangeEvent || event instanceof RefreshScopeRefreshedEvent) { this.events.add(event); } } @@ -208,13 +186,12 @@ public class RefreshEndpointTests { } @Component - protected static class ExternalPropertySourceLocator - implements PropertySourceLocator { + protected static class ExternalPropertySourceLocator implements PropertySourceLocator { @Override public PropertySource locate(Environment environment) { - return new MapPropertySource("external", Collections - .singletonMap("external.message", "I'm External")); + return new MapPropertySource("external", + Collections.singletonMap("external.message", "I'm External")); } } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/health/RefreshScopeHealthIndicatorTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/health/RefreshScopeHealthIndicatorTests.java index 1208bd4a..c9046519 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/health/RefreshScopeHealthIndicatorTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/health/RefreshScopeHealthIndicatorTests.java @@ -39,13 +39,11 @@ public class RefreshScopeHealthIndicatorTests { @SuppressWarnings("unchecked") private ObjectProvider scopeProvider = mock(ObjectProvider.class); - private ConfigurationPropertiesRebinder rebinder = mock( - ConfigurationPropertiesRebinder.class); + private ConfigurationPropertiesRebinder rebinder = mock(ConfigurationPropertiesRebinder.class); private RefreshScope scope = mock(RefreshScope.class); - private RefreshScopeHealthIndicator indicator = new RefreshScopeHealthIndicator( - this.scopeProvider, this.rebinder); + private RefreshScopeHealthIndicator indicator = new RefreshScopeHealthIndicator(this.scopeProvider, this.rebinder); @Before public void init() { @@ -61,24 +59,20 @@ public class RefreshScopeHealthIndicatorTests { @Test public void binderError() { - when(this.rebinder.getErrors()) - .thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); + when(this.rebinder.getErrors()).thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); then(this.indicator.health().getStatus()).isEqualTo(Status.DOWN); } @Test public void scopeError() { - when(this.scope.getErrors()) - .thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); + when(this.scope.getErrors()).thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); then(this.indicator.health().getStatus()).isEqualTo(Status.DOWN); } @Test public void bothError() { - when(this.rebinder.getErrors()) - .thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); - when(this.scope.getErrors()) - .thenReturn(Collections.singletonMap("bar", new RuntimeException("BAR"))); + when(this.rebinder.getErrors()).thenReturn(Collections.singletonMap("foo", new RuntimeException("FOO"))); + when(this.scope.getErrors()).thenReturn(Collections.singletonMap("bar", new RuntimeException("BAR"))); then(this.indicator.health().getStatus()).isEqualTo(Status.DOWN); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java index 7117d3f5..ff1aaff7 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/logging/LoggingRebinderTests.java @@ -45,16 +45,14 @@ public class LoggingRebinderTests { @After public void reset() { - LoggingSystem.get(getClass().getClassLoader()) - .setLogLevel("org.springframework.web", LogLevel.INFO); + LoggingSystem.get(getClass().getClassLoader()).setLogLevel("org.springframework.web", LogLevel.INFO); } @Test public void logLevelsChanged() { then(this.logger.isTraceEnabled()).isFalse(); StandardEnvironment environment = new StandardEnvironment(); - TestPropertyValues.of("logging.level.org.springframework.web=TRACE") - .applyTo(environment); + TestPropertyValues.of("logging.level.org.springframework.web=TRACE").applyTo(environment); this.rebinder.setEnvironment(environment); this.rebinder.onApplicationEvent(new EnvironmentChangeEvent(environment, Collections.singleton("logging.level.org.springframework.web"))); @@ -65,8 +63,7 @@ public class LoggingRebinderTests { public void logLevelsLowerCase() { then(this.logger.isTraceEnabled()).isFalse(); StandardEnvironment environment = new StandardEnvironment(); - TestPropertyValues.of("logging.level.org.springframework.web=trace") - .applyTo(environment); + TestPropertyValues.of("logging.level.org.springframework.web=trace").applyTo(environment); this.rebinder.setEnvironment(environment); this.rebinder.onApplicationEvent(new EnvironmentChangeEvent(environment, Collections.singleton("logging.level.org.springframework.web"))); @@ -78,8 +75,7 @@ public class LoggingRebinderTests { ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory .getLogger("org.springframework.cloud"); StandardEnvironment environment = new StandardEnvironment(); - TestPropertyValues.of("logging.level.org.springframework.cloud=false") - .applyTo(environment); + TestPropertyValues.of("logging.level.org.springframework.cloud=false").applyTo(environment); rebinder.setEnvironment(environment); rebinder.onApplicationEvent(new EnvironmentChangeEvent(environment, Collections.singleton("logging.level.org.springframework.cloud"))); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java index f97d1455..cbe3687e 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/util/random/CachedRandomPropertySourceTests.java @@ -67,10 +67,8 @@ public class CachedRandomPropertySourceTests { then(cachedRandomPropertySource.getProperty("foo.app.long")).isNull(); then(cachedRandomPropertySource.getProperty("cachedrandom.app")).isNull(); - then(cachedRandomPropertySource.getProperty("cachedrandom.app.long")) - .isEqualTo(1234L); - then(cachedRandomPropertySource.getProperty("cachedrandom.foo.long")) - .isEqualTo(5678L); + then(cachedRandomPropertySource.getProperty("cachedrandom.app.long")).isEqualTo(1234L); + then(cachedRandomPropertySource.getProperty("cachedrandom.foo.long")).isEqualTo(5678L); verify(spyedCache, times(1)).computeIfAbsent(eq("app"), isA(Function.class)); verify(spyedTypeCache, times(1)).computeIfAbsent(eq("long"), isA(Function.class)); } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java index e6bf1292..124bbff0 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java @@ -48,12 +48,11 @@ public class LoadBalancerClientConfiguration { @Bean @ConditionalOnMissingBean - public ReactorLoadBalancer reactorServiceInstanceLoadBalancer( - Environment environment, + public ReactorLoadBalancer reactorServiceInstanceLoadBalancer(Environment environment, LoadBalancerClientFactory loadBalancerClientFactory) { String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME); - return new RoundRobinLoadBalancer(loadBalancerClientFactory.getLazyProvider(name, - ServiceInstanceListSupplier.class), name); + return new RoundRobinLoadBalancer( + loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), name); } @Configuration(proxyBeanMethods = false) @@ -64,34 +63,31 @@ public class LoadBalancerClientConfiguration { @Bean @ConditionalOnBean(ReactiveDiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "default", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", + matchIfMissing = true) public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withDiscoveryClient() - .withCaching().build(context); + return ServiceInstanceListSupplier.builder().withDiscoveryClient().withCaching().build(context); } @Bean @ConditionalOnBean(ReactiveDiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "zone-preference") + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "zone-preference") public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier( ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withDiscoveryClient() - .withZonePreference().withCaching().build(context); + return ServiceInstanceListSupplier.builder().withDiscoveryClient().withZonePreference().withCaching() + .build(context); } @Bean @ConditionalOnBean(ReactiveDiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "health-check") + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "health-check") public ServiceInstanceListSupplier healthCheckDiscoveryClientServiceInstanceListSupplier( ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withDiscoveryClient() - .withHealthChecks().withCaching().build(context); + return ServiceInstanceListSupplier.builder().withDiscoveryClient().withHealthChecks().withCaching() + .build(context); } } @@ -104,34 +100,31 @@ public class LoadBalancerClientConfiguration { @Bean @ConditionalOnBean(DiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "default", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", + matchIfMissing = true) public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient() + return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withCaching().build(context); + } + + @Bean + @ConditionalOnBean(DiscoveryClient.class) + @ConditionalOnMissingBean + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "zone-preference") + public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier( + ConfigurableApplicationContext context) { + return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withZonePreference() .withCaching().build(context); } @Bean @ConditionalOnBean(DiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "zone-preference") - public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier( - ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient() - .withZonePreference().withCaching().build(context); - } - - @Bean - @ConditionalOnBean(DiscoveryClient.class) - @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", - havingValue = "health-check") + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "health-check") public ServiceInstanceListSupplier healthCheckDiscoveryClientServiceInstanceListSupplier( ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient() - .withHealthChecks().withCaching().build(context); + return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withHealthChecks().withCaching() + .build(context); } } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationRegistrar.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationRegistrar.java index 392eba84..a85e1607 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationRegistrar.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationRegistrar.java @@ -28,8 +28,7 @@ import org.springframework.util.StringUtils; /** * @author Dave Syer */ -public class LoadBalancerClientConfigurationRegistrar - implements ImportBeanDefinitionRegistrar { +public class LoadBalancerClientConfigurationRegistrar implements ImportBeanDefinitionRegistrar { private static String getClientName(Map client) { if (client == null) { @@ -42,30 +41,25 @@ public class LoadBalancerClientConfigurationRegistrar if (StringUtils.hasText(value)) { return value; } - throw new IllegalStateException( - "Either 'name' or 'value' must be provided in @LoadBalancerClient"); + throw new IllegalStateException("Either 'name' or 'value' must be provided in @LoadBalancerClient"); } - private static void registerClientConfiguration(BeanDefinitionRegistry registry, - Object name, Object configuration) { + private static void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, + Object configuration) { BeanDefinitionBuilder builder = BeanDefinitionBuilder .genericBeanDefinition(LoadBalancerClientSpecification.class); builder.addConstructorArgValue(name); builder.addConstructorArgValue(configuration); - registry.registerBeanDefinition(name + ".LoadBalancerClientSpecification", - builder.getBeanDefinition()); + registry.registerBeanDefinition(name + ".LoadBalancerClientSpecification", builder.getBeanDefinition()); } @Override - public void registerBeanDefinitions(AnnotationMetadata metadata, - BeanDefinitionRegistry registry) { - Map attrs = metadata - .getAnnotationAttributes(LoadBalancerClients.class.getName(), true); + public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { + Map attrs = metadata.getAnnotationAttributes(LoadBalancerClients.class.getName(), true); if (attrs != null && attrs.containsKey("value")) { AnnotationAttributes[] clients = (AnnotationAttributes[]) attrs.get("value"); for (AnnotationAttributes client : clients) { - registerClientConfiguration(registry, getClientName(client), - client.get("configuration")); + registerClientConfiguration(registry, getClientName(client), client.get("configuration")); } } if (attrs != null && attrs.containsKey("defaultConfiguration")) { @@ -76,11 +70,9 @@ public class LoadBalancerClientConfigurationRegistrar else { name = "default." + metadata.getClassName(); } - registerClientConfiguration(registry, name, - attrs.get("defaultConfiguration")); + registerClientConfiguration(registry, name, attrs.get("defaultConfiguration")); } - Map client = metadata - .getAnnotationAttributes(LoadBalancerClient.class.getName(), true); + Map client = metadata.getAnnotationAttributes(LoadBalancerClient.class.getName(), true); String name = getClientName(client); if (name != null) { registerClientConfiguration(registry, name, client.get("configuration")); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientSpecification.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientSpecification.java index 0ad53685..81a5b5f7 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientSpecification.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientSpecification.java @@ -26,8 +26,7 @@ import org.springframework.util.Assert; /** * @author Dave Syer */ -public class LoadBalancerClientSpecification - implements NamedContextFactory.Specification { +public class LoadBalancerClientSpecification implements NamedContextFactory.Specification { private String name; @@ -78,8 +77,7 @@ public class LoadBalancerClientSpecification return false; } LoadBalancerClientSpecification that = (LoadBalancerClientSpecification) o; - return Objects.equals(this.name, that.name) - && Arrays.equals(this.configuration, that.configuration); + return Objects.equals(this.name, that.name) && Arrays.equals(this.configuration, that.configuration); } @Override diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java index 3dbdba77..64db80dd 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java @@ -63,53 +63,46 @@ public class BlockingLoadBalancerClient implements LoadBalancerClient { } @Override - public T execute(String serviceId, LoadBalancerRequest request) - throws IOException { + public T execute(String serviceId, LoadBalancerRequest request) throws IOException { String hint = getHint(serviceId); DefaultRequest lbRequest = new DefaultRequest<>( new DefaultRequestContext(request, hint)); Set supportedLifecycleProcessors = LoadBalancerLifecycleValidator .getSupportedLifecycleProcessors( - loadBalancerClientFactory.getInstances(serviceId, - LoadBalancerLifecycle.class), + loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.class), DefaultRequestContext.class, Object.class, ServiceInstance.class); supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onStart(lbRequest)); ServiceInstance serviceInstance = choose(serviceId, lbRequest); if (serviceInstance == null) { - supportedLifecycleProcessors - .forEach(lifecycle -> lifecycle.onComplete(new CompletionContext<>( - CompletionContext.Status.DISCARD, new EmptyResponse()))); + supportedLifecycleProcessors.forEach(lifecycle -> lifecycle + .onComplete(new CompletionContext<>(CompletionContext.Status.DISCARD, new EmptyResponse()))); throw new IllegalStateException("No instances available for " + serviceId); } return execute(serviceId, serviceInstance, request); } @Override - public T execute(String serviceId, ServiceInstance serviceInstance, - LoadBalancerRequest request) throws IOException { + public T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest request) + throws IOException { DefaultResponse defaultResponse = new DefaultResponse(serviceInstance); Set supportedLifecycleProcessors = LoadBalancerLifecycleValidator .getSupportedLifecycleProcessors( - loadBalancerClientFactory.getInstances(serviceId, - LoadBalancerLifecycle.class), + loadBalancerClientFactory.getInstances(serviceId, LoadBalancerLifecycle.class), DefaultRequestContext.class, Object.class, ServiceInstance.class); try { T response = request.apply(serviceInstance); supportedLifecycleProcessors.forEach(lifecycle -> lifecycle - .onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS, - defaultResponse, response))); + .onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS, defaultResponse, response))); return response; } catch (IOException iOException) { - supportedLifecycleProcessors.forEach(lifecycle -> lifecycle - .onComplete(new CompletionContext<>(CompletionContext.Status.FAILED, - iOException, defaultResponse))); + supportedLifecycleProcessors.forEach(lifecycle -> lifecycle.onComplete( + new CompletionContext<>(CompletionContext.Status.FAILED, iOException, defaultResponse))); throw iOException; } catch (Exception exception) { supportedLifecycleProcessors.forEach(lifecycle -> lifecycle - .onComplete(new CompletionContext<>(CompletionContext.Status.FAILED, - exception, defaultResponse))); + .onComplete(new CompletionContext<>(CompletionContext.Status.FAILED, exception, defaultResponse))); ReflectionUtils.rethrowRuntimeException(exception); } return null; @@ -127,13 +120,11 @@ public class BlockingLoadBalancerClient implements LoadBalancerClient { @Override public ServiceInstance choose(String serviceId, Request request) { - ReactiveLoadBalancer loadBalancer = loadBalancerClientFactory - .getInstance(serviceId); + ReactiveLoadBalancer loadBalancer = loadBalancerClientFactory.getInstance(serviceId); if (loadBalancer == null) { return null; } - Response loadBalancerResponse = Mono - .from(loadBalancer.choose(request)).block(); + Response loadBalancerResponse = Mono.from(loadBalancer.choose(request)).block(); if (loadBalancerResponse == null) { return null; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/CaffeineBasedLoadBalancerCacheManager.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/CaffeineBasedLoadBalancerCacheManager.java index 9ca2f89a..6cd85188 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/CaffeineBasedLoadBalancerCacheManager.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/CaffeineBasedLoadBalancerCacheManager.java @@ -33,11 +33,9 @@ import static org.springframework.cloud.loadbalancer.core.CachingServiceInstance * @see CaffeineCacheManager * @see Caffeine */ -public class CaffeineBasedLoadBalancerCacheManager extends CaffeineCacheManager - implements LoadBalancerCacheManager { +public class CaffeineBasedLoadBalancerCacheManager extends CaffeineCacheManager implements LoadBalancerCacheManager { - public CaffeineBasedLoadBalancerCacheManager(String cacheName, - LoadBalancerCacheProperties properties) { + public CaffeineBasedLoadBalancerCacheManager(String cacheName, LoadBalancerCacheProperties properties) { super(cacheName); if (!StringUtils.isEmpty(properties.getCaffeine().getSpec())) { setCacheSpecification(properties.getCaffeine().getSpec()); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java index aefe698e..94f24b7b 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCache.java @@ -50,8 +50,7 @@ public class DefaultLoadBalancerCache extends AbstractValueAdaptingCache { private final long evictMs; - DefaultLoadBalancerCache(String name, - ConcurrentMapWithTimedEviction cache, long evictMs, + DefaultLoadBalancerCache(String name, ConcurrentMapWithTimedEviction cache, long evictMs, boolean allowNullValues) { super(allowNullValues); Assert.notNull(name, "Name must not be null"); @@ -66,8 +65,7 @@ public class DefaultLoadBalancerCache extends AbstractValueAdaptingCache { * @param name the name of the cache */ public DefaultLoadBalancerCache(String name) { - this(name, new ConcurrentHashMapWithTimedEviction<>(256, - new DelayedTaskEvictionScheduler<>()), 0, true); + this(name, new ConcurrentHashMapWithTimedEviction<>(256, new DelayedTaskEvictionScheduler<>()), 0, true); } /** @@ -79,8 +77,8 @@ public class DefaultLoadBalancerCache extends AbstractValueAdaptingCache { * cache */ public DefaultLoadBalancerCache(String name, long evictMs, boolean allowNullValues) { - this(name, new ConcurrentHashMapWithTimedEviction<>(256, - new DelayedTaskEvictionScheduler<>()), evictMs, allowNullValues); + this(name, new ConcurrentHashMapWithTimedEviction<>(256, new DelayedTaskEvictionScheduler<>()), evictMs, + allowNullValues); } /** @@ -90,8 +88,8 @@ public class DefaultLoadBalancerCache extends AbstractValueAdaptingCache { * cache */ public DefaultLoadBalancerCache(String name, boolean allowNullValues) { - this(name, new ConcurrentHashMapWithTimedEviction<>(256, - new DelayedTaskEvictionScheduler<>()), 0, allowNullValues); + this(name, new ConcurrentHashMapWithTimedEviction<>(256, new DelayedTaskEvictionScheduler<>()), 0, + allowNullValues); } @Override diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java index 334db181..f92a9e71 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManager.java @@ -49,16 +49,13 @@ public class DefaultLoadBalancerCacheManager implements LoadBalancerCacheManager private final ConcurrentMap cacheMap = new ConcurrentHashMap<>(16); - public DefaultLoadBalancerCacheManager( - LoadBalancerCacheProperties loadBalancerCacheProperties, + public DefaultLoadBalancerCacheManager(LoadBalancerCacheProperties loadBalancerCacheProperties, String... cacheNames) { cacheMap.putAll(createCaches(cacheNames, loadBalancerCacheProperties).stream() - .collect(Collectors.toMap(DefaultLoadBalancerCache::getName, - cache -> cache))); + .collect(Collectors.toMap(DefaultLoadBalancerCache::getName, cache -> cache))); } - public DefaultLoadBalancerCacheManager( - LoadBalancerCacheProperties loadBalancerCacheProperties) { + public DefaultLoadBalancerCacheManager(LoadBalancerCacheProperties loadBalancerCacheProperties) { this(loadBalancerCacheProperties, SERVICE_INSTANCE_CACHE_NAME); } @@ -66,8 +63,7 @@ public class DefaultLoadBalancerCacheManager implements LoadBalancerCacheManager LoadBalancerCacheProperties loadBalancerCacheProperties) { return Arrays.stream(cacheNames).distinct() .map(name -> new DefaultLoadBalancerCache(name, - new ConcurrentHashMapWithTimedEviction<>( - loadBalancerCacheProperties.getCapacity(), + new ConcurrentHashMapWithTimedEviction<>(loadBalancerCacheProperties.getCapacity(), new DelayedTaskEvictionScheduler<>()), loadBalancerCacheProperties.getTtl().toMillis(), false)) .collect(Collectors.toSet()); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java index 8200e16e..7896c76f 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java @@ -40,8 +40,7 @@ import org.springframework.web.client.RestTemplate; @Configuration(proxyBeanMethods = false) @LoadBalancerClients @AutoConfigureAfter(LoadBalancerAutoConfiguration.class) -@AutoConfigureBefore({ - org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration.class, +@AutoConfigureBefore({ org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration.class, AsyncLoadBalancerAutoConfiguration.class }) @ConditionalOnClass(RestTemplate.class) public class BlockingLoadBalancerClientAutoConfiguration { @@ -49,8 +48,7 @@ public class BlockingLoadBalancerClientAutoConfiguration { @Bean @ConditionalOnBean(LoadBalancerClientFactory.class) @ConditionalOnMissingBean - public LoadBalancerClient blockingLoadBalancerClient( - LoadBalancerClientFactory loadBalancerClientFactory, + public LoadBalancerClient blockingLoadBalancerClient(LoadBalancerClientFactory loadBalancerClientFactory, LoadBalancerProperties properties) { return new BlockingLoadBalancerClient(loadBalancerClientFactory, properties); } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java index 2891fdab..59310a6d 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java @@ -46,24 +46,21 @@ public class LoadBalancerAutoConfiguration { private final ObjectProvider> configurations; - public LoadBalancerAutoConfiguration( - ObjectProvider> configurations) { + public LoadBalancerAutoConfiguration(ObjectProvider> configurations) { this.configurations = configurations; } @Bean @ConditionalOnMissingBean public LoadBalancerZoneConfig zoneConfig(Environment environment) { - return new LoadBalancerZoneConfig( - environment.getProperty("spring.cloud.loadbalancer.zone")); + return new LoadBalancerZoneConfig(environment.getProperty("spring.cloud.loadbalancer.zone")); } @ConditionalOnMissingBean @Bean public LoadBalancerClientFactory loadBalancerClientFactory() { LoadBalancerClientFactory clientFactory = new LoadBalancerClientFactory(); - clientFactory.setConfigurations( - this.configurations.getIfAvailable(Collections::emptyList)); + clientFactory.setConfigurations(this.configurations.getIfAvailable(Collections::emptyList)); return clientFactory; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java index e1cfdaa2..ab616743 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java @@ -54,8 +54,7 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ CacheManager.class, CacheAutoConfiguration.class }) @AutoConfigureAfter(CacheAutoConfiguration.class) -@ConditionalOnProperty(value = "spring.cloud.loadbalancer.cache.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.loadbalancer.cache.enabled", matchIfMissing = true) @EnableConfigurationProperties(LoadBalancerCacheProperties.class) public class LoadBalancerCacheAutoConfiguration { @@ -72,15 +71,13 @@ public class LoadBalancerCacheAutoConfiguration { static class LoadBalancerCaffeineWarnLogger { - private static final Log LOG = LogFactory - .getLog(LoadBalancerCaffeineWarnLogger.class); + private static final Log LOG = LogFactory.getLog(LoadBalancerCaffeineWarnLogger.class); @PostConstruct void logWarning() { if (LOG.isWarnEnabled()) { - LOG.warn( - "Spring Cloud LoadBalancer is currently working with the default cache. " - + "You can switch to using Caffeine cache, by adding it to the classpath."); + LOG.warn("Spring Cloud LoadBalancer is currently working with the default cache. " + + "You can switch to using Caffeine cache, by adding it to the classpath."); } } @@ -92,8 +89,7 @@ public class LoadBalancerCacheAutoConfiguration { @Bean(autowireCandidate = false) @ConditionalOnMissingBean - LoadBalancerCacheManager caffeineLoadBalancerCacheManager( - LoadBalancerCacheProperties cacheProperties) { + LoadBalancerCacheManager caffeineLoadBalancerCacheManager(LoadBalancerCacheProperties cacheProperties) { return new CaffeineBasedLoadBalancerCacheManager(cacheProperties); } @@ -106,8 +102,7 @@ public class LoadBalancerCacheAutoConfiguration { @Bean(autowireCandidate = false) @ConditionalOnMissingBean - LoadBalancerCacheManager defaultLoadBalancerCacheManager( - LoadBalancerCacheProperties cacheProperties) { + LoadBalancerCacheManager defaultLoadBalancerCacheManager(LoadBalancerCacheProperties cacheProperties) { return new DefaultLoadBalancerCacheManager(cacheProperties); } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplier.java index a9fcc362..2554f766 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplier.java @@ -37,23 +37,20 @@ import org.springframework.cloud.client.ServiceInstance; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -public class CachingServiceInstanceListSupplier - extends DelegatingServiceInstanceListSupplier { +public class CachingServiceInstanceListSupplier extends DelegatingServiceInstanceListSupplier { - private static final Log log = LogFactory - .getLog(CachingServiceInstanceListSupplier.class); + private static final Log log = LogFactory.getLog(CachingServiceInstanceListSupplier.class); /** * Name of the service cache instance. */ - public static final String SERVICE_INSTANCE_CACHE_NAME = CachingServiceInstanceListSupplier.class - .getSimpleName() + "Cache"; + public static final String SERVICE_INSTANCE_CACHE_NAME = CachingServiceInstanceListSupplier.class.getSimpleName() + + "Cache"; private final Flux> serviceInstances; @SuppressWarnings("unchecked") - public CachingServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, - CacheManager cacheManager) { + public CachingServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, CacheManager cacheManager) { super(delegate); this.serviceInstances = CacheFlux.lookup(key -> { // TODO: configurable cache name @@ -70,20 +67,17 @@ public class CachingServiceInstanceListSupplier } return Flux.just(list).materialize().collectList(); }, delegate.getServiceId()).onCacheMissResume(delegate.get().take(1)) - .andWriteWith((key, signals) -> Flux.fromIterable(signals).dematerialize() - .doOnNext(instances -> { - Cache cache = cacheManager - .getCache(SERVICE_INSTANCE_CACHE_NAME); - if (cache == null) { - if (log.isErrorEnabled()) { - log.error("Unable to find cache for writing: " - + SERVICE_INSTANCE_CACHE_NAME); - } - } - else { - cache.put(key, instances); - } - }).then()); + .andWriteWith((key, signals) -> Flux.fromIterable(signals).dematerialize().doOnNext(instances -> { + Cache cache = cacheManager.getCache(SERVICE_INSTANCE_CACHE_NAME); + if (cache == null) { + if (log.isErrorEnabled()) { + log.error("Unable to find cache for writing: " + SERVICE_INSTANCE_CACHE_NAME); + } + } + else { + cache.put(key, instances); + } + }).then()); } @Override diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java index 79d22a95..4c0f456e 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java @@ -41,16 +41,14 @@ import static org.springframework.cloud.loadbalancer.support.LoadBalancerClientF * @author Tim Ysewyn * @since 2.2.0 */ -public class DiscoveryClientServiceInstanceListSupplier - implements ServiceInstanceListSupplier { +public class DiscoveryClientServiceInstanceListSupplier implements ServiceInstanceListSupplier { /** * Property that establishes the timeout for calls to service discovery. */ public static final String SERVICE_DISCOVERY_TIMEOUT = "spring.cloud.loadbalancer.service-discovery.timeout"; - private static final Log LOG = LogFactory - .getLog(DiscoveryClientServiceInstanceListSupplier.class); + private static final Log LOG = LogFactory.getLog(DiscoveryClientServiceInstanceListSupplier.class); private Duration timeout = Duration.ofSeconds(30); @@ -58,14 +56,11 @@ public class DiscoveryClientServiceInstanceListSupplier private final Flux> serviceInstances; - public DiscoveryClientServiceInstanceListSupplier(DiscoveryClient delegate, - Environment environment) { + public DiscoveryClientServiceInstanceListSupplier(DiscoveryClient delegate, Environment environment) { this.serviceId = environment.getProperty(PROPERTY_NAME); resolveTimeout(environment); - this.serviceInstances = Flux - .defer(() -> Flux.just(delegate.getInstances(serviceId))) - .subscribeOn(Schedulers.boundedElastic()) - .timeout(timeout, Flux.defer(() -> { + this.serviceInstances = Flux.defer(() -> Flux.just(delegate.getInstances(serviceId))) + .subscribeOn(Schedulers.boundedElastic()).timeout(timeout, Flux.defer(() -> { logTimeout(); return Flux.just(new ArrayList<>()); })).onErrorResume(error -> { @@ -74,12 +69,11 @@ public class DiscoveryClientServiceInstanceListSupplier }); } - public DiscoveryClientServiceInstanceListSupplier(ReactiveDiscoveryClient delegate, - Environment environment) { + public DiscoveryClientServiceInstanceListSupplier(ReactiveDiscoveryClient delegate, Environment environment) { this.serviceId = environment.getProperty(PROPERTY_NAME); resolveTimeout(environment); - this.serviceInstances = Flux.defer(() -> delegate.getInstances(serviceId) - .collectList().flux().timeout(timeout, Flux.defer(() -> { + this.serviceInstances = Flux + .defer(() -> delegate.getInstances(serviceId).collectList().flux().timeout(timeout, Flux.defer(() -> { logTimeout(); return Flux.just(new ArrayList<>()); })).onErrorResume(error -> { @@ -107,18 +101,14 @@ public class DiscoveryClientServiceInstanceListSupplier private void logTimeout() { if (LOG.isDebugEnabled()) { - LOG.debug(String.format( - "Timeout occurred while retrieving instances for service %s." - + "The instances could not be retrieved during %s", - serviceId, timeout)); + LOG.debug(String.format("Timeout occurred while retrieving instances for service %s." + + "The instances could not be retrieved during %s", serviceId, timeout)); } } private void logException(Throwable error) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format( - "Exception occurred while retrieving instances for service %s", - serviceId), error); + LOG.debug(String.format("Exception occurred while retrieving instances for service %s", serviceId), error); } } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java index a310ef05..5db173a1 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplier.java @@ -43,12 +43,10 @@ import org.springframework.web.util.UriComponentsBuilder; * @author Roman Matiushchenko * @since 2.2.0 */ -public class HealthCheckServiceInstanceListSupplier - extends DelegatingServiceInstanceListSupplier +public class HealthCheckServiceInstanceListSupplier extends DelegatingServiceInstanceListSupplier implements InitializingBean, DisposableBean { - private static final Log LOG = LogFactory - .getLog(HealthCheckServiceInstanceListSupplier.class); + private static final Log LOG = LogFactory.getLog(HealthCheckServiceInstanceListSupplier.class); private final LoadBalancerProperties.HealthCheck healthCheck; @@ -64,13 +62,11 @@ public class HealthCheckServiceInstanceListSupplier LoadBalancerProperties.HealthCheck healthCheck, WebClient webClient) { super(delegate); this.healthCheck = healthCheck; - defaultHealthCheckPath = healthCheck.getPath().getOrDefault("default", - "/actuator/health"); + defaultHealthCheckPath = healthCheck.getPath().getOrDefault("default", "/actuator/health"); this.webClient = webClient; - aliveInstancesReplay = Flux.defer(delegate) - .delaySubscription(healthCheck.getInitialDelay()) - .switchMap(serviceInstances -> healthCheckFlux(serviceInstances).map( - alive -> Collections.unmodifiableList(new ArrayList<>(alive)))) + aliveInstancesReplay = Flux.defer(delegate).delaySubscription(healthCheck.getInitialDelay()) + .switchMap(serviceInstances -> healthCheckFlux(serviceInstances) + .map(alive -> Collections.unmodifiableList(new ArrayList<>(alive)))) .replay(1).refCount(1); } @@ -83,8 +79,7 @@ public class HealthCheckServiceInstanceListSupplier this.healthCheckDisposable = aliveInstancesReplay.subscribe(); } - protected Flux> healthCheckFlux( - List instances) { + protected Flux> healthCheckFlux(List instances) { return Flux.defer(() -> { List> checks = new ArrayList<>(instances.size()); for (ServiceInstance instance : instances) { @@ -99,8 +94,7 @@ public class HealthCheckServiceInstanceListSupplier if (LOG.isDebugEnabled()) { LOG.debug(String.format( "The instance for service %s: %s did not respond for %s during health check", - instance.getServiceId(), instance.getUri(), - healthCheck.getInterval())); + instance.getServiceId(), instance.getUri(), healthCheck.getInterval())); } return Mono.empty(); })).handle((isHealthy, sink) -> { @@ -125,16 +119,12 @@ public class HealthCheckServiceInstanceListSupplier } protected Mono isAlive(ServiceInstance serviceInstance) { - String healthCheckPropertyValue = healthCheck.getPath() - .get(serviceInstance.getServiceId()); - String healthCheckPath = healthCheckPropertyValue != null - ? healthCheckPropertyValue : defaultHealthCheckPath; + String healthCheckPropertyValue = healthCheck.getPath().get(serviceInstance.getServiceId()); + String healthCheckPath = healthCheckPropertyValue != null ? healthCheckPropertyValue : defaultHealthCheckPath; return webClient.get() - .uri(UriComponentsBuilder.fromUri(serviceInstance.getUri()) - .path(healthCheckPath).build().toUri()) - .exchange() - .flatMap(clientResponse -> clientResponse.releaseBody().thenReturn( - HttpStatus.OK.value() == clientResponse.rawStatusCode())); + .uri(UriComponentsBuilder.fromUri(serviceInstance.getUri()).path(healthCheckPath).build().toUri()) + .exchange().flatMap(clientResponse -> clientResponse.releaseBody() + .thenReturn(HttpStatus.OK.value() == clientResponse.rawStatusCode())); } @Override diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ReactorServiceInstanceLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ReactorServiceInstanceLoadBalancer.java index 4da18c0e..08373531 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ReactorServiceInstanceLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ReactorServiceInstanceLoadBalancer.java @@ -25,7 +25,6 @@ import org.springframework.cloud.client.ServiceInstance; * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -public interface ReactorServiceInstanceLoadBalancer - extends ReactorLoadBalancer { +public interface ReactorServiceInstanceLoadBalancer extends ReactorLoadBalancer { } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java index 3d8143f1..0d9cd0ae 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java @@ -52,8 +52,7 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance * {@link ServiceInstanceListSupplier} that will be used to get available instances * @param serviceId id of the service for which to choose an instance */ - public RoundRobinLoadBalancer( - ObjectProvider serviceInstanceListSupplierProvider, + public RoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId) { this(serviceInstanceListSupplierProvider, serviceId, new Random().nextInt(1000)); } @@ -64,8 +63,7 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance * @param serviceId id of the service for which to choose an instance * @param seedPosition Round Robin element position marker */ - public RoundRobinLoadBalancer( - ObjectProvider serviceInstanceListSupplierProvider, + public RoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId, int seedPosition) { this.serviceId = serviceId; this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; @@ -83,8 +81,7 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance return supplier.get().next().map(this::getInstanceResponse); } - private Response getInstanceResponse( - List instances) { + private Response getInstanceResponse(List instances) { if (instances.isEmpty()) { log.warn("No servers available for service: " + this.serviceId); return new EmptyResponse(); diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplier.java index 1b98fcbb..5f9c46e5 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplier.java @@ -34,8 +34,7 @@ import static org.springframework.cloud.loadbalancer.support.LoadBalancerClientF * @author Olga Maciaszek-Sharma * @since 2.2.0 */ -public interface ServiceInstanceListSupplier - extends Supplier>> { +public interface ServiceInstanceListSupplier extends Supplier>> { String getServiceId(); @@ -62,8 +61,7 @@ public interface ServiceInstanceListSupplier return new Builder(env); } - private FixedServiceInstanceListSupplier(String serviceId, - List instances) { + private FixedServiceInstanceListSupplier(String serviceId, List instances) { this.serviceId = serviceId; this.instances = instances; } @@ -99,8 +97,8 @@ public interface ServiceInstanceListSupplier } public SimpleBuilder instance(String host, int port) { - DefaultServiceInstance instance = new DefaultServiceInstance( - instanceId(serviceId, host, port), serviceId, host, port, false); + DefaultServiceInstance instance = new DefaultServiceInstance(instanceId(serviceId, host, port), + serviceId, host, port, false); return instance(instance); } @@ -135,8 +133,8 @@ public interface ServiceInstanceListSupplier } public Builder instance(String host, int port, String serviceId) { - DefaultServiceInstance instance = new DefaultServiceInstance( - instanceId(serviceId, host, port), serviceId, host, port, false); + DefaultServiceInstance instance = new DefaultServiceInstance(instanceId(serviceId, host, port), + serviceId, host, port, false); return instance(instance); } @@ -145,8 +143,7 @@ public interface ServiceInstanceListSupplier } public FixedServiceInstanceListSupplier build() { - return new FixedServiceInstanceListSupplier( - env.getProperty(PROPERTY_NAME), instances); + return new FixedServiceInstanceListSupplier(env.getProperty(PROPERTY_NAME), instances); } } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java index 8723d380..59626774 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java @@ -43,8 +43,7 @@ import org.springframework.web.reactive.function.client.WebClient; */ public final class ServiceInstanceListSupplierBuilder { - private static final Log LOG = LogFactory - .getLog(ServiceInstanceListSupplierBuilder.class); + private static final Log LOG = LogFactory.getLog(ServiceInstanceListSupplierBuilder.class); private Creator baseCreator; @@ -63,14 +62,12 @@ public final class ServiceInstanceListSupplierBuilder { */ public ServiceInstanceListSupplierBuilder withBlockingDiscoveryClient() { if (baseCreator != null && LOG.isWarnEnabled()) { - LOG.warn( - "Overriding a previously set baseCreator with a blocking DiscoveryClient baseCreator."); + LOG.warn("Overriding a previously set baseCreator with a blocking DiscoveryClient baseCreator."); } this.baseCreator = context -> { DiscoveryClient discoveryClient = context.getBean(DiscoveryClient.class); - return new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - context.getEnvironment()); + return new DiscoveryClientServiceInstanceListSupplier(discoveryClient, context.getEnvironment()); }; return this; } @@ -83,15 +80,12 @@ public final class ServiceInstanceListSupplierBuilder { */ public ServiceInstanceListSupplierBuilder withDiscoveryClient() { if (baseCreator != null && LOG.isWarnEnabled()) { - LOG.warn( - "Overriding a previously set baseCreator with a ReactiveDiscoveryClient baseCreator."); + LOG.warn("Overriding a previously set baseCreator with a ReactiveDiscoveryClient baseCreator."); } this.baseCreator = context -> { - ReactiveDiscoveryClient discoveryClient = context - .getBean(ReactiveDiscoveryClient.class); + ReactiveDiscoveryClient discoveryClient = context.getBean(ReactiveDiscoveryClient.class); - return new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - context.getEnvironment()); + return new DiscoveryClientServiceInstanceListSupplier(discoveryClient, context.getEnvironment()); }; return this; } @@ -102,8 +96,7 @@ public final class ServiceInstanceListSupplierBuilder { * @param supplier a user-provided {@link ServiceInstanceListSupplier} instance * @return the {@link ServiceInstanceListSupplierBuilder} object */ - public ServiceInstanceListSupplierBuilder withBase( - ServiceInstanceListSupplier supplier) { + public ServiceInstanceListSupplierBuilder withBase(ServiceInstanceListSupplier supplier) { this.baseCreator = context -> supplier; return this; } @@ -115,11 +108,9 @@ public final class ServiceInstanceListSupplierBuilder { */ public ServiceInstanceListSupplierBuilder withHealthChecks() { DelegateCreator creator = (context, delegate) -> { - LoadBalancerProperties properties = context - .getBean(LoadBalancerProperties.class); + LoadBalancerProperties properties = context.getBean(LoadBalancerProperties.class); WebClient.Builder webClient = context.getBean(WebClient.Builder.class); - return new HealthCheckServiceInstanceListSupplier(delegate, - properties.getHealthCheck(), webClient.build()); + return new HealthCheckServiceInstanceListSupplier(delegate, properties.getHealthCheck(), webClient.build()); }; this.creators.add(creator); return this; @@ -133,10 +124,8 @@ public final class ServiceInstanceListSupplierBuilder { */ public ServiceInstanceListSupplierBuilder withHealthChecks(WebClient webClient) { DelegateCreator creator = (context, delegate) -> { - LoadBalancerProperties properties = context - .getBean(LoadBalancerProperties.class); - return new HealthCheckServiceInstanceListSupplier(delegate, - properties.getHealthCheck(), webClient); + LoadBalancerProperties properties = context.getBean(LoadBalancerProperties.class); + return new HealthCheckServiceInstanceListSupplier(delegate, properties.getHealthCheck(), webClient); }; this.creators.add(creator); return this; @@ -149,8 +138,7 @@ public final class ServiceInstanceListSupplierBuilder { */ public ServiceInstanceListSupplierBuilder withZonePreference() { DelegateCreator creator = (context, delegate) -> { - LoadBalancerZoneConfig zoneConfig = context - .getBean(LoadBalancerZoneConfig.class); + LoadBalancerZoneConfig zoneConfig = context.getBean(LoadBalancerZoneConfig.class); return new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig); }; this.creators.add(creator); @@ -174,12 +162,10 @@ public final class ServiceInstanceListSupplierBuilder { ObjectProvider cacheManagerProvider = context .getBeanProvider(LoadBalancerCacheManager.class); if (cacheManagerProvider.getIfAvailable() != null) { - return new CachingServiceInstanceListSupplier(delegate, - cacheManagerProvider.getIfAvailable()); + return new CachingServiceInstanceListSupplier(delegate, cacheManagerProvider.getIfAvailable()); } if (LOG.isWarnEnabled()) { - LOG.warn( - "LoadBalancerCacheManager not available, returning delegate without caching."); + LOG.warn("LoadBalancerCacheManager not available, returning delegate without caching."); } return delegate; }; @@ -211,8 +197,7 @@ public final class ServiceInstanceListSupplierBuilder { * Allows creating a {@link ServiceInstanceListSupplier} instance based on provided * {@link ConfigurableApplicationContext}. */ - public interface Creator extends - Function { + public interface Creator extends Function { } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java index 76c6bbff..83ad66a7 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java @@ -35,8 +35,7 @@ import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig; * @author Olga Maciaszek-Sharma * @since 2.2.1 */ -public class ZonePreferenceServiceInstanceListSupplier - extends DelegatingServiceInstanceListSupplier { +public class ZonePreferenceServiceInstanceListSupplier extends DelegatingServiceInstanceListSupplier { private final String ZONE = "zone"; diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java index d24eec2b..518e1a98 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/LoadBalancerClientFactory.java @@ -33,8 +33,7 @@ import org.springframework.core.env.Environment; * @author Dave Syer * @author Olga Maciaszek-Sharma */ -public class LoadBalancerClientFactory - extends NamedContextFactory +public class LoadBalancerClientFactory extends NamedContextFactory implements ReactiveLoadBalancer.Factory { /** diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/ServiceInstanceListSuppliers.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/ServiceInstanceListSuppliers.java index f3ff1bf5..23eb359c 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/ServiceInstanceListSuppliers.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/support/ServiceInstanceListSuppliers.java @@ -37,8 +37,7 @@ public final class ServiceInstanceListSuppliers { throw new IllegalStateException("Can't instantiate a utility class"); } - public static ServiceInstanceListSupplier from(String serviceId, - ServiceInstance... instances) { + public static ServiceInstanceListSupplier from(String serviceId, ServiceInstance... instances) { return new ServiceInstanceListSupplier() { @Override public Flux> get() { diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java index 6f0d62c4..7ef9b190 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java @@ -45,24 +45,19 @@ import static org.assertj.core.api.BDDAssertions.then; class LoadBalancerClientConfigurationTests { ApplicationContextRunner reactiveDiscoveryClientRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of( - ReactiveCompositeDiscoveryClientAutoConfiguration.class, - LoadBalancerCacheAutoConfiguration.class, - LoadBalancerAutoConfiguration.class, + .withConfiguration(AutoConfigurations.of(ReactiveCompositeDiscoveryClientAutoConfiguration.class, + LoadBalancerCacheAutoConfiguration.class, LoadBalancerAutoConfiguration.class, LoadBalancerClientConfiguration.class)); ApplicationContextRunner blockingDiscoveryClientRunner = new ApplicationContextRunner() - .withConfiguration( - AutoConfigurations.of(CompositeDiscoveryClientAutoConfiguration.class, - LoadBalancerCacheAutoConfiguration.class, - LoadBalancerAutoConfiguration.class, - LoadBalancerClientConfiguration.class)); + .withConfiguration(AutoConfigurations.of(CompositeDiscoveryClientAutoConfiguration.class, + LoadBalancerCacheAutoConfiguration.class, LoadBalancerAutoConfiguration.class, + LoadBalancerClientConfiguration.class)); @Test void shouldInstantiateDefaultServiceInstanceListSupplierWhenConfigurationsPropertyNotSet() { reactiveDiscoveryClientRunner.run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); then(((DelegatingServiceInstanceListSupplier) supplier).getDelegate()) .isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); @@ -71,63 +66,49 @@ class LoadBalancerClientConfigurationTests { @Test void shouldInstantiateDefaultServiceInstanceListSupplier() { - reactiveDiscoveryClientRunner - .withPropertyValues("spring.cloud.loadbalancer.configurations=default") + reactiveDiscoveryClientRunner.withPropertyValues("spring.cloud.loadbalancer.configurations=default") .run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); then(((DelegatingServiceInstanceListSupplier) supplier).getDelegate()) - .isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); + .isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); }); } @Test void shouldInstantiateZonePreferenceServiceInstanceListSupplier() { - reactiveDiscoveryClientRunner - .withPropertyValues( - "spring.cloud.loadbalancer.configurations=zone-preference") + reactiveDiscoveryClientRunner.withPropertyValues("spring.cloud.loadbalancer.configurations=zone-preference") .run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier) .getDelegate(); - then(delegate).isInstanceOf( - ZonePreferenceServiceInstanceListSupplier.class); + then(delegate).isInstanceOf(ZonePreferenceServiceInstanceListSupplier.class); ServiceInstanceListSupplier secondDelegate = ((DelegatingServiceInstanceListSupplier) delegate) .getDelegate(); - then(secondDelegate).isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); + then(secondDelegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); }); } @Test void shouldInstantiateHealthCheckServiceInstanceListSupplier() { reactiveDiscoveryClientRunner.withUserConfiguration(TestConfig.class) - .withPropertyValues( - "spring.cloud.loadbalancer.configurations=health-check") - .run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + .withPropertyValues("spring.cloud.loadbalancer.configurations=health-check").run(context -> { + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier) .getDelegate(); - then(delegate) - .isInstanceOf(HealthCheckServiceInstanceListSupplier.class); + then(delegate).isInstanceOf(HealthCheckServiceInstanceListSupplier.class); ServiceInstanceListSupplier secondDelegate = ((DelegatingServiceInstanceListSupplier) delegate) .getDelegate(); - then(secondDelegate).isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); + then(secondDelegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); }); } @Test void shouldInstantiateDefaultBlockingServiceInstanceListSupplierWhenConfigurationsPropertyNotSet() { blockingDiscoveryClientRunner.run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); then(((DelegatingServiceInstanceListSupplier) supplier).getDelegate()) .isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); @@ -136,15 +117,12 @@ class LoadBalancerClientConfigurationTests { @Test void shouldInstantiateDefaultBlockingServiceInstanceListSupplier() { - blockingDiscoveryClientRunner - .withPropertyValues("spring.cloud.loadbalancer.configurations=default") + blockingDiscoveryClientRunner.withPropertyValues("spring.cloud.loadbalancer.configurations=default") .run(context -> { - ServiceInstanceListSupplier supplier = context - .getBean(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class); then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); then(((DelegatingServiceInstanceListSupplier) supplier).getDelegate()) - .isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); + .isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); }); } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java index 8834ebc8..251dccdb 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java @@ -78,10 +78,8 @@ class BlockingLoadBalancerClientTests { @BeforeEach void setUp() { - properties.getInstances().put("myservice", - Collections.singletonList( - new SimpleDiscoveryProperties.SimpleServiceInstance( - URI.create("https://test.example:9999")))); + properties.getInstances().put("myservice", Collections.singletonList( + new SimpleDiscoveryProperties.SimpleServiceInstance(URI.create("https://test.example:9999")))); } @Test @@ -99,11 +97,10 @@ class BlockingLoadBalancerClientTests { @Test void requestExecutedAgainstCorrectInstance() throws IOException { final String result = "result"; - Object actualResult = loadBalancerClient.execute("myservice", - (LoadBalancerRequest) instance -> { - assertThat(instance.getHost()).isEqualTo("test.example"); - return result; - }); + Object actualResult = loadBalancerClient.execute("myservice", (LoadBalancerRequest) instance -> { + assertThat(instance.getHost()).isEqualTo("test.example"); + return result; + }); assertThat(actualResult).isEqualTo(result); } @@ -155,12 +152,11 @@ class BlockingLoadBalancerClientTests { @Test void exceptionNotThrownWhenFactoryReturnsNullLifecycleProcessorsMap() { - assertThatCode( - () -> loadBalancerClient.execute("serviceWithNoLifecycleProcessors", - (LoadBalancerRequest) instance -> { - assertThat(instance.getHost()).isEqualTo("test.example"); - return "result"; - })).doesNotThrowAnyException(); + assertThatCode(() -> loadBalancerClient.execute("serviceWithNoLifecycleProcessors", + (LoadBalancerRequest) instance -> { + assertThat(instance.getHost()).isEqualTo("test.example"); + return "result"; + })).doesNotThrowAnyException(); } @Test @@ -168,33 +164,27 @@ class BlockingLoadBalancerClientTests { String callbackTestHint = "callbackTestHint"; loadBalancerProperties.getHint().put("myservice", "callbackTestHint"); final String result = "callbackTestResult"; - Object actualResult = loadBalancerClient.execute("myservice", - (LoadBalancerRequest) instance -> { - assertThat(instance.getHost()).isEqualTo("test.example"); - return result; - }); + Object actualResult = loadBalancerClient.execute("myservice", (LoadBalancerRequest) instance -> { + assertThat(instance.getHost()).isEqualTo("test.example"); + return result; + }); Collection> lifecycleLogRequests = ((TestLoadBalancerLifecycle) factory - .getInstances("myservice", LoadBalancerLifecycle.class) - .get("loadBalancerLifecycle")).getStartLog().values(); + .getInstances("myservice", LoadBalancerLifecycle.class).get("loadBalancerLifecycle")).getStartLog() + .values(); Collection> anotherLifecycleLogRequests = ((AnotherLoadBalancerLifecycle) factory - .getInstances("myservice", LoadBalancerLifecycle.class) - .get("anotherLoadBalancerLifecycle")).getCompleteLog().values(); + .getInstances("myservice", LoadBalancerLifecycle.class).get("anotherLoadBalancerLifecycle")) + .getCompleteLog().values(); assertThat(actualResult).isEqualTo(result); - assertThat(lifecycleLogRequests).extracting( - request -> ((DefaultRequestContext) request.getContext()).getHint()) + assertThat(lifecycleLogRequests).extracting(request -> ((DefaultRequestContext) request.getContext()).getHint()) .contains(callbackTestHint); - assertThat(anotherLifecycleLogRequests) - .extracting(CompletionContext::getClientResponse).contains(result); + assertThat(anotherLifecycleLogRequests).extracting(CompletionContext::getClientResponse).contains(result); } @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration - @LoadBalancerClients({ - @LoadBalancerClient(name = "myservice", - configuration = MyServiceConfig.class), - @LoadBalancerClient(name = "unknownservice", - configuration = UnknownServiceConfig.class), + @LoadBalancerClients({ @LoadBalancerClient(name = "myservice", configuration = MyServiceConfig.class), + @LoadBalancerClient(name = "unknownservice", configuration = UnknownServiceConfig.class), @LoadBalancerClient(name = "serviceWithNoLifecycleProcessors", configuration = NoLifecycleProcessorsConfig.class) }) protected static class Config { @@ -204,10 +194,8 @@ class BlockingLoadBalancerClientTests { protected static class NoLifecycleProcessorsConfig { @Bean - ReactorLoadBalancer reactiveLoadBalancer( - DiscoveryClient discoveryClient) { - return new DiscoveryClientBasedReactiveLoadBalancer("myservice", - discoveryClient); + ReactorLoadBalancer reactiveLoadBalancer(DiscoveryClient discoveryClient) { + return new DiscoveryClientBasedReactiveLoadBalancer("myservice", discoveryClient); } } @@ -215,10 +203,8 @@ class BlockingLoadBalancerClientTests { protected static class MyServiceConfig { @Bean - ReactorLoadBalancer reactiveLoadBalancer( - DiscoveryClient discoveryClient) { - return new DiscoveryClientBasedReactiveLoadBalancer("myservice", - discoveryClient); + ReactorLoadBalancer reactiveLoadBalancer(DiscoveryClient discoveryClient) { + return new DiscoveryClientBasedReactiveLoadBalancer("myservice", discoveryClient); } @Bean @@ -236,16 +222,13 @@ class BlockingLoadBalancerClientTests { protected static class UnknownServiceConfig { @Bean - ReactorLoadBalancer reactiveLoadBalancer( - DiscoveryClient discoveryClient) { - return new DiscoveryClientBasedReactiveLoadBalancer("unknownservice", - discoveryClient); + ReactorLoadBalancer reactiveLoadBalancer(DiscoveryClient discoveryClient) { + return new DiscoveryClientBasedReactiveLoadBalancer("unknownservice", discoveryClient); } } - protected static class TestLoadBalancerLifecycle - implements LoadBalancerLifecycle { + protected static class TestLoadBalancerLifecycle implements LoadBalancerLifecycle { final ConcurrentHashMap> startLog = new ConcurrentHashMap<>(); @@ -257,8 +240,7 @@ class BlockingLoadBalancerClientTests { } @Override - public void onComplete( - CompletionContext completionContext) { + public void onComplete(CompletionContext completionContext) { completeLog.put(getName() + UUID.randomUUID(), completionContext); } @@ -276,8 +258,7 @@ class BlockingLoadBalancerClientTests { } - protected static class AnotherLoadBalancerLifecycle - extends TestLoadBalancerLifecycle { + protected static class AnotherLoadBalancerLifecycle extends TestLoadBalancerLifecycle { @Override protected String getName() { @@ -289,8 +270,7 @@ class BlockingLoadBalancerClientTests { } @SuppressWarnings("rawtypes") -class DiscoveryClientBasedReactiveLoadBalancer - implements ReactorServiceInstanceLoadBalancer { +class DiscoveryClientBasedReactiveLoadBalancer implements ReactorServiceInstanceLoadBalancer { private final Random random = new Random(); @@ -298,8 +278,7 @@ class DiscoveryClientBasedReactiveLoadBalancer private final DiscoveryClient discoveryClient; - DiscoveryClientBasedReactiveLoadBalancer(String serviceId, - DiscoveryClient discoveryClient) { + DiscoveryClientBasedReactiveLoadBalancer(String serviceId, DiscoveryClient discoveryClient) { this.serviceId = serviceId; this.discoveryClient = discoveryClient; } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManagerTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManagerTests.java index 681957c8..c852f764 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManagerTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheManagerTests.java @@ -40,35 +40,30 @@ class DefaultLoadBalancerCacheManagerTests { properties.setTtl(Duration.ofMinutes(5)); properties.setCapacity(128); - DefaultLoadBalancerCacheManager cacheManager = new DefaultLoadBalancerCacheManager( - properties); + DefaultLoadBalancerCacheManager cacheManager = new DefaultLoadBalancerCacheManager(properties); assertThat(cacheManager.getCacheNames()).hasSize(1); - assertThat(cacheManager.getCache(SERVICE_INSTANCE_CACHE_NAME)) - .isInstanceOf(DefaultLoadBalancerCache.class); - assertThat(((DefaultLoadBalancerCache) cacheManager - .getCache(SERVICE_INSTANCE_CACHE_NAME)).getEvictMs()).isEqualTo(300000); + assertThat(cacheManager.getCache(SERVICE_INSTANCE_CACHE_NAME)).isInstanceOf(DefaultLoadBalancerCache.class); + assertThat(((DefaultLoadBalancerCache) cacheManager.getCache(SERVICE_INSTANCE_CACHE_NAME)).getEvictMs()) + .isEqualTo(300000); } @Test void shouldNotThrowExceptionOnDuplicateCacheName() { LoadBalancerCacheProperties properties = new LoadBalancerCacheProperties(); - assertThatCode( - () -> new DefaultLoadBalancerCacheManager(properties, "test", "test")) - .doesNotThrowAnyException(); + assertThatCode(() -> new DefaultLoadBalancerCacheManager(properties, "test", "test")) + .doesNotThrowAnyException(); } @Test void shouldOnlyCreateOneCacheWithGivenName() { LoadBalancerCacheProperties properties = new LoadBalancerCacheProperties(); - CacheManager cacheManager = new DefaultLoadBalancerCacheManager(properties, - "test", "test"); + CacheManager cacheManager = new DefaultLoadBalancerCacheManager(properties, "test", "test"); assertThat(cacheManager.getCacheNames()).hasSize(1); - assertThat(cacheManager.getCache("test")) - .isInstanceOf(DefaultLoadBalancerCache.class); + assertThat(cacheManager.getCache("test")).isInstanceOf(DefaultLoadBalancerCache.class); } } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheTests.java index 9a0cba76..5f844c4c 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/cache/DefaultLoadBalancerCacheTests.java @@ -48,8 +48,7 @@ class DefaultLoadBalancerCacheTests { DefaultLoadBalancerCache cache = new DefaultLoadBalancerCache("test", false); assertThatIllegalArgumentException().isThrownBy(() -> cache.put("testKey", null)) - .withMessageContaining( - "Cache 'test' is configured to not allow null values but null was provided"); + .withMessageContaining("Cache 'test' is configured to not allow null values but null was provided"); } @Test @@ -62,10 +61,8 @@ class DefaultLoadBalancerCacheTests { @SuppressWarnings("unchecked") @Test void assertThatTtlApplied() { - ConcurrentHashMapWithTimedEviction nativeCache = mock( - ConcurrentHashMapWithTimedEviction.class); - DefaultLoadBalancerCache cache = new DefaultLoadBalancerCache("test", nativeCache, - 50, true); + ConcurrentHashMapWithTimedEviction nativeCache = mock(ConcurrentHashMapWithTimedEviction.class); + DefaultLoadBalancerCache cache = new DefaultLoadBalancerCache("test", nativeCache, 50, true); cache.put("testKey", "testValue"); diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java index 01c0d0e7..7e540fb8 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java @@ -39,17 +39,14 @@ public class BlockingLoadBalancerClientAutoConfigurationTests { @Test public void beansCreatedNormally() { - applicationContextRunner.run( - ctxt -> assertThat(ctxt).hasSingleBean(BlockingLoadBalancerClient.class)); + applicationContextRunner.run(ctxt -> assertThat(ctxt).hasSingleBean(BlockingLoadBalancerClient.class)); } @Test public void worksWithoutSpringWeb() { - applicationContextRunner - .withClassLoader(new FilteredClassLoader(RestTemplate.class)) - .run(context -> { - assertThat(context).doesNotHaveBean(BlockingLoadBalancerClient.class); - }); + applicationContextRunner.withClassLoader(new FilteredClassLoader(RestTemplate.class)).run(context -> { + assertThat(context).doesNotHaveBean(BlockingLoadBalancerClient.class); + }); } } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfigurationTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfigurationTests.java index 2bc44f67..118a85c0 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfigurationTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfigurationTests.java @@ -47,28 +47,21 @@ class LoadBalancerCacheAutoConfigurationTests { contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(1); - assertThat( - ((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")) - .getCacheNames()).hasSize(1); - assertThat(context.getBean("caffeineLoadBalancerCacheManager")) - .isInstanceOf(CaffeineCacheManager.class); - assertThat( - ((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")) - .getCacheNames()) - .contains("CachingServiceInstanceListSupplierCache"); + assertThat(((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")).getCacheNames()).hasSize(1); + assertThat(context.getBean("caffeineLoadBalancerCacheManager")).isInstanceOf(CaffeineCacheManager.class); + assertThat(((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")).getCacheNames()) + .contains("CachingServiceInstanceListSupplierCache"); }); } @Test void caffeineLoadBalancerCacheShouldNotOverrideCacheTypeSetting() { - ApplicationContextRunner contextRunner = baseApplicationRunner() - .withUserConfiguration(TestConfiguration.class) + ApplicationContextRunner contextRunner = baseApplicationRunner().withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.cache.type=none"); contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(2); - assertThat(context.getBean("caffeineLoadBalancerCacheManager")) - .isInstanceOf(CaffeineCacheManager.class); + assertThat(context.getBean("caffeineLoadBalancerCacheManager")).isInstanceOf(CaffeineCacheManager.class); assertThat(context.getBeansOfType(CacheManager.class).get("cacheManager")) .isInstanceOf(NoOpCacheManager.class); @@ -77,22 +70,15 @@ class LoadBalancerCacheAutoConfigurationTests { @Test void loadBalancerCacheShouldNotOverrideExistingCaffeineCacheManager() { - ApplicationContextRunner contextRunner = baseApplicationRunner() - .withUserConfiguration(TestConfiguration.class); + ApplicationContextRunner contextRunner = baseApplicationRunner().withUserConfiguration(TestConfiguration.class); contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(2); - assertThat(context.getBean("cacheManager")) - .isInstanceOf(CaffeineCacheManager.class); - assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()) - .isEmpty(); - assertThat( - ((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")) - .getCacheNames()).hasSize(1); - assertThat( - ((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")) - .getCacheNames()) - .contains("CachingServiceInstanceListSupplierCache"); + assertThat(context.getBean("cacheManager")).isInstanceOf(CaffeineCacheManager.class); + assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()).isEmpty(); + assertThat(((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")).getCacheNames()).hasSize(1); + assertThat(((CacheManager) context.getBean("caffeineLoadBalancerCacheManager")).getCacheNames()) + .contains("CachingServiceInstanceListSupplierCache"); }); } @@ -105,10 +91,8 @@ class LoadBalancerCacheAutoConfigurationTests { contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(1); - assertThat(context.getBean("cacheManager")) - .isInstanceOf(CaffeineCacheManager.class); - assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()) - .isEmpty(); + assertThat(context.getBean("cacheManager")).isInstanceOf(CaffeineCacheManager.class); + assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()).isEmpty(); }); } @@ -117,23 +101,20 @@ class LoadBalancerCacheAutoConfigurationTests { ApplicationContextRunner contextRunner = noCaffeineRunner(); contextRunner.run(context -> { - assertThat(context.getBean( - LoadBalancerCacheAutoConfiguration.LoadBalancerCaffeineWarnLogger.class)) - .isNotNull(); + assertThat(context.getBean(LoadBalancerCacheAutoConfiguration.LoadBalancerCaffeineWarnLogger.class)) + .isNotNull(); assertThat(context.getBeansOfType(CacheManager.class)).hasSize(1); - assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")) - .getCacheNames()).hasSize(1); + assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")).getCacheNames()).hasSize(1); assertThat(context.getBean("defaultLoadBalancerCacheManager")) .isInstanceOf(DefaultLoadBalancerCacheManager.class); - assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")) - .getCacheNames()).contains("CachingServiceInstanceListSupplierCache"); + assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")).getCacheNames()) + .contains("CachingServiceInstanceListSupplierCache"); }); } @Test void defaultLoadBalancerCacheShouldNotOverrideCacheTypeSetting() { - ApplicationContextRunner contextRunner = noCaffeineRunner() - .withUserConfiguration(TestConfiguration.class) + ApplicationContextRunner contextRunner = noCaffeineRunner().withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.cache.type=none"); contextRunner.run(context -> { @@ -148,19 +129,15 @@ class LoadBalancerCacheAutoConfigurationTests { @Test void defaultLoadBalancerCacheShouldNotOverrideExistingCacheManager() { - ApplicationContextRunner contextRunner = noCaffeineRunner() - .withUserConfiguration(TestConfiguration.class); + ApplicationContextRunner contextRunner = noCaffeineRunner().withUserConfiguration(TestConfiguration.class); contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(2); - assertThat(context.getBean("cacheManager")) - .isInstanceOf(ConcurrentMapCacheManager.class); - assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()) - .isEmpty(); - assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")) - .getCacheNames()).hasSize(1); - assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")) - .getCacheNames()).contains("CachingServiceInstanceListSupplierCache"); + assertThat(context.getBean("cacheManager")).isInstanceOf(ConcurrentMapCacheManager.class); + assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()).isEmpty(); + assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")).getCacheNames()).hasSize(1); + assertThat(((CacheManager) context.getBean("defaultLoadBalancerCacheManager")).getCacheNames()) + .contains("CachingServiceInstanceListSupplierCache"); }); } @@ -173,21 +150,18 @@ class LoadBalancerCacheAutoConfigurationTests { contextRunner.run(context -> { assertThat(context.getBeansOfType(CacheManager.class)).hasSize(1); - assertThat(context.getBean("cacheManager")) - .isInstanceOf(ConcurrentMapCacheManager.class); - assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()) - .isEmpty(); + assertThat(context.getBean("cacheManager")).isInstanceOf(ConcurrentMapCacheManager.class); + assertThat(((CacheManager) context.getBean("cacheManager")).getCacheNames()).isEmpty(); }); } private ApplicationContextRunner baseApplicationRunner() { - return new ApplicationContextRunner().withConfiguration(AutoConfigurations.of( - CacheAutoConfiguration.class, LoadBalancerCacheAutoConfiguration.class)); + return new ApplicationContextRunner().withConfiguration( + AutoConfigurations.of(CacheAutoConfiguration.class, LoadBalancerCacheAutoConfiguration.class)); } private ApplicationContextRunner noCaffeineRunner() { - return baseApplicationRunner() - .withClassLoader(new FilteredClassLoader(Caffeine.class)); + return baseApplicationRunner().withClassLoader(new FilteredClassLoader(Caffeine.class)); } @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplierTests.java index 605b1059..75ec25a6 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceListSupplierTests.java @@ -86,8 +86,7 @@ class CachingServiceInstanceListSupplierTests { @Override public Flux getInstances(String serviceId) { - return Flux.just(instance("1host", false), - instance("2host-secure", true)); + return Flux.just(instance("1host", false), instance("2host-secure", true)); } @Override @@ -98,8 +97,7 @@ class CachingServiceInstanceListSupplierTests { } @Bean - ReactorLoadBalancer reactorLoadBalancer( - ObjectProvider provider) { + ReactorLoadBalancer reactorLoadBalancer(ObjectProvider provider) { return new RoundRobinLoadBalancer(provider, SERVICE_ID); } @@ -109,8 +107,7 @@ class CachingServiceInstanceListSupplierTests { } @Bean - BlockingLoadBalancerClient blockingLoadBalancerClient( - LoadBalancerClientFactory loadBalancerClientFactory, + BlockingLoadBalancerClient blockingLoadBalancerClient(LoadBalancerClientFactory loadBalancerClientFactory, LoadBalancerProperties properties) { return new BlockingLoadBalancerClient(loadBalancerClientFactory, properties); } @@ -127,26 +124,21 @@ class CachingServiceInstanceListSupplierTests { @Bean ServiceInstanceListSupplier supplier(ConfigurableApplicationContext context, - ReactiveDiscoveryClient discoveryClient, - LoadBalancerProperties loadBalancerProperties, + ReactiveDiscoveryClient discoveryClient, LoadBalancerProperties loadBalancerProperties, WebClient.Builder webClientBuilder) { DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier( discoveryClient, context.getEnvironment()); HealthCheckServiceInstanceListSupplier delegate = new TestHealthCheckServiceInstanceListSupplier( - firstDelegate, loadBalancerProperties.getHealthCheck(), - webClientBuilder.build()); + firstDelegate, loadBalancerProperties.getHealthCheck(), webClientBuilder.build()); delegate.afterPropertiesSet(); ObjectProvider cacheManagerProvider = context .getBeanProvider(LoadBalancerCacheManager.class); - return new CachingServiceInstanceListSupplier(delegate, - cacheManagerProvider.getIfAvailable()); + return new CachingServiceInstanceListSupplier(delegate, cacheManagerProvider.getIfAvailable()); } - private static class TestHealthCheckServiceInstanceListSupplier - extends HealthCheckServiceInstanceListSupplier { + private static class TestHealthCheckServiceInstanceListSupplier extends HealthCheckServiceInstanceListSupplier { - TestHealthCheckServiceInstanceListSupplier( - ServiceInstanceListSupplier delegate, + TestHealthCheckServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, LoadBalancerProperties.HealthCheck healthCheck, WebClient webClient) { super(delegate, healthCheck, webClient); } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java index 23dba7ff..c8172f1c 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java @@ -49,8 +49,7 @@ class DiscoveryClientServiceInstanceListSupplierTests { private final MockEnvironment environment = new MockEnvironment(); - private final ReactiveDiscoveryClient reactiveDiscoveryClient = mock( - ReactiveDiscoveryClient.class); + private final ReactiveDiscoveryClient reactiveDiscoveryClient = mock(ReactiveDiscoveryClient.class); private final DiscoveryClient discoveryClient = mock(DiscoveryClient.class); @@ -67,38 +66,32 @@ class DiscoveryClientServiceInstanceListSupplierTests { @Test void shouldReturnRetrievedInstances() { - when(reactiveDiscoveryClient.getInstances(SERVICE_ID)).thenReturn( - Flux.just(instance("1host", false), instance("2host-secure", true))); + when(reactiveDiscoveryClient.getInstances(SERVICE_ID)) + .thenReturn(Flux.just(instance("1host", false), instance("2host-secure", true))); StepVerifier.withVirtualTime(() -> { - supplier = new DiscoveryClientServiceInstanceListSupplier( - reactiveDiscoveryClient, environment); + supplier = new DiscoveryClientServiceInstanceListSupplier(reactiveDiscoveryClient, environment); return supplier.get(); - }).expectSubscription() - .expectNext(Lists.list(instance("1host", false), - instance("2host-secure", true))) + }).expectSubscription().expectNext(Lists.list(instance("1host", false), instance("2host-secure", true))) .thenCancel().verify(VERIFICATION_TIMEOUT); } @Test void shouldUpdateReturnRetrievedInstances() { - when(reactiveDiscoveryClient.getInstances(SERVICE_ID)).thenReturn( - Flux.just(instance("1host", false), instance("2host-secure", true))); - supplier = new DiscoveryClientServiceInstanceListSupplier(reactiveDiscoveryClient, - environment); - - StepVerifier.withVirtualTime(() -> supplier.get()).expectSubscription() - .expectNext(Lists.list(instance("1host", false), - instance("2host-secure", true))) - .thenCancel().verify(VERIFICATION_TIMEOUT); - when(reactiveDiscoveryClient.getInstances(SERVICE_ID)) - .thenReturn(Flux.just(instance("1host", false), - instance("2host-secure", true), instance("3host", false))); + .thenReturn(Flux.just(instance("1host", false), instance("2host-secure", true))); + supplier = new DiscoveryClientServiceInstanceListSupplier(reactiveDiscoveryClient, environment); StepVerifier.withVirtualTime(() -> supplier.get()).expectSubscription() - .expectNext(Lists.list(instance("1host", false), - instance("2host-secure", true), instance("3host", false))) + .expectNext(Lists.list(instance("1host", false), instance("2host-secure", true))).thenCancel() + .verify(VERIFICATION_TIMEOUT); + + when(reactiveDiscoveryClient.getInstances(SERVICE_ID)).thenReturn( + Flux.just(instance("1host", false), instance("2host-secure", true), instance("3host", false))); + + StepVerifier.withVirtualTime(() -> supplier.get()).expectSubscription() + .expectNext( + Lists.list(instance("1host", false), instance("2host-secure", true), instance("3host", false))) .thenCancel().verify(VERIFICATION_TIMEOUT); } @@ -108,83 +101,66 @@ class DiscoveryClientServiceInstanceListSupplierTests { .thenReturn(Flux.error(new RuntimeException("Exception"))); StepVerifier.withVirtualTime(() -> { - supplier = new DiscoveryClientServiceInstanceListSupplier( - reactiveDiscoveryClient, environment); + supplier = new DiscoveryClientServiceInstanceListSupplier(reactiveDiscoveryClient, environment); return supplier.get(); - }).expectSubscription().expectNext(Lists.emptyList()).thenCancel() - .verify(VERIFICATION_TIMEOUT); + }).expectSubscription().expectNext(Lists.emptyList()).thenCancel().verify(VERIFICATION_TIMEOUT); } @Test void shouldReturnEmptyInstancesListOnTimeout() { environment.setProperty(SERVICE_DISCOVERY_TIMEOUT, "100ms"); when(reactiveDiscoveryClient.getInstances(SERVICE_ID)).thenReturn(Flux.never()); - StepVerifier - .create(new DiscoveryClientServiceInstanceListSupplier( - reactiveDiscoveryClient, environment).get()) - .expectSubscription().expectNext(Lists.emptyList()).thenCancel() - .verify(VERIFICATION_TIMEOUT); + StepVerifier.create(new DiscoveryClientServiceInstanceListSupplier(reactiveDiscoveryClient, environment).get()) + .expectSubscription().expectNext(Lists.emptyList()).thenCancel().verify(VERIFICATION_TIMEOUT); } @Test void shouldReturnRetrievedInstancesBlockingClient() { StepVerifier.withVirtualTime(() -> { - when(discoveryClient.getInstances(SERVICE_ID)).thenReturn( - Lists.list(instance("1host", false), instance("2host-secure", true))); + when(discoveryClient.getInstances(SERVICE_ID)) + .thenReturn(Lists.list(instance("1host", false), instance("2host-secure", true))); - supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - environment); + supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, environment); return supplier.get(); - }).expectSubscription() - .expectNext(Lists.list(instance("1host", false), - instance("2host-secure", true))) + }).expectSubscription().expectNext(Lists.list(instance("1host", false), instance("2host-secure", true))) .thenCancel().verify(VERIFICATION_TIMEOUT); } @Test void shouldUpdateReturnRetrievedInstancesBlockingClient() { StepVerifier.withVirtualTime(() -> { - when(discoveryClient.getInstances(SERVICE_ID)).thenReturn( - Lists.list(instance("1host", false), instance("2host-secure", true))); - supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - environment); + when(discoveryClient.getInstances(SERVICE_ID)) + .thenReturn(Lists.list(instance("1host", false), instance("2host-secure", true))); + supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, environment); supplier.get(); - when(discoveryClient.getInstances(SERVICE_ID)) - .thenReturn(Lists.list(instance("1host", false), - instance("2host-secure", true), instance("3host", false))); + when(discoveryClient.getInstances(SERVICE_ID)).thenReturn( + Lists.list(instance("1host", false), instance("2host-secure", true), instance("3host", false))); return supplier.get(); }).expectSubscription() - .expectNext(Lists.list(instance("1host", false), - instance("2host-secure", true), instance("3host", false))) + .expectNext( + Lists.list(instance("1host", false), instance("2host-secure", true), instance("3host", false))) .thenCancel().verify(VERIFICATION_TIMEOUT); } @Test void shouldReturnEmptyInstancesListOnExceptionBlockingClient() { - when(discoveryClient.getInstances(SERVICE_ID)) - .thenThrow(new RuntimeException("Exception")); + when(discoveryClient.getInstances(SERVICE_ID)).thenThrow(new RuntimeException("Exception")); StepVerifier.withVirtualTime(() -> { - supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - environment); + supplier = new DiscoveryClientServiceInstanceListSupplier(discoveryClient, environment); return supplier.get(); - }).expectSubscription().expectNext(Lists.emptyList()).thenCancel() - .verify(VERIFICATION_TIMEOUT); + }).expectSubscription().expectNext(Lists.emptyList()).thenCancel().verify(VERIFICATION_TIMEOUT); } @Test @Disabled // FIXME 3.0.0 void shouldReturnEmptyInstancesListOnTimeoutBlockingClient() { environment.setProperty(SERVICE_DISCOVERY_TIMEOUT, "100ms"); - when(discoveryClient.getInstances(SERVICE_ID)).thenAnswer( - new AnswersWithDelay(200, new Returns(Lists.list(instance("1host", false), - instance("2host-secure", true), instance("3host", false))))); - StepVerifier - .create(new DiscoveryClientServiceInstanceListSupplier(discoveryClient, - environment).get()) - .expectSubscription().expectNext(Lists.emptyList()).thenCancel() - .verify(VERIFICATION_TIMEOUT); + when(discoveryClient.getInstances(SERVICE_ID)).thenAnswer(new AnswersWithDelay(200, new Returns( + Lists.list(instance("1host", false), instance("2host-secure", true), instance("3host", false))))); + StepVerifier.create(new DiscoveryClientServiceInstanceListSupplier(discoveryClient, environment).get()) + .expectSubscription().expectNext(Lists.emptyList()).thenCancel().verify(VERIFICATION_TIMEOUT); } } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java index 55262dc9..e23430a2 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java @@ -55,8 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Roman Matiushchenko */ @ExtendWith(SpringExtension.class) -@SpringBootTest( - classes = HealthCheckServiceInstanceListSupplierTests.TestApplication.class, +@SpringBootTest(classes = HealthCheckServiceInstanceListSupplierTests.TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class HealthCheckServiceInstanceListSupplierTests { @@ -91,10 +90,9 @@ class HealthCheckServiceInstanceListSupplierTests { void shouldCheckInstanceWithProvidedHealthCheckPath() { healthCheck.getPath().put("ignored-service", "/health"); listSupplier = new HealthCheckServiceInstanceListSupplier( - ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, - webClient); - ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", - "ignored-service", "127.0.0.1", port, false); + ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, webClient); + ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", "ignored-service", + "127.0.0.1", port, false); boolean alive = listSupplier.isAlive(serviceInstance).block(); @@ -105,10 +103,9 @@ class HealthCheckServiceInstanceListSupplierTests { @Test void shouldCheckInstanceWithDefaultHealthCheckPath() { listSupplier = new HealthCheckServiceInstanceListSupplier( - ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, - webClient); - ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", - "ignored-service", "127.0.0.1", port, false); + ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, webClient); + ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", "ignored-service", + "127.0.0.1", port, false); boolean alive = listSupplier.isAlive(serviceInstance).block(); @@ -120,10 +117,9 @@ class HealthCheckServiceInstanceListSupplierTests { void shouldReturnFalseIfEndpointNotFound() { healthCheck.getPath().put("ignored-service", "/test"); listSupplier = new HealthCheckServiceInstanceListSupplier( - ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, - webClient); - ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", - "ignored-service", "127.0.0.1", port, false); + ServiceInstanceListSupplier.fixed("ignored-service").build(), healthCheck, webClient); + ServiceInstance serviceInstance = new DefaultServiceInstance("ignored-service-1", "ignored-service", + "127.0.0.1", port, false); boolean alive = listSupplier.isAlive(serviceInstance).block(); @@ -134,25 +130,21 @@ class HealthCheckServiceInstanceListSupplierTests { void shouldReturnOnlyAliveService() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()).thenReturn( - Flux.just(Lists.list(serviceInstance1, serviceInstance2))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1, serviceInstance2))); - HealthCheckServiceInstanceListSupplier mock = Mockito - .mock(HealthCheckServiceInstanceListSupplier.class); + HealthCheckServiceInstanceListSupplier mock = Mockito.mock(HealthCheckServiceInstanceListSupplier.class); Mockito.doReturn(Mono.just(true)).when(mock).isAlive(serviceInstance1); Mockito.doReturn(Mono.just(false)).when(mock).isAlive(serviceInstance2); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return mock.isAlive(serviceInstance); @@ -160,34 +152,28 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .expectNoEvent(healthCheck.getInterval()).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .expectNoEvent(healthCheck.getInterval()).thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldEmitOnEachAliveServiceInBatch() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()).thenReturn( - Flux.just(Lists.list(serviceInstance1, serviceInstance2))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1, serviceInstance2))); - HealthCheckServiceInstanceListSupplier mock = Mockito - .mock(HealthCheckServiceInstanceListSupplier.class); + HealthCheckServiceInstanceListSupplier mock = Mockito.mock(HealthCheckServiceInstanceListSupplier.class); Mockito.doReturn(Mono.just(true)).when(mock).isAlive(serviceInstance1); Mockito.doReturn(Mono.just(true)).when(mock).isAlive(serviceInstance2); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return mock.isAlive(serviceInstance); @@ -195,36 +181,29 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .expectNext(Lists.list(serviceInstance1, serviceInstance2)) - .expectNoEvent(healthCheck.getInterval()).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .expectNext(Lists.list(serviceInstance1, serviceInstance2)).expectNoEvent(healthCheck.getInterval()) + .thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldNotFailIfIsAliveReturnsError() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()).thenReturn( - Flux.just(Lists.list(serviceInstance1, serviceInstance2))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1, serviceInstance2))); - HealthCheckServiceInstanceListSupplier mock = Mockito - .mock(HealthCheckServiceInstanceListSupplier.class); + HealthCheckServiceInstanceListSupplier mock = Mockito.mock(HealthCheckServiceInstanceListSupplier.class); Mockito.doReturn(Mono.just(true)).when(mock).isAlive(serviceInstance1); - Mockito.doReturn(Mono.error(new RuntimeException("boom"))).when(mock) - .isAlive(serviceInstance2); + Mockito.doReturn(Mono.error(new RuntimeException("boom"))).when(mock).isAlive(serviceInstance2); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return mock.isAlive(serviceInstance); @@ -232,28 +211,23 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .expectNoEvent(healthCheck.getInterval()).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .expectNoEvent(healthCheck.getInterval()).thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldEmitAllInstancesIfAllIsAliveChecksFailed() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()).thenReturn( - Flux.just(Lists.list(serviceInstance1, serviceInstance2))); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1, serviceInstance2))); + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { if (serviceInstance == serviceInstance1) { @@ -266,25 +240,21 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list()).expectNoEvent(healthCheck.getInterval()) - .thenCancel().verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list()) + .expectNoEvent(healthCheck.getInterval()).thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldMakeInitialDaleyAfterPropertiesSet() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()) - .thenReturn(Flux.just(Lists.list(serviceInstance1))); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1))); + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return Mono.just(true); @@ -294,36 +264,28 @@ class HealthCheckServiceInstanceListSupplierTests { listSupplier.afterPropertiesSet(); return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .expectNoEvent(healthCheck.getInterval()).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .expectNoEvent(healthCheck.getInterval()).thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldRepeatIsAliveChecksIndefinitely() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()).thenReturn( - Flux.just(Lists.list(serviceInstance1, serviceInstance2))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1, serviceInstance2))); - HealthCheckServiceInstanceListSupplier mock = Mockito - .mock(HealthCheckServiceInstanceListSupplier.class); - Mockito.doReturn(Mono.just(false), Mono.just(true)).when(mock) - .isAlive(serviceInstance1); - Mockito.doReturn(Mono.error(new RuntimeException("boom"))).when(mock) - .isAlive(serviceInstance2); + HealthCheckServiceInstanceListSupplier mock = Mockito.mock(HealthCheckServiceInstanceListSupplier.class); + Mockito.doReturn(Mono.just(false), Mono.just(true)).when(mock).isAlive(serviceInstance1); + Mockito.doReturn(Mono.error(new RuntimeException("boom"))).when(mock).isAlive(serviceInstance2); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return mock.isAlive(serviceInstance); @@ -331,34 +293,27 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list()).expectNoEvent(healthCheck.getInterval()) - .expectNext(Lists.list(serviceInstance1)) - .expectNoEvent(healthCheck.getInterval()) - .expectNext(Lists.list(serviceInstance1)).thenCancel() + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list()) + .expectNoEvent(healthCheck.getInterval()).expectNext(Lists.list(serviceInstance1)) + .expectNoEvent(healthCheck.getInterval()).expectNext(Lists.list(serviceInstance1)).thenCancel() .verify(VERIFY_TIMEOUT); } @Test void shouldTimeoutIsAliveCheck() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()) - .thenReturn(Flux.just(Lists.list(serviceInstance1))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1))); - HealthCheckServiceInstanceListSupplier mock = Mockito - .mock(HealthCheckServiceInstanceListSupplier.class); - Mockito.when(mock.isAlive(serviceInstance1)).thenReturn(Mono.never(), - Mono.just(true)); + HealthCheckServiceInstanceListSupplier mock = Mockito.mock(HealthCheckServiceInstanceListSupplier.class); + Mockito.when(mock.isAlive(serviceInstance1)).thenReturn(Mono.never(), Mono.just(true)); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return mock.isAlive(serviceInstance); @@ -366,35 +321,29 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNoEvent(healthCheck.getInterval()).expectNext(Lists.list()) - .expectNoEvent(healthCheck.getInterval()) - .expectNext(Lists.list(serviceInstance1)) - .expectNoEvent(healthCheck.getInterval()) - .expectNext(Lists.list(serviceInstance1)).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNoEvent(healthCheck.getInterval()) + .expectNext(Lists.list()).expectNoEvent(healthCheck.getInterval()) + .expectNext(Lists.list(serviceInstance1)).expectNoEvent(healthCheck.getInterval()) + .expectNext(Lists.list(serviceInstance1)).thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldUpdateInstances() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); - ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", - SERVICE_ID, "127.0.0.2", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); + ServiceInstance serviceInstance2 = new DefaultServiceInstance("ignored-service-2", SERVICE_ID, "127.0.0.2", + port, false); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Flux> instances = Flux - .just(Lists.list(serviceInstance1)) + Flux> instances = Flux.just(Lists.list(serviceInstance1)) .concatWith(Flux.just(Lists.list(serviceInstance1, serviceInstance2)) .delayElements(healthCheck.getInterval().dividedBy(2))); Mockito.when(delegate.get()).thenReturn(instances); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return Mono.just(true); @@ -402,54 +351,43 @@ class HealthCheckServiceInstanceListSupplierTests { }; return listSupplier.get(); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .thenAwait(healthCheck.getInterval().dividedBy(2)) - .expectNext(Lists.list(serviceInstance1)) - .expectNext(Lists.list(serviceInstance1, serviceInstance2)) - .expectNoEvent(healthCheck.getInterval()) - .expectNext(Lists.list(serviceInstance1)) - .expectNext(Lists.list(serviceInstance1, serviceInstance2)).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .thenAwait(healthCheck.getInterval().dividedBy(2)).expectNext(Lists.list(serviceInstance1)) + .expectNext(Lists.list(serviceInstance1, serviceInstance2)).expectNoEvent(healthCheck.getInterval()) + .expectNext(Lists.list(serviceInstance1)).expectNext(Lists.list(serviceInstance1, serviceInstance2)) + .thenCancel().verify(VERIFY_TIMEOUT); } @Test void shouldCacheResultIfAfterPropertiesSetInvoked() { healthCheck.setInitialDelay(Duration.ofSeconds(1)); - ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", - SERVICE_ID, "127.0.0.1", port, false); + ServiceInstance serviceInstance1 = new DefaultServiceInstance("ignored-service-1", SERVICE_ID, "127.0.0.1", + port, false); AtomicInteger emitCounter = new AtomicInteger(); StepVerifier.withVirtualTime(() -> { - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); Mockito.when(delegate.getServiceId()).thenReturn(SERVICE_ID); - Mockito.when(delegate.get()) - .thenReturn(Flux.just(Lists.list(serviceInstance1))); + Mockito.when(delegate.get()).thenReturn(Flux.just(Lists.list(serviceInstance1))); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, - healthCheck, webClient) { + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient) { @Override protected Mono isAlive(ServiceInstance serviceInstance) { return Mono.just(true); } @Override - protected Flux> healthCheckFlux( - List instances) { - return super.healthCheckFlux(instances) - .doOnNext(it -> emitCounter.incrementAndGet()); + protected Flux> healthCheckFlux(List instances) { + return super.healthCheckFlux(instances).doOnNext(it -> emitCounter.incrementAndGet()); } }; listSupplier.afterPropertiesSet(); return listSupplier.get().take(1).concatWith(listSupplier.get().take(1)); - }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()) - .expectNext(Lists.list(serviceInstance1)) - .expectNext(Lists.list(serviceInstance1)).thenCancel() - .verify(VERIFY_TIMEOUT); + }).expectSubscription().expectNoEvent(healthCheck.getInitialDelay()).expectNext(Lists.list(serviceInstance1)) + .expectNext(Lists.list(serviceInstance1)).thenCancel().verify(VERIFY_TIMEOUT); Assertions.assertThat(emitCounter).hasValue(1); } @@ -459,27 +397,22 @@ class HealthCheckServiceInstanceListSupplierTests { final AtomicInteger instancesCanceled = new AtomicInteger(); final AtomicBoolean subscribed = new AtomicBoolean(); - ServiceInstanceListSupplier delegate = Mockito - .mock(ServiceInstanceListSupplier.class); - Mockito.when(delegate.get()) - .thenReturn(Flux.>never() - .doOnSubscribe(subscription -> subscribed.set(true)) - .doOnCancel(instancesCanceled::incrementAndGet)); + ServiceInstanceListSupplier delegate = Mockito.mock(ServiceInstanceListSupplier.class); + Mockito.when(delegate.get()).thenReturn(Flux.>never() + .doOnSubscribe(subscription -> subscribed.set(true)).doOnCancel(instancesCanceled::incrementAndGet)); - listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, - webClient); + listSupplier = new HealthCheckServiceInstanceListSupplier(delegate, healthCheck, webClient); listSupplier.afterPropertiesSet(); - Awaitility.await("delegate subscription").pollDelay(Duration.ofMillis(50)) - .atMost(VERIFY_TIMEOUT).untilTrue(subscribed); + Awaitility.await("delegate subscription").pollDelay(Duration.ofMillis(50)).atMost(VERIFY_TIMEOUT) + .untilTrue(subscribed); Assertions.assertThat(instancesCanceled).hasValue(0); listSupplier.destroy(); - Awaitility.await("delegate cancellation").pollDelay(Duration.ofMillis(100)) - .atMost(VERIFY_TIMEOUT).untilAsserted( - () -> Assertions.assertThat(instancesCanceled).hasValue(1)); + Awaitility.await("delegate cancellation").pollDelay(Duration.ofMillis(100)).atMost(VERIFY_TIMEOUT) + .untilAsserted(() -> Assertions.assertThat(instancesCanceled).hasValue(1)); } @Configuration(proxyBeanMethods = false) @@ -488,9 +421,7 @@ class HealthCheckServiceInstanceListSupplierTests { static class TestApplication { public static void main(String[] args) { - SpringApplication.run( - HealthCheckServiceInstanceListSupplierTests.TestApplication.class, - args); + SpringApplication.run(HealthCheckServiceInstanceListSupplierTests.TestApplication.class, args); } @GetMapping("/health") diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java index b0c2658e..04b6b5d3 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java @@ -63,9 +63,8 @@ public class LoadBalancerTests { @Test public void roundRobbinLoadbalancerWorks() { - ReactiveLoadBalancer reactiveLoadBalancer = this.clientFactory - .getInstance("myservice", ReactiveLoadBalancer.class, - ServiceInstance.class); + ReactiveLoadBalancer reactiveLoadBalancer = this.clientFactory.getInstance("myservice", + ReactiveLoadBalancer.class, ServiceInstance.class); then(reactiveLoadBalancer).isInstanceOf(RoundRobinLoadBalancer.class); then(reactiveLoadBalancer).isInstanceOf(ReactorLoadBalancer.class); @@ -77,8 +76,7 @@ public class LoadBalancerTests { assertLoadBalancer(loadBalancer, hosts); } - private void assertLoadBalancer(ReactorLoadBalancer loadBalancer, - List hosts) { + private void assertLoadBalancer(ReactorLoadBalancer loadBalancer, List hosts) { for (String host : hosts) { Mono> source = loadBalancer.choose(); StepVerifier.create(source).consumeNextWith(response -> { @@ -87,8 +85,7 @@ public class LoadBalancerTests { ServiceInstance instance = response.getServer(); then(instance).isNotNull(); - then(instance.getHost()).as("instance host is incorrent %s", host) - .isEqualTo(host); + then(instance.getHost()).as("instance host is incorrent %s", host).isEqualTo(host); if (host.contains("secure")) { then(instance.isSecure()).isTrue(); @@ -97,18 +94,15 @@ public class LoadBalancerTests { then(instance.isSecure()).isFalse(); } - response.onComplete( - new CompletionContext(CompletionContext.Status.SUCCESS)); + response.onComplete(new CompletionContext(CompletionContext.Status.SUCCESS)); }).verifyComplete(); } } @Test public void emptyHosts() { - ResolvableType type = ResolvableType - .forClassWithGenerics(ReactorLoadBalancer.class, ServiceInstance.class); - ReactorLoadBalancer loadBalancer = this.clientFactory - .getInstance("unknownservice", type); + ResolvableType type = ResolvableType.forClassWithGenerics(ReactorLoadBalancer.class, ServiceInstance.class); + ReactorLoadBalancer loadBalancer = this.clientFactory.getInstance("unknownservice", type); then(loadBalancer).isInstanceOf(RoundRobinLoadBalancer.class); @@ -122,16 +116,13 @@ public class LoadBalancerTests { @Test public void staticConfigurationWorks() { String serviceId = "test1"; - RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer( - ServiceInstanceListSuppliers.toProvider(serviceId, - instance(serviceId, "1host", false), - instance(serviceId, "2host-secure", true)), + RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers + .toProvider(serviceId, instance(serviceId, "1host", false), instance(serviceId, "2host-secure", true)), serviceId, -1); assertLoadBalancer(loadBalancer, Arrays.asList("1host", "2host-secure")); } - private static DefaultServiceInstance instance(String serviceId, String host, - boolean secure) { + private static DefaultServiceInstance instance(String serviceId, String host, boolean secure) { return new DefaultServiceInstance(serviceId, serviceId, host, 80, secure); } @@ -139,24 +130,18 @@ public class LoadBalancerTests { @Test public void canPassHintViaRequest() { String serviceId = "test1"; - RoundRobinLoadBalancer loadBalancer = new TestHintLoadBalancer( - ServiceInstanceListSuppliers.toProvider(serviceId, - instance(serviceId, "1host", false), - instance(serviceId, "2host-secure", true)), - serviceId); - Request request = new DefaultRequest<>( - new DefaultRequestContext("test2")); + RoundRobinLoadBalancer loadBalancer = new TestHintLoadBalancer(ServiceInstanceListSuppliers.toProvider( + serviceId, instance(serviceId, "1host", false), instance(serviceId, "2host-secure", true)), serviceId); + Request request = new DefaultRequest<>(new DefaultRequestContext("test2")); - ServiceInstance serviceInstance = loadBalancer.choose(request).block() - .getServer(); + ServiceInstance serviceInstance = loadBalancer.choose(request).block().getServer(); assertThat(serviceInstance.getServiceId()).isEqualTo("test2"); } private static class TestHintLoadBalancer extends RoundRobinLoadBalancer { - TestHintLoadBalancer( - ObjectProvider serviceInstanceListSupplierProvider, + TestHintLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId) { super(serviceInstanceListSupplierProvider, serviceId); } @@ -165,10 +150,8 @@ public class LoadBalancerTests { @Override public Mono> choose(Request request) { if (request.getContext() instanceof DefaultRequestContext) { - DefaultRequestContext requestContext = (DefaultRequestContext) request - .getContext(); - return Mono.just(new DefaultResponse( - instance(requestContext.getHint(), "host", false))); + DefaultRequestContext requestContext = (DefaultRequestContext) request.getContext(); + return Mono.just(new DefaultResponse(instance(requestContext.getHint(), "host", false))); } return Mono.empty(); } @@ -177,11 +160,8 @@ public class LoadBalancerTests { @EnableAutoConfiguration @SpringBootConfiguration(proxyBeanMethods = false) - @LoadBalancerClients({ - @LoadBalancerClient(name = "myservice", - configuration = MyServiceConfig.class), - @LoadBalancerClient(name = "unknownservice", - configuration = MyServiceConfig.class) }) + @LoadBalancerClients({ @LoadBalancerClient(name = "myservice", configuration = MyServiceConfig.class), + @LoadBalancerClient(name = "unknownservice", configuration = MyServiceConfig.class) }) @EnableCaching protected static class Config { @@ -190,11 +170,11 @@ public class LoadBalancerTests { protected static class MyServiceConfig { @Bean - public RoundRobinLoadBalancer roundRobinContextLoadBalancer( - LoadBalancerClientFactory clientFactory, Environment env) { + public RoundRobinLoadBalancer roundRobinContextLoadBalancer(LoadBalancerClientFactory clientFactory, + Environment env) { String serviceId = clientFactory.getName(env); - return new RoundRobinLoadBalancer(clientFactory.getLazyProvider(serviceId, - ServiceInstanceListSupplier.class), serviceId, -1); + return new RoundRobinLoadBalancer( + clientFactory.getLazyProvider(serviceId, ServiceInstanceListSupplier.class), serviceId, -1); } } diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java index 532cc8a0..9c1e0aa8 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java @@ -34,55 +34,41 @@ public class ServiceInstanceListSupplierBuilderTests { @Test public void testBuilder() { - new ApplicationContextRunner().withUserConfiguration(CacheTestConfig.class) - .run(context -> { - ServiceInstanceListSupplier supplier = ServiceInstanceListSupplier - .builder().withDiscoveryClient().withHealthChecks() - .withCaching().build(context); - assertThat(supplier) - .isInstanceOf(CachingServiceInstanceListSupplier.class); - DelegatingServiceInstanceListSupplier delegating = (DelegatingServiceInstanceListSupplier) supplier; - assertThat(delegating.getDelegate()) - .isInstanceOf(HealthCheckServiceInstanceListSupplier.class); - delegating = (DelegatingServiceInstanceListSupplier) delegating - .getDelegate(); - assertThat(delegating.getDelegate()).isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); - }); + new ApplicationContextRunner().withUserConfiguration(CacheTestConfig.class).run(context -> { + ServiceInstanceListSupplier supplier = ServiceInstanceListSupplier.builder().withDiscoveryClient() + .withHealthChecks().withCaching().build(context); + assertThat(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class); + DelegatingServiceInstanceListSupplier delegating = (DelegatingServiceInstanceListSupplier) supplier; + assertThat(delegating.getDelegate()).isInstanceOf(HealthCheckServiceInstanceListSupplier.class); + delegating = (DelegatingServiceInstanceListSupplier) delegating.getDelegate(); + assertThat(delegating.getDelegate()).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); + }); } @Test public void testIllegalArgumentExceptionThrownWhenBaseBuilderNull() { - new ApplicationContextRunner().withUserConfiguration(CacheTestConfig.class) - .run(context -> { - try { - ServiceInstanceListSupplier.builder().withHealthChecks() - .build(context); - fail("Should have thrown exception."); - } - catch (Exception exception) { - assertThat(exception) - .isInstanceOf(IllegalArgumentException.class); - } + new ApplicationContextRunner().withUserConfiguration(CacheTestConfig.class).run(context -> { + try { + ServiceInstanceListSupplier.builder().withHealthChecks().build(context); + fail("Should have thrown exception."); + } + catch (Exception exception) { + assertThat(exception).isInstanceOf(IllegalArgumentException.class); + } - }); + }); } @Test public void testDelegateReturnedIfLoadBalancerCacheManagerNotAvailable() { - new ApplicationContextRunner().withUserConfiguration(BaseTestConfig.class) - .run(context -> { - ServiceInstanceListSupplier supplier = ServiceInstanceListSupplier - .builder().withDiscoveryClient().withHealthChecks() - .withCaching().build(context); - assertThat(supplier) - .isNotInstanceOf(CachingServiceInstanceListSupplier.class); - assertThat(supplier) - .isInstanceOf(HealthCheckServiceInstanceListSupplier.class); - DelegatingServiceInstanceListSupplier delegating = (DelegatingServiceInstanceListSupplier) supplier; - assertThat(delegating.getDelegate()).isInstanceOf( - DiscoveryClientServiceInstanceListSupplier.class); - }); + new ApplicationContextRunner().withUserConfiguration(BaseTestConfig.class).run(context -> { + ServiceInstanceListSupplier supplier = ServiceInstanceListSupplier.builder().withDiscoveryClient() + .withHealthChecks().withCaching().build(context); + assertThat(supplier).isNotInstanceOf(CachingServiceInstanceListSupplier.class); + assertThat(supplier).isInstanceOf(HealthCheckServiceInstanceListSupplier.class); + DelegatingServiceInstanceListSupplier delegating = (DelegatingServiceInstanceListSupplier) supplier; + assertThat(delegating.getDelegate()).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class); + }); } @Import(BaseTestConfig.class) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java index c1b02392..c6ff1563 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java @@ -46,26 +46,23 @@ class ZonePreferenceServiceInstanceListSupplierTests { private LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null); - private ZonePreferenceServiceInstanceListSupplier supplier = new ZonePreferenceServiceInstanceListSupplier( - delegate, zoneConfig); + private ZonePreferenceServiceInstanceListSupplier supplier = new ZonePreferenceServiceInstanceListSupplier(delegate, + zoneConfig); private ServiceInstance first = serviceInstance("test-1", buildZoneMetadata("zone1")); - private ServiceInstance second = serviceInstance("test-2", - buildZoneMetadata("zone1")); + private ServiceInstance second = serviceInstance("test-2", buildZoneMetadata("zone1")); private ServiceInstance third = serviceInstance("test-3", buildZoneMetadata("zone2")); - private ServiceInstance fourth = serviceInstance("test-4", - buildZoneMetadata("zone3")); + private ServiceInstance fourth = serviceInstance("test-4", buildZoneMetadata("zone3")); private ServiceInstance fifth = serviceInstance("test-5", buildZoneMetadata(null)); @Test void shouldFilterInstancesByZone() { zoneConfig.setZone("zone1"); - when(delegate.get()).thenReturn( - Flux.just(Arrays.asList(first, second, third, fourth, fifth))); + when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third, fourth, fifth))); List filtered = supplier.get().blockFirst(); @@ -90,16 +87,14 @@ class ZonePreferenceServiceInstanceListSupplierTests { @Test void shouldNotThrowNPEIfNullInstanceMetadata() { zoneConfig.setZone("zone1"); - when(delegate.get()).thenReturn( - Flux.just(Collections.singletonList(serviceInstance("test-6", null)))); + when(delegate.get()).thenReturn(Flux.just(Collections.singletonList(serviceInstance("test-6", null)))); assertThatCode(() -> supplier.get().blockFirst()).doesNotThrowAnyException(); } @Test void shouldReturnAllInstancesIfNoZone() { zoneConfig.setZone(null); - when(delegate.get()) - .thenReturn(Flux.just(Arrays.asList(first, second, third, fourth))); + when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third, fourth))); List filtered = supplier.get().blockFirst(); @@ -107,10 +102,8 @@ class ZonePreferenceServiceInstanceListSupplierTests { assertThat(filtered).contains(first, second, third, fourth); } - private DefaultServiceInstance serviceInstance(String instanceId, - Map metadata) { - return new DefaultServiceInstance("test", instanceId, "http://test.test", 9080, - false, metadata); + private DefaultServiceInstance serviceInstance(String instanceId, Map metadata) { + return new DefaultServiceInstance("test", instanceId, "http://test.test", 9080, false, metadata); } private Map buildZoneMetadata(String zone) { diff --git a/spring-cloud-test-support/src/main/java/org/springframework/cloud/test/ModifiedClassPathRunner.java b/spring-cloud-test-support/src/main/java/org/springframework/cloud/test/ModifiedClassPathRunner.java index 531ddae2..3858b3fc 100644 --- a/spring-cloud-test-support/src/main/java/org/springframework/cloud/test/ModifiedClassPathRunner.java +++ b/spring-cloud-test-support/src/main/java/org/springframework/cloud/test/ModifiedClassPathRunner.java @@ -70,8 +70,7 @@ import org.springframework.util.StringUtils; */ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { - private static final Pattern INTELLIJ_CLASSPATH_JAR_PATTERN = Pattern - .compile(".*classpath(\\d+)?\\.jar"); + private static final Pattern INTELLIJ_CLASSPATH_JAR_PATTERN = Pattern.compile(".*classpath(\\d+)?\\.jar"); public ModifiedClassPathRunner(Class testClass) throws InitializationError { super(testClass); @@ -91,15 +90,14 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { @Override protected Object createTest() throws Exception { ModifiedClassPathTestClass testClass = (ModifiedClassPathTestClass) getTestClass(); - return testClass.doWithModifiedClassPathThreadContextClassLoader( - () -> ModifiedClassPathRunner.super.createTest()); + return testClass + .doWithModifiedClassPathThreadContextClassLoader(() -> ModifiedClassPathRunner.super.createTest()); } private URLClassLoader createTestClassLoader(Class testClass) throws Exception { ClassLoader classLoader = this.getClass().getClassLoader(); - return new ModifiedClassPathClassLoader( - processUrls(extractUrls(classLoader), testClass), classLoader.getParent(), - classLoader); + return new ModifiedClassPathClassLoader(processUrls(extractUrls(classLoader), testClass), + classLoader.getParent(), classLoader); } private URL[] extractUrls(ClassLoader classLoader) throws Exception { @@ -119,8 +117,8 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { if (classLoader instanceof URLClassLoader) { return Stream.of(((URLClassLoader) classLoader).getURLs()); } - return Stream.of(ManagementFactory.getRuntimeMXBean().getClassPath() - .split(File.pathSeparator)).map(this::toURL); + return Stream.of(ManagementFactory.getRuntimeMXBean().getClassPath().split(File.pathSeparator)) + .map(this::toURL); } private URL toURL(String entry) { @@ -170,8 +168,7 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { private String[] getClassPath(URL booterJar) throws Exception { Attributes attributes = getManifestMainAttributesFromUrl(booterJar); - return StringUtils.delimitedListToStringArray( - attributes.getValue(Attributes.Name.CLASS_PATH), " "); + return StringUtils.delimitedListToStringArray(attributes.getValue(Attributes.Name.CLASS_PATH), " "); } private Attributes getManifestMainAttributesFromUrl(URL url) throws Exception { @@ -181,13 +178,10 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { } private URL[] processUrls(URL[] urls, Class testClass) throws Exception { - MergedAnnotations annotations = MergedAnnotations.from(testClass, - SearchStrategy.TYPE_HIERARCHY); - ClassPathEntryFilter filter = new ClassPathEntryFilter( - annotations.get(ClassPathExclusions.class)); + MergedAnnotations annotations = MergedAnnotations.from(testClass, SearchStrategy.TYPE_HIERARCHY); + ClassPathEntryFilter filter = new ClassPathEntryFilter(annotations.get(ClassPathExclusions.class)); List processedUrls = new ArrayList<>(); - List additionalUrls = getAdditionalUrls( - annotations.get(ClassPathOverrides.class)); + List additionalUrls = getAdditionalUrls(annotations.get(ClassPathOverrides.class)); processedUrls.addAll(additionalUrls); for (URL url : urls) { if (!filter.isExcluded(url)) { @@ -197,8 +191,7 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { return processedUrls.toArray(new URL[0]); } - private List getAdditionalUrls(MergedAnnotation annotation) - throws Exception { + private List getAdditionalUrls(MergedAnnotation annotation) throws Exception { if (!annotation.isPresent()) { return Collections.emptyList(); } @@ -206,26 +199,19 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { } private List resolveCoordinates(String[] coordinates) throws Exception { - DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils - .newServiceLocator(); - serviceLocator.addService(RepositoryConnectorFactory.class, - BasicRepositoryConnectorFactory.class); + DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator(); + serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class); serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class); - RepositorySystem repositorySystem = serviceLocator - .getService(RepositorySystem.class); + RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class); DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - LocalRepository localRepository = new LocalRepository( - System.getProperty("user.home") + "/.m2/repository"); - session.setLocalRepositoryManager( - repositorySystem.newLocalRepositoryManager(session, localRepository)); - CollectRequest collectRequest = new CollectRequest(null, - Arrays.asList(new RemoteRepository.Builder("central", "default", - "https://repo.maven.apache.org/maven2").build())); + LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository"); + session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(session, localRepository)); + CollectRequest collectRequest = new CollectRequest(null, Arrays.asList( + new RemoteRepository.Builder("central", "default", "https://repo.maven.apache.org/maven2").build())); collectRequest.setDependencies(createDependencies(coordinates)); DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null); - DependencyResult result = repositorySystem.resolveDependencies(session, - dependencyRequest); + DependencyResult result = repositorySystem.resolveDependencies(session, dependencyRequest); List resolvedArtifacts = new ArrayList<>(); for (ArtifactResult artifact : result.getArtifactResults()) { resolvedArtifacts.add(artifact.getArtifact().getFile().toURI().toURL()); @@ -250,13 +236,11 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { private final AntPathMatcher matcher = new AntPathMatcher(); - private ClassPathEntryFilter(MergedAnnotation annotation) - throws Exception { + private ClassPathEntryFilter(MergedAnnotation annotation) throws Exception { this.exclusions = new ArrayList<>(); this.exclusions.add("log4j-*.jar"); if (annotation.isPresent()) { - this.exclusions.addAll( - Arrays.asList(annotation.getStringArray(MergedAnnotation.VALUE))); + this.exclusions.addAll(Arrays.asList(annotation.getStringArray(MergedAnnotation.VALUE))); } } @@ -282,15 +266,13 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { private final ClassLoader classLoader; - ModifiedClassPathTestClass(ClassLoader classLoader, String testClassName) - throws ClassNotFoundException { + ModifiedClassPathTestClass(ClassLoader classLoader, String testClassName) throws ClassNotFoundException { super(classLoader.loadClass(testClassName)); this.classLoader = classLoader; } @Override - public List getAnnotatedMethods( - Class annotationClass) { + public List getAnnotatedMethods(Class annotationClass) { try { return getAnnotatedMethods(annotationClass.getName()); } @@ -300,28 +282,24 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { } @SuppressWarnings("unchecked") - private List getAnnotatedMethods(String annotationClassName) - throws ClassNotFoundException { + private List getAnnotatedMethods(String annotationClassName) throws ClassNotFoundException { Class annotationClass = (Class) this.classLoader .loadClass(annotationClassName); List methods = super.getAnnotatedMethods(annotationClass); return wrapFrameworkMethods(methods); } - private List wrapFrameworkMethods( - List methods) { + private List wrapFrameworkMethods(List methods) { List wrapped = new ArrayList<>(methods.size()); for (FrameworkMethod frameworkMethod : methods) { - wrapped.add(new ModifiedClassPathFrameworkMethod( - frameworkMethod.getMethod())); + wrapped.add(new ModifiedClassPathFrameworkMethod(frameworkMethod.getMethod())); } return wrapped; } private T doWithModifiedClassPathThreadContextClassLoader( ModifiedClassPathTcclAction action) throws E { - ClassLoader originalClassLoader = Thread.currentThread() - .getContextClassLoader(); + ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(this.classLoader); try { return action.perform(); @@ -352,11 +330,9 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { } @Override - public Object invokeExplosively(Object target, Object... params) - throws Throwable { + public Object invokeExplosively(Object target, Object... params) throws Throwable { return doWithModifiedClassPathThreadContextClassLoader( - () -> ModifiedClassPathFrameworkMethod.super.invokeExplosively( - target, params)); + () -> ModifiedClassPathFrameworkMethod.super.invokeExplosively(target, params)); } } @@ -370,8 +346,7 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { private final ClassLoader junitLoader; - ModifiedClassPathClassLoader(URL[] urls, ClassLoader parent, - ClassLoader junitLoader) { + ModifiedClassPathClassLoader(URL[] urls, ClassLoader parent, ClassLoader junitLoader) { super(urls, parent); this.junitLoader = junitLoader; } diff --git a/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerExclusionsTests.java b/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerExclusionsTests.java index a6393b3c..8d068193 100644 --- a/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerExclusionsTests.java +++ b/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerExclusionsTests.java @@ -32,8 +32,7 @@ import static org.hamcrest.CoreMatchers.isA; @ClassPathExclusions("hibernate-validator-*.jar") public class ModifiedClassPathRunnerExclusionsTests { - private static final String EXCLUDED_RESOURCE = "META-INF/services/" - + "javax.validation.spi.ValidationProvider"; + private static final String EXCLUDED_RESOURCE = "META-INF/services/" + "javax.validation.spi.ValidationProvider"; @Test public void entriesAreFilteredFromTestClassClassLoader() { @@ -42,8 +41,7 @@ public class ModifiedClassPathRunnerExclusionsTests { @Test public void entriesAreFilteredFromThreadContextClassLoader() { - assertThat(Thread.currentThread().getContextClassLoader() - .getResource(EXCLUDED_RESOURCE)).isNull(); + assertThat(Thread.currentThread().getContextClassLoader().getResource(EXCLUDED_RESOURCE)).isNull(); } @Test diff --git a/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerOverridesTests.java b/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerOverridesTests.java index ebe5e712..5c11265f 100644 --- a/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerOverridesTests.java +++ b/spring-cloud-test-support/src/test/java/org/springframework/cloud/test/ModifiedClassPathRunnerOverridesTests.java @@ -35,14 +35,14 @@ public class ModifiedClassPathRunnerOverridesTests { @Test public void classesAreLoadedFromOverride() { - assertThat(ApplicationContext.class.getProtectionDomain().getCodeSource() - .getLocation().toString()).endsWith("spring-context-4.1.0.RELEASE.jar"); + assertThat(ApplicationContext.class.getProtectionDomain().getCodeSource().getLocation().toString()) + .endsWith("spring-context-4.1.0.RELEASE.jar"); } @Test public void classesAreLoadedFromTransitiveDependencyOfOverride() { - assertThat(StringUtils.class.getProtectionDomain().getCodeSource().getLocation() - .toString()).endsWith("spring-core-4.1.0.RELEASE.jar"); + assertThat(StringUtils.class.getProtectionDomain().getCodeSource().getLocation().toString()) + .endsWith("spring-core-4.1.0.RELEASE.jar"); } }