diff --git a/pom.xml b/pom.xml index c78c1f797..23476f913 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 2.2.0.BUILD-SNAPSHOT Horsham.BUILD-SNAPSHOT - 2.1.1.RELEASE + 2.1.3.RELEASE jacoco diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java index 39811714f..11109cd38 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java @@ -65,12 +65,7 @@ public class EurekaHealthCheckTests { @Bean public HealthIndicator healthIndicator() { - return new HealthIndicator() { - @Override - public Health health() { - return new Health.Builder().outOfService().build(); - } - }; + return () -> new Health.Builder().outOfService().build(); } } diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java index 5caff370e..e31bcfda9 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java @@ -131,10 +131,9 @@ public class EurekaServerMockApplication { if ("fourOFour".equals(appName)) { return new ResponseEntity(HttpStatus.NOT_FOUND); } - return new ResponseEntity(new InstanceInfo(null, null, null, null, - null, null, null, null, null, null, null, null, null, 0, null, null, null, - null, null, null, null, new HashMap<>(), 0L, 0L, null, null), - HttpStatus.OK); + return new ResponseEntity<>(new InstanceInfo(null, null, null, null, null, null, + null, null, null, null, null, null, null, 0, null, null, null, null, null, + null, null, new HashMap<>(), 0L, 0L, null, null), HttpStatus.OK); } @ResponseStatus(HttpStatus.OK) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java index ea87d208c..006d0c00d 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/EurekaSampleApplication.java @@ -65,13 +65,7 @@ public class EurekaSampleApplication implements ApplicationContextAware, Closeab @Bean public HealthCheckHandler healthCheckHandler() { - return new HealthCheckHandler() { - @Override - public InstanceInfo.InstanceStatus getStatus( - InstanceInfo.InstanceStatus currentStatus) { - return InstanceInfo.InstanceStatus.UP; - } - }; + return currentStatus -> InstanceInfo.InstanceStatus.UP; } @RequestMapping("/") diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java index 713cc1167..258dd7d26 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/DomainExtractingServerListTests.java @@ -66,7 +66,7 @@ public class DomainExtractingServerListTests { @Test public void testZoneInMetaData() { - this.metadata = new HashMap(); + this.metadata = new HashMap<>(); this.metadata.put("zone", "us-west-1"); this.metadata.put("instanceId", INSTANCE_ID); DomainExtractingServerList serverList = getDomainExtractingServerList( diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java index 7dae9511d..29724e83c 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java @@ -68,12 +68,7 @@ public class RibbonEurekaAutoConfigurationTests { @Bean public CommandLineRunner commandLineRunner( final TestLoadbalancerClient testLoadbalancerClient) { - return new CommandLineRunner() { - @Override - public void run(String... args) throws Exception { - testLoadbalancerClient.doStuff(); - } - }; + return args -> testLoadbalancerClient.doStuff(); } } diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java index e3bd7543c..28bc67991 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java @@ -20,7 +20,6 @@ import java.net.URI; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -197,21 +196,16 @@ public class EurekaController { else { zoneCounts.put(zone, 1); } - List> list = instancesByStatus.get(status); - if (list == null) { - list = new ArrayList<>(); - instancesByStatus.put(status, list); - } + List> list = instancesByStatus + .computeIfAbsent(status, k -> new ArrayList<>()); list.add(new Pair<>(id, url)); } appData.put("amiCounts", amiCounts.entrySet()); appData.put("zoneCounts", zoneCounts.entrySet()); ArrayList> instanceInfos = new ArrayList<>(); appData.put("instanceInfos", instanceInfos); - for (Iterator>>> iter = instancesByStatus - .entrySet().iterator(); iter.hasNext();) { - Map.Entry>> entry = iter - .next(); + for (Map.Entry>> entry : instancesByStatus + .entrySet()) { List> value = entry.getValue(); InstanceInfo.InstanceStatus status = entry.getKey(); LinkedHashMap instanceData = new LinkedHashMap<>(); @@ -296,8 +290,8 @@ public class EurekaController { StringBuilder filteredUrls = new StringBuilder(); for (String u : urls) { if (u.contains("@")) { - filteredUrls.append(u.substring(0, u.indexOf("//") + 2)) - .append(u.substring(u.indexOf("@") + 1, u.length())).append(","); + filteredUrls.append(u, 0, u.indexOf("//") + 2) + .append(u.substring(u.indexOf("@") + 1)).append(","); } else { filteredUrls.append(u).append(","); diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java index a8bc67231..1f6658b1a 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java @@ -64,23 +64,20 @@ public class EurekaServerInitializerConfiguration @Override public void start() { - new Thread(new Runnable() { - @Override - public void run() { - try { - // TODO: is this class even needed now? - eurekaServerBootstrap.contextInitialized( - EurekaServerInitializerConfiguration.this.servletContext); - log.info("Started Eureka Server"); + new Thread(() -> { + try { + // TODO: is this class even needed now? + eurekaServerBootstrap.contextInitialized( + EurekaServerInitializerConfiguration.this.servletContext); + log.info("Started Eureka Server"); - publish(new EurekaRegistryAvailableEvent(getEurekaServerConfig())); - EurekaServerInitializerConfiguration.this.running = true; - publish(new EurekaServerStartedEvent(getEurekaServerConfig())); - } - catch (Exception ex) { - // Help! - log.error("Could not initialize Eureka servlet context", ex); - } + publish(new EurekaRegistryAvailableEvent(getEurekaServerConfig())); + EurekaServerInitializerConfiguration.this.running = true; + publish(new EurekaServerStartedEvent(getEurekaServerConfig())); + } + catch (Exception ex) { + // Help! + log.error("Could not initialize Eureka servlet context", ex); } }).start(); } diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java index 095680d9b..4aa3f0c68 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/RefreshablePeerEurekaNodesTests.java @@ -85,7 +85,7 @@ public class RefreshablePeerEurekaNodesTests { "eureka.client.region=unavailable-region", // to force defaultZone "eureka.client.service-url.defaultZone=https://default-host1:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( - new HashSet(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); + new HashSet<>(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); assertThat(serviceUrlMatches("https://default-host1:8678/eureka/")).as( "PeerEurekaNodes' are updated when eureka.client.use-dns-for-fetching-service-urls is true") @@ -98,7 +98,7 @@ public class RefreshablePeerEurekaNodesTests { "eureka.client.region=unavailable-region", // to force defaultZone "eureka.client.service-url.defaultZone=https://default-host2:8678/eureka/"); this.context.publishEvent(new EnvironmentChangeEvent( - new HashSet(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); + new HashSet<>(Arrays.asList(USE_DNS, DEFAULT_ZONE)))); assertThat(serviceUrlMatches("https://default-host2:8678/eureka/")).as( "PeerEurekaNodes' are not updated when eureka.client.use-dns-for-fetching-service-urls is false") diff --git a/spring-cloud-netflix-hystrix-contract/pom.xml b/spring-cloud-netflix-hystrix-contract/pom.xml index bbd5afd83..fc45e065f 100644 --- a/spring-cloud-netflix-hystrix-contract/pom.xml +++ b/spring-cloud-netflix-hystrix-contract/pom.xml @@ -14,7 +14,7 @@ spring-cloud-netflix-hystrix-contract Spring Cloud Netflix Hystrix Contract - 2.1.1.RELEASE + 2.1.3.RELEASE diff --git a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java index e2f366cbd..0cfaefbfd 100644 --- a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java +++ b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java @@ -64,8 +64,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen // https://github.com/spring-cloud/spring-cloud-netflix/issues/1948 "spring.cloud.stream.bindings.turbineStreamInput.destination=hystrixStreamOutput", "spring.jmx.enabled=true", "stubrunner.workOffline=true", - "stubrunner.ids=org.springframework.cloud:spring-cloud-netflix-hystrix-stream:${projectVersion:2.2.0.BUILD-SNAPSHOT}:stubs", - "logging.level.org.springframework=DEBUG" }) + "stubrunner.ids=org.springframework.cloud:spring-cloud-netflix-hystrix-stream:${projectVersion:2.1.3.BUILD-SNAPSHOT}:stubs" }) @AutoConfigureStubRunner(stubsMode = StubsMode.LOCAL) public class TurbineStreamTests {