From 0c84c9b2c4bc4f1bea7640badd1a6e10ea0defd8 Mon Sep 17 00:00:00 2001 From: Gregor Riegler Date: Wed, 16 Jun 2021 19:12:12 +0000 Subject: [PATCH] refactor: use diamond operator Co-authored-by: Moderne --- .../java/com/netflix/appinfo/InstanceInfo.java | 2 +- .../discovery/AbstractAzToRegionMapper.java | 2 +- .../discovery/DefaultEurekaClientConfig.java | 2 +- .../com/netflix/discovery/DiscoveryClient.java | 12 ++++++------ .../discovery/InstanceInfoReplicator.java | 2 +- .../PropertyBasedAzToRegionMapper.java | 2 +- .../discovery/endpoint/DnsResolver.java | 2 +- .../discovery/endpoint/EndpointUtils.java | 14 +++++++------- .../netflix/discovery/shared/Application.java | 8 ++++---- .../netflix/discovery/shared/Applications.java | 8 ++++---- .../shared/resolver/AsyncResolver.java | 2 +- .../shared/resolver/StaticClusterResolver.java | 2 +- .../shared/transport/EurekaHttpResponse.java | 6 +++--- .../discovery/util/EurekaEntityFunctions.java | 2 +- .../discovery/DiscoveryClientEventBusTest.java | 2 +- ...Jersey1DiscoveryClientOptionalArgsTest.java | 8 ++++---- .../discovery/MockRemoteEurekaServer.java | 4 ++-- .../discovery/TimedSupervisorTaskTest.java | 2 +- .../discovery/converters/CodecLoadTester.java | 4 ++-- .../transport/EurekaHttpClientsTest.java | 4 ++-- .../eureka/DefaultEurekaServerConfig.java | 2 +- .../eureka/GzipEncodingEnforcingFilter.java | 4 ++-- .../com/netflix/eureka/RateLimitingFilter.java | 2 +- .../com/netflix/eureka/aws/AwsAsgUtil.java | 4 ++-- .../com/netflix/eureka/aws/EIPManager.java | 2 +- .../protocol/ReplicationListResponse.java | 2 +- .../registry/AbstractInstanceRegistry.java | 18 +++++++++--------- .../PeerAwareInstanceRegistryImpl.java | 2 +- .../eureka/registry/RemoteRegionRegistry.java | 6 +++--- .../eureka/registry/ResponseCacheImpl.java | 2 +- .../com/netflix/eureka/AbstractTester.java | 2 +- .../executor/AsyncSequentialExecutor.java | 2 +- .../discovery/util/ApplicationFunctions.java | 4 ++-- .../discovery/util/InstanceInfoGenerator.java | 2 +- 34 files changed, 72 insertions(+), 72 deletions(-) mode change 100755 => 100644 eureka-client/src/main/java/com/netflix/discovery/shared/Application.java mode change 100755 => 100644 eureka-client/src/main/java/com/netflix/discovery/shared/Applications.java diff --git a/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java index 7eaeceade6..f173f57431 100644 --- a/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java +++ b/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java @@ -1102,7 +1102,7 @@ public String getStatusPageUrl() { */ @JsonIgnore public Set getHealthCheckUrls() { - Set healthCheckUrlSet = new LinkedHashSet(); + Set healthCheckUrlSet = new LinkedHashSet<>(); if (this.isUnsecurePortEnabled && healthCheckUrl != null && !healthCheckUrl.isEmpty()) { healthCheckUrlSet.add(healthCheckUrl); } diff --git a/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java b/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java index 49c8e19e79..1b54a73cee 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java +++ b/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java @@ -35,7 +35,7 @@ public abstract class AbstractAzToRegionMapper implements AzToRegionMapper { Multimaps.newListMultimap(new HashMap>(), new Supplier>() { @Override public List get() { - return new ArrayList(); + return new ArrayList<>(); } }); diff --git a/eureka-client/src/main/java/com/netflix/discovery/DefaultEurekaClientConfig.java b/eureka-client/src/main/java/com/netflix/discovery/DefaultEurekaClientConfig.java index dd1b9c2926..d657d51f42 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/DefaultEurekaClientConfig.java +++ b/eureka-client/src/main/java/com/netflix/discovery/DefaultEurekaClientConfig.java @@ -391,7 +391,7 @@ public List getEurekaServerServiceUrls(String myZone) { return Arrays.asList(serviceUrls.split(URL_SEPARATOR)); } - return new ArrayList(); + return new ArrayList<>(); } /* diff --git a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java index d7d84e6dec..e98a6efb3a 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java +++ b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java @@ -153,7 +153,7 @@ public class DiscoveryClient implements EurekaClient { private final Provider healthCheckHandlerProvider; private final Provider healthCheckCallbackProvider; private final PreRegistrationHandler preRegistrationHandler; - private final AtomicReference localRegionApps = new AtomicReference(); + private final AtomicReference localRegionApps = new AtomicReference<>(); private final Lock fetchRegistryUpdateLock = new ReentrantLock(); // monotonically increasing generation counter to ensure stale threads do not reset registry to an older version private final AtomicLong fetchRegistryGeneration; @@ -354,7 +354,7 @@ public synchronized BackupRegistry get() { fetchRegistryGeneration = new AtomicLong(0); - remoteRegionsToFetch = new AtomicReference(clientConfig.fetchRegistryForRemoteRegions()); + remoteRegionsToFetch = new AtomicReference<>(clientConfig.fetchRegistryForRemoteRegions()); remoteRegionsRef = new AtomicReference<>(remoteRegionsToFetch.get() == null ? null : remoteRegionsToFetch.get().split(",")); if (config.shouldFetchRegistry()) { @@ -403,7 +403,7 @@ public synchronized BackupRegistry get() { heartbeatExecutor = new ThreadPoolExecutor( 1, clientConfig.getHeartbeatExecutorThreadPoolSize(), 0, TimeUnit.SECONDS, - new SynchronousQueue(), + new SynchronousQueue<>(), new ThreadFactoryBuilder() .setNameFormat("DiscoveryClient-HeartbeatExecutor-%d") .setDaemon(true) @@ -412,7 +412,7 @@ public synchronized BackupRegistry get() { cacheRefreshExecutor = new ThreadPoolExecutor( 1, clientConfig.getCacheRefreshExecutorThreadPoolSize(), 0, TimeUnit.SECONDS, - new SynchronousQueue(), + new SynchronousQueue<>(), new ThreadFactoryBuilder() .setNameFormat("DiscoveryClient-CacheRefreshExecutor-%d") .setDaemon(true) @@ -635,7 +635,7 @@ public Set getAllKnownRegions() { String localRegion = instanceRegionChecker.getLocalRegion(); if (!remoteRegionVsApps.isEmpty()) { Set regions = remoteRegionVsApps.keySet(); - Set toReturn = new HashSet(regions); + Set toReturn = new HashSet<>(regions); toReturn.add(localRegion); return toReturn; } else { @@ -775,7 +775,7 @@ public List getInstancesByVipAddress(String vipAddress, boolean se public List getInstancesByVipAddressAndAppName( String vipAddress, String appName, boolean secure) { - List result = new ArrayList(); + List result = new ArrayList<>(); if (vipAddress == null && appName == null) { throw new IllegalArgumentException( "Supplied VIP Address and application name cannot both be null"); diff --git a/eureka-client/src/main/java/com/netflix/discovery/InstanceInfoReplicator.java b/eureka-client/src/main/java/com/netflix/discovery/InstanceInfoReplicator.java index 212f05e785..b22c4015dc 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/InstanceInfoReplicator.java +++ b/eureka-client/src/main/java/com/netflix/discovery/InstanceInfoReplicator.java @@ -49,7 +49,7 @@ class InstanceInfoReplicator implements Runnable { .setDaemon(true) .build()); - this.scheduledPeriodicRef = new AtomicReference(); + this.scheduledPeriodicRef = new AtomicReference<>(); this.started = new AtomicBoolean(false); this.rateLimiter = new RateLimiter(TimeUnit.MINUTES); diff --git a/eureka-client/src/main/java/com/netflix/discovery/PropertyBasedAzToRegionMapper.java b/eureka-client/src/main/java/com/netflix/discovery/PropertyBasedAzToRegionMapper.java index 4ac0eaa51e..fbacae5ee7 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/PropertyBasedAzToRegionMapper.java +++ b/eureka-client/src/main/java/com/netflix/discovery/PropertyBasedAzToRegionMapper.java @@ -15,6 +15,6 @@ public PropertyBasedAzToRegionMapper(EurekaClientConfig clientConfig) { @Override protected Set getZonesForARegion(String region) { - return new HashSet(Arrays.asList(clientConfig.getAvailabilityZones(region))); + return new HashSet<>(Arrays.asList(clientConfig.getAvailabilityZones(region))); } } diff --git a/eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java b/eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java index 7bd69abbf7..531621d042 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java +++ b/eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java @@ -142,7 +142,7 @@ public static Set getCNamesFromTxtRecord(String discoveryDnsName) throws } } - Set cnamesSet = new TreeSet(); + Set cnamesSet = new TreeSet<>(); if (txtRecord == null || txtRecord.trim().isEmpty()) { return cnamesSet; } diff --git a/eureka-client/src/main/java/com/netflix/discovery/endpoint/EndpointUtils.java b/eureka-client/src/main/java/com/netflix/discovery/endpoint/EndpointUtils.java index 9cdb4987a4..65afe4099b 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/endpoint/EndpointUtils.java +++ b/eureka-client/src/main/java/com/netflix/discovery/endpoint/EndpointUtils.java @@ -98,7 +98,7 @@ public static List getServiceUrlsFromDNS(EurekaClientConfig clientConfig // list of available zones Map> zoneDnsNamesMap = getZoneBasedDiscoveryUrlsFromRegion(clientConfig, region); Set availableZones = zoneDnsNamesMap.keySet(); - List zones = new ArrayList(availableZones); + List zones = new ArrayList<>(availableZones); if (zones.isEmpty()) { throw new RuntimeException("No available zones configured for the instanceZone " + instanceZone); } @@ -136,10 +136,10 @@ public static List getServiceUrlsFromDNS(EurekaClientConfig clientConfig } // Now get the eureka urls for all the zones in the order and return it - List serviceUrls = new ArrayList(); + List serviceUrls = new ArrayList<>(); for (String zone : zones) { for (String zoneCname : zoneDnsNamesMap.get(zone)) { - List ec2Urls = new ArrayList(getEC2DiscoveryUrlsFromZone(zoneCname, DiscoveryUrlType.CNAME)); + List ec2Urls = new ArrayList<>(getEC2DiscoveryUrlsFromZone(zoneCname, DiscoveryUrlType.CNAME)); // Rearrange the list to distribute the load in case of multiple servers if (ec2Urls.size() > 1) { randomizer.randomize(ec2Urls); @@ -188,7 +188,7 @@ public static List getServiceUrlsFromDNS(EurekaClientConfig clientConfig * @return The list of all eureka service urls for the eureka client to talk to */ public static List getServiceUrlsFromConfig(EurekaClientConfig clientConfig, String instanceZone, boolean preferSameZone) { - List orderedUrls = new ArrayList(); + List orderedUrls = new ArrayList<>(); String region = getRegion(clientConfig); String[] availZones = clientConfig.getAvailabilityZones(clientConfig.getRegion()); if (availZones == null || availZones.length == 0) { @@ -284,7 +284,7 @@ public static Set getEC2DiscoveryUrlsFromZone(String dnsName, DiscoveryU if (DiscoveryUrlType.CNAME.equals(type)) { return ec2UrlsForZone; } - eipsForZone = new TreeSet(); + eipsForZone = new TreeSet<>(); for (String cname : ec2UrlsForZone) { String[] tokens = cname.split("\\."); String ec2HostName = tokens[0]; @@ -319,7 +319,7 @@ public static Map> getZoneBasedDiscoveryUrlsFromRegion(Eure discoveryDnsName = "txt." + region + "." + clientConfig.getEurekaServerDNSName(); logger.debug("The region url to be looked up is {} :", discoveryDnsName); - Set zoneCnamesForRegion = new TreeSet(DnsResolver.getCNamesFromTxtRecord(discoveryDnsName)); + Set zoneCnamesForRegion = new TreeSet<>(DnsResolver.getCNamesFromTxtRecord(discoveryDnsName)); Map> zoneCnameMapForRegion = new TreeMap>(); for (String zoneCname : zoneCnamesForRegion) { String zone = null; @@ -336,7 +336,7 @@ public static Map> getZoneBasedDiscoveryUrlsFromRegion(Eure } List zoneCnamesSet = zoneCnameMapForRegion.get(zone); if (zoneCnamesSet == null) { - zoneCnamesSet = new ArrayList(); + zoneCnamesSet = new ArrayList<>(); zoneCnameMapForRegion.put(zone, zoneCnamesSet); } zoneCnamesSet.add(zoneCname); diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java b/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java old mode 100755 new mode 100644 index e069298ca5..50ce5fa556 --- a/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java +++ b/eureka-client/src/main/java/com/netflix/discovery/shared/Application.java @@ -77,9 +77,9 @@ public String toString() { private final Map instancesMap; public Application() { - instances = new LinkedHashSet(); + instances = new LinkedHashSet<>(); instancesMap = new ConcurrentHashMap(); - shuffledInstances = new AtomicReference>(); + shuffledInstances = new AtomicReference<>(); } public Application(String name) { @@ -148,7 +148,7 @@ public List getInstances() { @JsonIgnore public List getInstancesAsIsFromEureka() { synchronized (instances) { - return new ArrayList(this.instances); + return new ArrayList<>(this.instances); } } @@ -214,7 +214,7 @@ private void _shuffleAndStoreInstances(boolean filterUpInstances, boolean indexB @Nullable InstanceRegionChecker instanceRegionChecker) { List instanceInfoList; synchronized (instances) { - instanceInfoList = new ArrayList(instances); + instanceInfoList = new ArrayList<>(instances); } boolean remoteIndexingActive = indexByRemoteRegions && null != instanceRegionChecker && null != clientConfig && null != remoteRegionsRegistry; diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/Applications.java b/eureka-client/src/main/java/com/netflix/discovery/shared/Applications.java old mode 100755 new mode 100644 index 06380d2f10..e14311d781 --- a/eureka-client/src/main/java/com/netflix/discovery/shared/Applications.java +++ b/eureka-client/src/main/java/com/netflix/discovery/shared/Applications.java @@ -67,7 +67,7 @@ public class Applications { private static class VipIndexSupport { final AbstractQueue instances = new ConcurrentLinkedQueue<>(); final AtomicLong roundRobinIndex = new AtomicLong(0); - final AtomicReference> vipList = new AtomicReference>(Collections.emptyList()); + final AtomicReference> vipList = new AtomicReference<>(Collections.emptyList()); public AtomicLong getRoundRobinIndex() { return roundRobinIndex; @@ -103,7 +103,7 @@ public Applications() { public Applications(@JsonProperty("appsHashCode") String appsHashCode, @JsonProperty("versionDelta") Long versionDelta, @JsonProperty("application") List registeredApplications) { - this.applications = new ConcurrentLinkedQueue(); + this.applications = new ConcurrentLinkedQueue<>(); this.appNameApplicationMap = new ConcurrentHashMap(); this.virtualHostNameAppMap = new ConcurrentHashMap(); this.secureVirtualHostNameAppMap = new ConcurrentHashMap(); @@ -134,7 +134,7 @@ public void addApplication(Application app) { */ @JsonProperty("application") public List getRegisteredApplications() { - return new ArrayList(this.applications); + return new ArrayList<>(this.applications); } /** @@ -358,7 +358,7 @@ private void shuffleAndFilterInstances(Map srcMap, bool filteredInstances = vipInstances.stream().filter(ii -> ii.getStatus() == InstanceStatus.UP) .collect(Collectors.toCollection(() -> new ArrayList<>(vipInstances.size()))); } else { - filteredInstances = new ArrayList(vipInstances); + filteredInstances = new ArrayList<>(vipInstances); } Collections.shuffle(filteredInstances, shuffleRandom); vipIndexSupport.vipList.set(filteredInstances); diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java b/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java index 1acbb8d159..0b67c2acf4 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java +++ b/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/AsyncResolver.java @@ -115,7 +115,7 @@ public AsyncResolver(String name, this.threadPoolExecutor = new ThreadPoolExecutor( 1, executorThreadPoolSize, 0, TimeUnit.SECONDS, - new SynchronousQueue(), // use direct handoff + new SynchronousQueue<>(), // use direct handoff new ThreadFactoryBuilder() .setNameFormat("AsyncResolver-" + name + "-executor-%d") .setDaemon(true) diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/StaticClusterResolver.java b/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/StaticClusterResolver.java index a978361fcd..fbbfb751b9 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/StaticClusterResolver.java +++ b/eureka-client/src/main/java/com/netflix/discovery/shared/resolver/StaticClusterResolver.java @@ -61,7 +61,7 @@ public static ClusterResolver fromURL(String regionName, URL ser int defaultPort = isSecure ? 443 : 80; int port = serviceUrl.getPort() == -1 ? defaultPort : serviceUrl.getPort(); - return new StaticClusterResolver( + return new StaticClusterResolver<>( regionName, new DefaultEndpoint(serviceUrl.getHost(), port, isSecure, serviceUrl.getPath()) ); diff --git a/eureka-client/src/main/java/com/netflix/discovery/shared/transport/EurekaHttpResponse.java b/eureka-client/src/main/java/com/netflix/discovery/shared/transport/EurekaHttpResponse.java index 63c2b056c2..4dd6c172a6 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/shared/transport/EurekaHttpResponse.java +++ b/eureka-client/src/main/java/com/netflix/discovery/shared/transport/EurekaHttpResponse.java @@ -83,11 +83,11 @@ public static EurekaHttpResponseBuilder anEurekaHttpResponse(int statusCod } public static EurekaHttpResponseBuilder anEurekaHttpResponse(int statusCode, Class entityType) { - return new EurekaHttpResponseBuilder(statusCode); + return new EurekaHttpResponseBuilder<>(statusCode); } public static EurekaHttpResponseBuilder anEurekaHttpResponse(int statusCode, T entity) { - return new EurekaHttpResponseBuilder(statusCode).entity(entity); + return new EurekaHttpResponseBuilder<>(statusCode).entity(entity); } public static class EurekaHttpResponseBuilder { @@ -128,7 +128,7 @@ public EurekaHttpResponseBuilder headers(Map headers) { } public EurekaHttpResponse build() { - return new EurekaHttpResponse(this); + return new EurekaHttpResponse<>(this); } } } diff --git a/eureka-client/src/main/java/com/netflix/discovery/util/EurekaEntityFunctions.java b/eureka-client/src/main/java/com/netflix/discovery/util/EurekaEntityFunctions.java index 70f8b51aa2..9ac6abefc7 100644 --- a/eureka-client/src/main/java/com/netflix/discovery/util/EurekaEntityFunctions.java +++ b/eureka-client/src/main/java/com/netflix/discovery/util/EurekaEntityFunctions.java @@ -230,7 +230,7 @@ public static Applications deepCopyApplications(Applications source) { public static Applications mergeApplications(Applications first, Applications second) { Set firstNames = selectApplicationNames(first); Set secondNames = selectApplicationNames(second); - Set allNames = new HashSet(firstNames); + Set allNames = new HashSet<>(firstNames); allNames.addAll(secondNames); Applications merged = new Applications(); diff --git a/eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientEventBusTest.java b/eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientEventBusTest.java index d08bef8a55..bd6e0a901c 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientEventBusTest.java +++ b/eureka-client/src/test/java/com/netflix/discovery/DiscoveryClientEventBusTest.java @@ -77,7 +77,7 @@ public void setUp() throws Exception { @Test public void testStatusChangeEvent() throws Exception { final CountDownLatch eventLatch = new CountDownLatch(1); - final List receivedEvents = new ArrayList(); + final List receivedEvents = new ArrayList<>(); EventBus eventBus = discoveryClientResource.getEventBus(); eventBus.registerSubscriber(new Object() { @Subscribe diff --git a/eureka-client/src/test/java/com/netflix/discovery/Jersey1DiscoveryClientOptionalArgsTest.java b/eureka-client/src/test/java/com/netflix/discovery/Jersey1DiscoveryClientOptionalArgsTest.java index 59da1b716d..00d4dc10cf 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/Jersey1DiscoveryClientOptionalArgsTest.java +++ b/eureka-client/src/test/java/com/netflix/discovery/Jersey1DiscoveryClientOptionalArgsTest.java @@ -23,22 +23,22 @@ public void before() { @Test public void testHealthCheckCallbackGuiceProvider() { - args.setHealthCheckCallbackProvider(new GuiceProvider()); + args.setHealthCheckCallbackProvider(new GuiceProvider<>()); } @Test public void testHealthCheckCallbackJavaxProvider() { - args.setHealthCheckCallbackProvider(new JavaxProvider()); + args.setHealthCheckCallbackProvider(new JavaxProvider<>()); } @Test public void testHealthCheckHandlerGuiceProvider() { - args.setHealthCheckHandlerProvider(new GuiceProvider()); + args.setHealthCheckHandlerProvider(new GuiceProvider<>()); } @Test public void testHealthCheckHandlerJavaxProvider() { - args.setHealthCheckHandlerProvider(new JavaxProvider()); + args.setHealthCheckHandlerProvider(new JavaxProvider<>()); } private class JavaxProvider implements Provider { diff --git a/eureka-client/src/test/java/com/netflix/discovery/MockRemoteEurekaServer.java b/eureka-client/src/test/java/com/netflix/discovery/MockRemoteEurekaServer.java index d7d84f35a3..e79a5441e8 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/MockRemoteEurekaServer.java +++ b/eureka-client/src/test/java/com/netflix/discovery/MockRemoteEurekaServer.java @@ -47,7 +47,7 @@ public class MockRemoteEurekaServer extends ExternalResource { private final AtomicBoolean sentRegistry = new AtomicBoolean(); public final BlockingQueue registrationStatusesQueue = new LinkedBlockingQueue<>(); - public final List registrationStatuses = new ArrayList(); + public final List registrationStatuses = new ArrayList<>(); public final AtomicLong registerCount = new AtomicLong(0); public final AtomicLong heartbeatCount = new AtomicLong(0); @@ -327,4 +327,4 @@ protected void sleep(int seconds) { } } } -} \ No newline at end of file +} diff --git a/eureka-client/src/test/java/com/netflix/discovery/TimedSupervisorTaskTest.java b/eureka-client/src/test/java/com/netflix/discovery/TimedSupervisorTaskTest.java index fa31d6b579..2327b455bc 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/TimedSupervisorTaskTest.java +++ b/eureka-client/src/test/java/com/netflix/discovery/TimedSupervisorTaskTest.java @@ -45,7 +45,7 @@ public void setUp() { 3, // maxPoolSize 0, // keepAliveTime TimeUnit.SECONDS, - new SynchronousQueue()); // use direct handoff + new SynchronousQueue<>()); // use direct handoff testTaskStartCounter = new AtomicLong(0); testTaskSuccessfulCounter = new AtomicLong(0); diff --git a/eureka-client/src/test/java/com/netflix/discovery/converters/CodecLoadTester.java b/eureka-client/src/test/java/com/netflix/discovery/converters/CodecLoadTester.java index 43188e4df2..7cb39be941 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/converters/CodecLoadTester.java +++ b/eureka-client/src/test/java/com/netflix/discovery/converters/CodecLoadTester.java @@ -24,8 +24,8 @@ */ public class CodecLoadTester { - private final List instanceInfoList = new ArrayList(); - private final List applicationList = new ArrayList(); + private final List instanceInfoList = new ArrayList<>(); + private final List applicationList = new ArrayList<>(); private final Applications applications; private final EntityBodyConverter xstreamCodec = new EntityBodyConverter(); diff --git a/eureka-client/src/test/java/com/netflix/discovery/shared/transport/EurekaHttpClientsTest.java b/eureka-client/src/test/java/com/netflix/discovery/shared/transport/EurekaHttpClientsTest.java index f0d7933c57..ce15466b75 100644 --- a/eureka-client/src/test/java/com/netflix/discovery/shared/transport/EurekaHttpClientsTest.java +++ b/eureka-client/src/test/java/com/netflix/discovery/shared/transport/EurekaHttpClientsTest.java @@ -104,7 +104,7 @@ public void setUp() throws IOException { when(transportConfig.getSessionedClientReconnectIntervalSeconds()).thenReturn(10); writeServer = new SimpleEurekaHttpServer(writeRequestHandler); - clusterResolver = new StaticClusterResolver("regionA", new DefaultEndpoint("localhost", writeServer.getServerPort(), false, "/v2/")); + clusterResolver = new StaticClusterResolver<>("regionA", new DefaultEndpoint("localhost", writeServer.getServerPort(), false, "/v2/")); readServer = new SimpleEurekaHttpServer(readRequestHandler); readServerURI = "http://localhost:" + readServer.getServerPort(); @@ -302,4 +302,4 @@ public boolean await(long timeout, TimeUnit unit) throws Exception { return latch.await(timeout, unit); } } -} \ No newline at end of file +} diff --git a/eureka-core/src/main/java/com/netflix/eureka/DefaultEurekaServerConfig.java b/eureka-core/src/main/java/com/netflix/eureka/DefaultEurekaServerConfig.java index 8d1f38b36f..8d75e9f81f 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/DefaultEurekaServerConfig.java +++ b/eureka-core/src/main/java/com/netflix/eureka/DefaultEurekaServerConfig.java @@ -567,7 +567,7 @@ public Set getRemoteRegionAppWhitelist(@Nullable String regionName) { } else { String appWhiteListStr = appWhiteListProp.get(); String[] whitelistEntries = appWhiteListStr.split(","); - return new HashSet(Arrays.asList(whitelistEntries)); + return new HashSet<>(Arrays.asList(whitelistEntries)); } } diff --git a/eureka-core/src/main/java/com/netflix/eureka/GzipEncodingEnforcingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/GzipEncodingEnforcingFilter.java index 02ad4d046c..469ec65f39 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/GzipEncodingEnforcingFilter.java +++ b/eureka-core/src/main/java/com/netflix/eureka/GzipEncodingEnforcingFilter.java @@ -58,14 +58,14 @@ private static HttpServletRequest addGzipAcceptEncoding(HttpServletRequest reque @Override public Enumeration getHeaders(String name) { if (HttpHeaders.ACCEPT_ENCODING.equals(name)) { - return new EnumWrapper("gzip"); + return new EnumWrapper<>("gzip"); } return super.getHeaders(name); } @Override public Enumeration getHeaderNames() { - return new EnumWrapper(super.getHeaderNames(), HttpHeaders.ACCEPT_ENCODING); + return new EnumWrapper<>(super.getHeaderNames(), HttpHeaders.ACCEPT_ENCODING); } @Override diff --git a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java index 8749db693b..317d1d5633 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java +++ b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java @@ -89,7 +89,7 @@ public class RateLimitingFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(RateLimitingFilter.class); - private static final Set DEFAULT_PRIVILEGED_CLIENTS = new HashSet( + private static final Set DEFAULT_PRIVILEGED_CLIENTS = new HashSet<>( Arrays.asList(EurekaClientIdentity.DEFAULT_CLIENT_NAME, EurekaServerIdentity.DEFAULT_SERVER_NAME) ); diff --git a/eureka-core/src/main/java/com/netflix/eureka/aws/AwsAsgUtil.java b/eureka-core/src/main/java/com/netflix/eureka/aws/AwsAsgUtil.java index 4fed5a9463..2c330e4ef6 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/aws/AwsAsgUtil.java +++ b/eureka-core/src/main/java/com/netflix/eureka/aws/AwsAsgUtil.java @@ -91,7 +91,7 @@ public class AwsAsgUtil implements AsgClient { private Map stsCredentials = new HashMap(); private final ExecutorService cacheReloadExecutor = new ThreadPoolExecutor( - 1, 10, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), + 1, 10, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -422,7 +422,7 @@ public void run() { * @return the set of ASG cacheKeys (asgName + accountId). */ private Set getCacheKeys() { - Set cacheKeys = new HashSet(); + Set cacheKeys = new HashSet<>(); Applications apps = registry.getApplicationsFromLocalRegionOnly(); for (Application app : apps.getRegisteredApplications()) { for (InstanceInfo instanceInfo : app.getInstances()) { diff --git a/eureka-core/src/main/java/com/netflix/eureka/aws/EIPManager.java b/eureka-core/src/main/java/com/netflix/eureka/aws/EIPManager.java index ebbdd3d793..bb1297158c 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/aws/EIPManager.java +++ b/eureka-core/src/main/java/com/netflix/eureka/aws/EIPManager.java @@ -343,7 +343,7 @@ private Collection getEIPsForZoneFromConfig(String myZone) { * @return collection of EIPs. */ private Collection getEIPsFromServiceUrls(List ec2Urls) { - List returnedUrls = new ArrayList(); + List returnedUrls = new ArrayList<>(); String region = clientConfig.getRegion(); String regionPhrase = ""; if (!US_EAST_1.equals(region)) { diff --git a/eureka-core/src/main/java/com/netflix/eureka/cluster/protocol/ReplicationListResponse.java b/eureka-core/src/main/java/com/netflix/eureka/cluster/protocol/ReplicationListResponse.java index 36d4f97c7f..f81d00fd7a 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/cluster/protocol/ReplicationListResponse.java +++ b/eureka-core/src/main/java/com/netflix/eureka/cluster/protocol/ReplicationListResponse.java @@ -15,7 +15,7 @@ public class ReplicationListResponse { private List responseList; public ReplicationListResponse() { - this.responseList = new ArrayList(); + this.responseList = new ArrayList<>(); } @JsonCreator diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java index 1210465004..10c03634c1 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java +++ b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java @@ -88,7 +88,7 @@ public abstract class AbstractInstanceRegistry implements InstanceRegistry { // CircularQueues here for debugging/statistics purposes only private final CircularQueue> recentRegisteredQueue; private final CircularQueue> recentCanceledQueue; - private ConcurrentLinkedQueue recentlyChangedQueue = new ConcurrentLinkedQueue(); + private ConcurrentLinkedQueue recentlyChangedQueue = new ConcurrentLinkedQueue<>(); private final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); private final Lock read = readWriteLock.readLock(); @@ -99,7 +99,7 @@ public abstract class AbstractInstanceRegistry implements InstanceRegistry { private Timer evictionTimer = new Timer("Eureka-EvictionTimer", true); private final MeasuredRate renewsLastMin; - private final AtomicReference evictionTaskRef = new AtomicReference(); + private final AtomicReference evictionTaskRef = new AtomicReference<>(); protected String[] allKnownRemoteRegions = EMPTY_STR_ARRAY; protected volatile int numberOfRenewsPerMinThreshold; @@ -117,8 +117,8 @@ protected AbstractInstanceRegistry(EurekaServerConfig serverConfig, EurekaClient this.serverConfig = serverConfig; this.clientConfig = clientConfig; this.serverCodecs = serverCodecs; - this.recentCanceledQueue = new CircularQueue>(1000); - this.recentRegisteredQueue = new CircularQueue>(1000); + this.recentCanceledQueue = new CircularQueue<>(1000); + this.recentRegisteredQueue = new CircularQueue<>(1000); this.renewsLastMin = new MeasuredRate(1000 * 60 * 1); @@ -228,7 +228,7 @@ public void register(InstanceInfo registrant, int leaseDuration, boolean isRepli } logger.debug("No previous lease information found; it is new registration"); } - Lease lease = new Lease(registrant, leaseDuration); + Lease lease = new Lease<>(registrant, leaseDuration); if (existingLease != null) { lease.setServiceUpTimestamp(existingLease.getServiceUpTimestamp()); } @@ -1072,7 +1072,7 @@ public List getInstancesById(String id) { */ @Deprecated public List getInstancesById(String id, boolean includeRemoteRegions) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (Iterator>>> iter = registry.entrySet().iterator(); iter.hasNext(); ) { @@ -1086,7 +1086,7 @@ public List getInstancesById(String id, boolean includeRemoteRegio } if (list == Collections.EMPTY_LIST) { - list = new ArrayList(); + list = new ArrayList<>(); } list.add(decorateInstanceInfo(lease)); } @@ -1163,7 +1163,7 @@ public int getNumOfRenewsPerMinThreshold() { */ @Override public List> getLastNRegisteredInstances() { - List> list = new ArrayList>(recentRegisteredQueue); + List> list = new ArrayList<>(recentRegisteredQueue); Collections.reverse(list); return list; } @@ -1175,7 +1175,7 @@ public List> getLastNRegisteredInstances() { */ @Override public List> getLastNCanceledInstances() { - List> list = new ArrayList>(recentCanceledQueue); + List> list = new ArrayList<>(recentCanceledQueue); Collections.reverse(list); return list; } diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java b/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java index 1bfd39bc91..44c94cc949 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java +++ b/eureka-core/src/main/java/com/netflix/eureka/registry/PeerAwareInstanceRegistryImpl.java @@ -563,7 +563,7 @@ private void updateRenewalThreshold() { */ @Override public List getSortedApplications() { - List apps = new ArrayList(getApplications().getRegisteredApplications()); + List apps = new ArrayList<>(getApplications().getRegisteredApplications()); Collections.sort(apps, APP_COMPARATOR); return apps; } diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/RemoteRegionRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/RemoteRegionRegistry.java index 76f7e5dbc1..5a4656e555 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/registry/RemoteRegionRegistry.java +++ b/eureka-core/src/main/java/com/netflix/eureka/registry/RemoteRegionRegistry.java @@ -88,8 +88,8 @@ public class RemoteRegionRegistry implements LookupService { private final AtomicLong fetchRegistryGeneration = new AtomicLong(0); private final Lock fetchRegistryUpdateLock = new ReentrantLock(); - private final AtomicReference applications = new AtomicReference(new Applications()); - private final AtomicReference applicationsDelta = new AtomicReference(new Applications()); + private final AtomicReference applications = new AtomicReference<>(new Applications()); + private final AtomicReference applicationsDelta = new AtomicReference<>(new Applications()); private final EurekaServerConfig serverConfig; private volatile boolean readyForServingData; private final EurekaHttpClient eurekaHttpClient; @@ -188,7 +188,7 @@ public void run() { }; ThreadPoolExecutor remoteRegionFetchExecutor = new ThreadPoolExecutor( - 1, serverConfig.getRemoteRegionFetchThreadPoolSize(), 0, TimeUnit.SECONDS, new SynchronousQueue()); // use direct handoff + 1, serverConfig.getRemoteRegionFetchThreadPoolSize(), 0, TimeUnit.SECONDS, new SynchronousQueue<>()); // use direct handoff scheduler = Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder() diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java b/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java index 3d498e4bd0..af299ce170 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java +++ b/eureka-core/src/main/java/com/netflix/eureka/registry/ResponseCacheImpl.java @@ -108,7 +108,7 @@ public class ResponseCacheImpl implements ResponseCache { Multimaps.newListMultimap(new ConcurrentHashMap>(), new Supplier>() { @Override public List get() { - return new CopyOnWriteArrayList(); + return new CopyOnWriteArrayList<>(); } }); diff --git a/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java b/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java index ae9ab3c98f..c890dee4dd 100644 --- a/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java +++ b/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java @@ -51,7 +51,7 @@ public class AbstractTester { public static final String LOCAL_REGION_INSTANCE_2_HOSTNAME = "blahloc2"; public static final String REMOTE_ZONE = "us-east-1c"; - protected final List> registeredApps = new ArrayList>(); + protected final List> registeredApps = new ArrayList<>(); protected final Map remoteRegionApps = new HashMap(); protected final Map remoteRegionAppsDelta = new HashMap(); diff --git a/eureka-core/src/test/java/com/netflix/eureka/test/async/executor/AsyncSequentialExecutor.java b/eureka-core/src/test/java/com/netflix/eureka/test/async/executor/AsyncSequentialExecutor.java index b829f662e4..eb3451b217 100644 --- a/eureka-core/src/test/java/com/netflix/eureka/test/async/executor/AsyncSequentialExecutor.java +++ b/eureka-core/src/test/java/com/netflix/eureka/test/async/executor/AsyncSequentialExecutor.java @@ -53,7 +53,7 @@ public ResultStatus call() throws Exception { * @param task task to run. */ protected AsyncResult run(Callable task) { - final AsyncResult result = new ConcreteAsyncResult(); + final AsyncResult result = new ConcreteAsyncResult<>(); new Thread(new Runnable() { @Override public void run() { diff --git a/eureka-test-utils/src/main/java/com/netflix/discovery/util/ApplicationFunctions.java b/eureka-test-utils/src/main/java/com/netflix/discovery/util/ApplicationFunctions.java index ed81f2fc85..0c5692fafe 100644 --- a/eureka-test-utils/src/main/java/com/netflix/discovery/util/ApplicationFunctions.java +++ b/eureka-test-utils/src/main/java/com/netflix/discovery/util/ApplicationFunctions.java @@ -44,7 +44,7 @@ public static Applications toApplications(Map applicationMa } public static Set applicationNames(Applications applications) { - Set names = new HashSet(); + Set names = new HashSet<>(); for (Application application : applications.getRegisteredApplications()) { names.add(application.getName()); } @@ -80,7 +80,7 @@ public static Application merge(Application first, Application second) { public static Applications merge(Applications first, Applications second) { Set firstNames = applicationNames(first); Set secondNames = applicationNames(second); - Set allNames = new HashSet(firstNames); + Set allNames = new HashSet<>(firstNames); allNames.addAll(secondNames); Applications merged = new Applications(); diff --git a/eureka-test-utils/src/main/java/com/netflix/discovery/util/InstanceInfoGenerator.java b/eureka-test-utils/src/main/java/com/netflix/discovery/util/InstanceInfoGenerator.java index 5af4f01ea2..388bc79022 100644 --- a/eureka-test-utils/src/main/java/com/netflix/discovery/util/InstanceInfoGenerator.java +++ b/eureka-test-utils/src/main/java/com/netflix/discovery/util/InstanceInfoGenerator.java @@ -55,7 +55,7 @@ public Applications takeDelta(int count) { currentIt = serviceIterator(); allApplications = new Applications(); } - List instanceBatch = new ArrayList(); + List instanceBatch = new ArrayList<>(); for (int i = 0; i < count; i++) { InstanceInfo next = currentIt.next(); next.setActionType(ActionType.ADDED);