Rename test to conform to usual pattern

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTest.java → spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java

 package org.springframework.cloud.netflix.resttemplate;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -42,16 +39,19 @@ import com.netflix.loadbalancer.ServerList;
 import com.netflix.loadbalancer.ServerStats;
 import com.netflix.niws.client.http.HttpClientLoadBalancerErrorHandler;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = RestTemplateRetryTest.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+@SpringBootTest(classes = RestTemplateRetryTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
 		"spring.application.name=resttemplatetest",
 		"logging.level.org.springframework.cloud.netflix.resttemplate=DEBUG",
 		"badClients.ribbon.MaxAutoRetries=0",
 		"badClients.ribbon.OkToRetryOnAllOperations=true", "ribbon.http.client.enabled" })
 @DirtiesContext
-public class RestTemplateRetryTest {
+public class RestTemplateRetryTests {
 
-	final private static Log logger = LogFactory.getLog(RestTemplateRetryTest.class);
+	final private static Log logger = LogFactory.getLog(RestTemplateRetryTests.class);
 
 	@Value("${local.server.port}")
 	private int port = 0;
@@ -59,50 +59,7 @@ public class RestTemplateRetryTest {
 	@Autowired
 	private RestTemplate testClient;
 
-	public RestTemplateRetryTest() {
-	}
-
-	@Configuration
-	@EnableAutoConfiguration
-	@RestController
-	@RibbonClient(name = "badClients", configuration = LocalBadClientConfiguration.class)
-	public static class Application {
-
-		private AtomicInteger hits = new AtomicInteger(1);
-		private AtomicInteger retryHits = new AtomicInteger(1);
-
-		@RequestMapping(method = RequestMethod.GET, value = "/ping")
-		public int ping() {
-			return 0;
-		}
-
-		@RequestMapping(method = RequestMethod.GET, value = "/good")
-		public int good() {
-			int lValue = this.hits.getAndIncrement();
-			return lValue;
-		}
-
-		@RequestMapping(method = RequestMethod.GET, value = "/timeout")
-		public int timeout() throws Exception {
-			int lValue = this.retryHits.getAndIncrement();
-
-			// Force the good server to have 2 consecutive errors a couple of times.
-			if (lValue == 2 || lValue == 3 || lValue == 5 || lValue == 6) {
-				Thread.sleep(500);
-			}
-			return lValue;
-		}
-
-		@RequestMapping(method = RequestMethod.GET, value = "/null")
-		public int isNull() throws Exception {
-			throw new NullPointerException("Null");
-		}
-
-		@LoadBalanced
-		@Bean
-		RestTemplate restTemplate() {
-			return new RestTemplate();
-		}
+	public RestTemplateRetryTests() {
 	}
 
 	@Before
@@ -188,7 +145,7 @@ public class RestTemplateRetryTest {
 		assertTrue(badServer2Stats.isCircuitBreakerTripped());
 		assertEquals(targetConnectionCount, goodServerStats.getTotalRequestsCount());
 		assertEquals(20, hits);
-		System.out.println("Retry Hits: " + hits);
+		logger.debug("Retry Hits: " + hits);
 	}
 
 	@Test
@@ -230,6 +187,49 @@ public class RestTemplateRetryTest {
 
 	}
 
+	@Configuration
+	@EnableAutoConfiguration
+	@RestController
+	@RibbonClient(name = "badClients", configuration = LocalBadClientConfiguration.class)
+	public static class Application {
+
+		private AtomicInteger hits = new AtomicInteger(1);
+		private AtomicInteger retryHits = new AtomicInteger(1);
+
+		@RequestMapping(method = RequestMethod.GET, value = "/ping")
+		public int ping() {
+			return 0;
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/good")
+		public int good() {
+			int lValue = this.hits.getAndIncrement();
+			return lValue;
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/timeout")
+		public int timeout() throws Exception {
+			int lValue = this.retryHits.getAndIncrement();
+
+			// Force the good server to have 2 consecutive errors a couple of times.
+			if (lValue == 2 || lValue == 3 || lValue == 5 || lValue == 6) {
+				Thread.sleep(500);
+			}
+			return lValue;
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/null")
+		public int isNull() throws Exception {
+			throw new NullPointerException("Null");
+		}
+
+		@LoadBalanced
+		@Bean
+		RestTemplate restTemplate() {
+			return new RestTemplate();
+		}
+	}
+
 }
 
 // Load balancer with fixed server list for "local" pointing to localhost
@@ -251,8 +251,7 @@ class LocalBadClientConfiguration {
 	@Bean
 	public IRule loadBalancerRule() {
 		// This is a good place to try different load balancing rules and how those rules
-		// behave in failure
-		// states: BestAvailableRule, WeightedResponseTimeRule, etc
+		// behave in failure states: BestAvailableRule, WeightedResponseTimeRule, etc
 
 		// This rule just uses a round robin and will skip servers that are in circuit
 		// breaker state.
@@ -283,7 +282,6 @@ class LocalBadClientConfiguration {
 		public OverrideRetryHandler() {
 			this.circuitRelated.add(UnknownHostException.class);
 			this.retriable.add(UnknownHostException.class);
-
 		}
 	}