From a4b2f98641061850d317f55d5825c4d63f2e61db Mon Sep 17 00:00:00 2001 From: Gregor Riegler Date: Wed, 16 Jun 2021 23:39:05 +0200 Subject: [PATCH] refactor: use diamond operator --- .../java/com/netflix/appinfo/InstanceInfo.java | 2 +- .../com/netflix/discovery/DiscoveryClient.java | 6 +++--- .../netflix/discovery/endpoint/DnsResolver.java | 2 +- .../netflix/discovery/endpoint/EndpointUtils.java | 10 +++++----- .../com/netflix/discovery/shared/Application.java | 0 .../com/netflix/discovery/shared/Applications.java | 2 +- .../discovery/util/EurekaEntityFunctions.java | 2 +- .../discovery/DiscoveryClientEventBusTest.java | 2 +- .../netflix/discovery/MockRemoteEurekaServer.java | 2 +- .../discovery/converters/CodecLoadTester.java | 4 ++-- .../com/netflix/eureka/RateLimitingFilter.java | 2 +- .../java/com/netflix/eureka/aws/AwsAsgUtil.java | 4 ++-- .../java/com/netflix/eureka/aws/EIPManager.java | 2 +- .../eureka/registry/AbstractInstanceRegistry.java | 14 +++++++------- .../registry/PeerAwareInstanceRegistryImpl.java | 2 +- .../eureka/registry/RemoteRegionRegistry.java | 4 ++-- .../java/com/netflix/eureka/AbstractTester.java | 6 +++--- .../async/executor/AsyncSequentialExecutor.java | 2 +- .../discovery/util/ApplicationFunctions.java | 4 ++-- .../discovery/util/InstanceInfoGenerator.java | 2 +- 20 files changed, 37 insertions(+), 37 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 7eaeceade..f173f5743 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/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java index d7d84e6de..e04a778b1 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; @@ -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/endpoint/DnsResolver.java b/eureka-client/src/main/java/com/netflix/discovery/endpoint/DnsResolver.java index 7bd69abbf..531621d04 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 9cdb4987a..b17d2ea85 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) { @@ -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; 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 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 06380d2f1..80dbb88a1 --- 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; 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 70f8b51aa..9ac6abefc 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 d08bef8a5..bd6e0a901 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/MockRemoteEurekaServer.java b/eureka-client/src/test/java/com/netflix/discovery/MockRemoteEurekaServer.java index d7d84f35a..f8d169e4a 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); 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 43188e4df..7cb39be94 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-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java index 8749db693..317d1d563 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 4fed5a946..972f5aa59 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 @@ -88,7 +88,7 @@ public class AwsAsgUtil implements AsgClient { private static final String accountId = getAccountId(); - private Map stsCredentials = new HashMap(); + private Map stsCredentials = new HashMap<>(); private final ExecutorService cacheReloadExecutor = new ThreadPoolExecutor( 1, 10, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), @@ -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 ebbdd3d79..bb1297158 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/registry/AbstractInstanceRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java index 121046500..736fb5011 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; @@ -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 1bfd39bc9..44c94cc94 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 76f7e5dbc..130e0e97a 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; 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 ae9ab3c98..5748507b5 100644 --- a/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java +++ b/eureka-core/src/test/java/com/netflix/eureka/AbstractTester.java @@ -51,9 +51,9 @@ 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 Map remoteRegionApps = new HashMap(); - protected final Map remoteRegionAppsDelta = new HashMap(); + protected final List> registeredApps = new ArrayList<>(); + protected final Map remoteRegionApps = new HashMap<>(); + protected final Map remoteRegionAppsDelta = new HashMap<>(); protected MockRemoteEurekaServer mockRemoteEurekaServer; protected EurekaServerConfig serverConfig; 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 b829f662e..eb3451b21 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 ed81f2fc8..0c5692faf 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 5af4f01ea..388bc7902 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);