Merge remote-tracking branch 'origin/3.1.x', reformat. Fix OkHttpClient test.

# Conflicts:
#	docs/pom.xml
#	docs/src/main/asciidoc/_configprops.adoc
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context-webflux-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter-bootstrap/pom.xml
#	spring-cloud-starter-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml

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

@@ -80,13 +80,14 @@ public class DefaultServiceInstance implements ServiceInstance {
 	/**
 	 * Creates a URI from the given ServiceInstance's host:port.
 	 * @param instance the ServiceInstance.
-	 * @return URI of the form (secure)?https:http + "host:port". Scheme port default used if port not set.
+	 * @return URI of the form (secure)?https:http + "host:port". Scheme port default used
+	 * if port not set.
 	 */
 	public static URI getUri(ServiceInstance instance) {
 		String scheme = (instance.isSecure()) ? "https" : "http";
 		int port = instance.getPort();
 		if (port <= 0) {
-		    port = (instance.isSecure()) ? 443 : 80;
+			port = (instance.isSecure()) ? 443 : 80;
 		}
 		String uri = String.format("%s://%s:%s", scheme, instance.getHost(), port);
 		return URI.create(uri);

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

@@ -70,7 +70,7 @@ public class SimpleDiscoveryClientTests {
 		then(instances.get(1).getUri()).isEqualTo(URI.create("https://host2:443"));
 		then(instances.get(1).isSecure()).isEqualTo(true);
 		then(instances.get(1).getMetadata()).isNotNull();
-		
+
 		then(instances.get(2).getServiceId()).isEqualTo("service1");
 		then(instances.get(2).getHost()).isEqualTo("host3");
 		then(instances.get(2).getPort()).isEqualTo(0);

spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultOkHttpClientFactoryTest.java

@@ -41,9 +41,9 @@ public class DefaultOkHttpClientFactoryTest {
 		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();
-		int connectTimeout = getField(httpClient, "connectTimeout");
+		int connectTimeout = getField(httpClient, "connectTimeoutMillis");
 		then(connectTimeout).isEqualTo(2);
-		int readTimeout = getField(httpClient, "readTimeout");
+		int readTimeout = getField(httpClient, "readTimeoutMillis");
 		then(readTimeout).isEqualTo(TimeUnit.HOURS.toMillis(3));
 		boolean followRedirects = getField(httpClient, "followRedirects");
 		then(followRedirects).isTrue();