Fix after code review - add license notice, reformat imports, edit docs.

docs/src/main/asciidoc/spring-cloud-commons.adoc

@@ -255,7 +255,8 @@ To disable the description field of the `DiscoveryClientHealthIndicator`, set `s
 Otherwise, it can bubble up as the `description` of the rolled up `HealthIndicator`.
 
 ==== Ordering `DiscoveryClient` instances
-`DiscoveryClient` interface extends `Ordered` to let you define the order of the returned discovery clients, similar to
+`DiscoveryClient` interface extends `Ordered`. This is useful when using multiple discovery
+ clients, as it allows you to define the order of the returned discovery clients, similar to
 how you can order the beans loaded by a Spring application. By default, the order of any `DiscoveryClient` is set to
 `0`. If you want to set a different order for your custom `DiscoveryClient` implementations, you just need to override
 the `getOrder()` method so that it returns the value that is suitable for your setup. Apart from this, you can use

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.client.discovery.composite;
 
 import java.util.ArrayList;

spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.client.discovery.simple;
 
 import java.util.ArrayList;

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.client.discovery.simple;
 
 import java.net.URI;

spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java

@@ -1,10 +1,20 @@
-package org.springframework.cloud.client.discovery.composite;
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_DISCOVERY_CLIENT;
-import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_SERVICE_ID;
-import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.DEFAULT_ORDER_DISCOVERY_CLIENT;
-import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.FOURTH_DISCOVERY_CLIENT;
+package org.springframework.cloud.client.discovery.composite;
 
 import java.util.List;
 
@@ -17,6 +27,12 @@ import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_DISCOVERY_CLIENT;
+import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_SERVICE_ID;
+import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.DEFAULT_ORDER_DISCOVERY_CLIENT;
+import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.FOURTH_DISCOVERY_CLIENT;
+
 /**
  * Tests for the support of ordered {@link DiscoveryClient} instances in {@link CompositeDiscoveryClient}
  *
@@ -24,7 +40,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = "spring.cloud.discovery.client.simple.order:2", classes = {
-		CompositeDiscoveryClientTestsConfig.class })
+		CompositeDiscoveryClientTestsConfig.class})
 public class CompositeDiscoveryClientOrderTest {
 
 	@Autowired

spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java

@@ -1,7 +1,20 @@
-package org.springframework.cloud.client.discovery.composite;
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_SERVICE_ID;
+package org.springframework.cloud.client.discovery.composite;
 
 import java.net.URI;
 
@@ -14,9 +27,12 @@ import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClientTestsConfig.CUSTOM_SERVICE_ID;
+
 /**
  * Tests for behavior of Composite Discovery Client
- * 
+ *
  * @author Biju Kunjummen
  */
 
@@ -26,8 +42,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 		"spring.cloud.discovery.client.simple.instances.service1[0].uri=http://s1-1:8080",
 		"spring.cloud.discovery.client.simple.instances.service1[1].uri=https://s1-2:8443",
 		"spring.cloud.discovery.client.simple.instances.service2[0].uri=https://s2-1:8080",
-		"spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s2-2:443", }, classes = {
-				CompositeDiscoveryClientTestsConfig.class })
+		"spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s2-2:443",}, classes = {
+		CompositeDiscoveryClientTestsConfig.class})
 public class CompositeDiscoveryClientTests {
 
 	@Autowired
@@ -45,17 +61,17 @@ public class CompositeDiscoveryClientTests {
 		assertThat(s1.getUri()).isEqualTo(URI.create("http://s1-1:8080"));
 		assertThat(s1.isSecure()).isEqualTo(false);
 	}
-	
+
 	@Test
 	public void getServicesShouldAggregateAllServiceNames() {
 		assertThat(this.discoveryClient.getServices()).containsOnlyOnce("service1", "service2", "custom");
 	}
-	
+
 	@Test
 	public void getDescriptionShouldBeComposite() {
 		assertThat(this.discoveryClient.description()).isEqualTo("Composite Discovery Client");
 	}
-	
+
 	@Test
 	public void getInstancesShouldRespectOrder() {
 		assertThat(this.discoveryClient.getInstances(CUSTOM_SERVICE_ID)).hasSize(1);

spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java

@@ -1,6 +1,20 @@
-package org.springframework.cloud.client.discovery.composite;
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import static java.util.Collections.singletonList;
+package org.springframework.cloud.client.discovery.composite;
 
 import java.util.Collections;
 import java.util.List;
@@ -12,6 +26,8 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import static java.util.Collections.singletonList;
+
 /**
  * Test configuration for {@link CompositeDiscoveryClient} tests.
  *