Reformat.

Author: OlgaMaciaszek

spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java

@@ -61,14 +61,12 @@ protected static class DiscoveryLoadBalancerConfiguration {
 		@Bean
 		@ConditionalOnDiscoveryHealthIndicatorEnabled
 		public DiscoveryClientHealthIndicator discoveryClientHealthIndicator(
-				ObjectProvider<DiscoveryClient> discoveryClient,
-				DiscoveryClientHealthIndicatorProperties properties) {
+				ObjectProvider<DiscoveryClient> 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 DiscoveryCompositeHealthContributor discoveryCompositeHealthContributor(
 
 		@Bean
 		public HasFeatures commonsFeatures() {
-			return HasFeatures.abstractFeatures(DiscoveryClient.class,
-					LoadBalancerClient.class);
+			return HasFeatures.abstractFeatures(DiscoveryClient.class, LoadBalancerClient.class);
 		}
 
 	}

spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnBlockingDiscoveryEnabled.java

@@ -36,8 +36,7 @@
 @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 {
 
 }

spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnDiscoveryHealthIndicatorEnabled.java

@@ -36,8 +36,7 @@
 @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 {
 
 }

spring-cloud-commons/src/main/java/org/springframework/cloud/client/ConditionalOnReactiveDiscoveryEnabled.java

@@ -39,8 +39,7 @@
 @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 {
 
 }

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<String, String> metadata) {
+	public DefaultServiceInstance(String instanceId, String serviceId, String host, int port, boolean secure,
+			Map<String, String> metadata) {
 		this.instanceId = instanceId;
 		this.serviceId = serviceId;
 		this.host = host;
@@ -66,8 +66,7 @@ public DefaultServiceInstance(String instanceId, String serviceId, String host,
 	 * @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 DefaultServiceInstance(String serviceId, String host, int port, boolean s
 	 * @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 DefaultServiceInstance(String serviceId, String host, int port,
 	 */
 	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 boolean isSecure() {
 
 	@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 boolean equals(Object o) {
 			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);
 	}
 
 }

spring-cloud-commons/src/main/java/org/springframework/cloud/client/HostInfoEnvironmentPostProcessor.java

@@ -34,8 +34,7 @@
 /**
  * @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 int getOrder() {
 	}
 
 	@Override
-	public void postProcessEnvironment(ConfigurableEnvironment environment,
-			SpringApplication application) {
+	public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
 		InetUtils.HostInfo hostInfo = getFirstNonLoopbackHostInfo(environment);
 		LinkedHashMap<String, Object> 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();
 		}

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 ReactiveDiscoveryCompositeHealthContributor reactiveDiscoveryClients(
 
 		@Bean
 		public HasFeatures reactiveCommonsFeatures() {
-			return HasFeatures.abstractFeatures(ReactiveDiscoveryClient.class,
-					ReactiveLoadBalancer.class);
+			return HasFeatures.abstractFeatures(ReactiveDiscoveryClient.class, ReactiveLoadBalancer.class);
 		}
 
 	}

spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/FeaturesEndpoint.java

@@ -82,10 +82,8 @@ private void addAbstractFeature(Features features, Class<?> type) {
 
 	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 String getVendor() {
 
 		@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 boolean equals(Object o) {
 
 			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

spring-cloud-commons/src/main/java/org/springframework/cloud/client/actuator/HasFeatures.java

@@ -30,30 +30,25 @@ public class HasFeatures {
 
 	private final List<NamedFeature> namedFeatures = new ArrayList<>();
 
-	public HasFeatures(List<Class<?>> abstractFeatures,
-			List<NamedFeature> namedFeatures) {
+	public HasFeatures(List<Class<?>> abstractFeatures, List<NamedFeature> namedFeatures) {
 		this.abstractFeatures.addAll(abstractFeatures);
 		this.namedFeatures.addAll(namedFeatures);
 	}
 
 	public static HasFeatures abstractFeatures(Class<?>... abstractFeatures) {
-		return new HasFeatures(Arrays.asList(abstractFeatures),
-				Collections.<NamedFeature>emptyList());
+		return new HasFeatures(Arrays.asList(abstractFeatures), Collections.<NamedFeature>emptyList());
 	}
 
 	public static HasFeatures namedFeatures(NamedFeature... namedFeatures) {
-		return new HasFeatures(Collections.<Class<?>>emptyList(),
-				Arrays.asList(namedFeatures));
+		return new HasFeatures(Collections.<Class<?>>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<Class<?>> getAbstractFeatures() {

spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/Customizer.java

@@ -39,8 +39,7 @@ public interface Customizer<TOCUSTOMIZE> {
 	 * @param <K> the type of the identifier of the target
 	 * @return a wrapped customizer
 	 */
-	static <T, K> Customizer<T> once(Customizer<T> customizer,
-			Function<? super T, ? extends K> keyMapper) {
+	static <T, K> Customizer<T> once(Customizer<T> customizer, Function<? super T, ? extends K> keyMapper) {
 		final ConcurrentMap<K, Boolean> customized = new ConcurrentHashMap<>();
 		return t -> {
 			final K key = keyMapper.apply(t);