Replace raw collection instantiations with utils

Replace direct usages of new ArrayList/HashMap/HashSet/LinkedHashSet/LinkedList/ConcurrentHashMap/LinkedHashMap with io.microsphere.collection utility factories (newArrayList, newHashMap, newLinkedList, newLinkedHashMap, newConcurrentHashMap, newLinkedHashSet, newHashSet, etc.) across spring-cloud-commons and openfeign modules. Added corresponding static imports and minor import reorderings; moved a Nonnull import and adjusted some test imports. No functional behavior changes intended—this is a refactor to centralize collection creation and use consistent utility helpers.

Author: mercyblitz

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/UnionDiscoveryClient.java

@@ -25,12 +25,13 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import static io.microsphere.collection.CollectionUtils.isNotEmpty;
+import static io.microsphere.collection.ListUtils.newArrayList;
+import static io.microsphere.collection.ListUtils.newLinkedList;
+import static io.microsphere.collection.SetUtils.newLinkedHashSet;
 import static io.microsphere.reflect.TypeUtils.getClassName;
 import static io.microsphere.spring.beans.BeanUtils.getSortedBeans;
 import static io.microsphere.spring.cloud.client.discovery.constants.DiscoveryClientConstants.COMPOSITE_DISCOVERY_CLIENT_CLASS_NAME;
@@ -85,7 +86,7 @@ public String description() {
      */
     @Override
     public List<ServiceInstance> getInstances(String serviceId) {
-        List<ServiceInstance> serviceInstances = new LinkedList<>();
+        List<ServiceInstance> serviceInstances = newLinkedList();
         List<DiscoveryClient> discoveryClients = getDiscoveryClients();
         for (DiscoveryClient discoveryClient : discoveryClients) {
             List<ServiceInstance> instances = discoveryClient.getInstances(serviceId);
@@ -109,15 +110,15 @@ public List<ServiceInstance> getInstances(String serviceId) {
      */
     @Override
     public List<String> getServices() {
-        LinkedHashSet<String> services = new LinkedHashSet<>();
+        Set<String> services = newLinkedHashSet();
         List<DiscoveryClient> discoveryClients = getDiscoveryClients();
         for (DiscoveryClient discoveryClient : discoveryClients) {
             List<String> serviceForClient = discoveryClient.getServices();
             if (isNotEmpty(serviceForClient)) {
                 services.addAll(serviceForClient);
             }
         }
-        return new ArrayList<>(services);
+        return newArrayList(services);
     }
 
     /**
@@ -140,7 +141,7 @@ public List<DiscoveryClient> getDiscoveryClients() {
             return discoveryClients;
         }
 
-        discoveryClients = new ArrayList<>();
+        discoveryClients = newLinkedList();
         for (DiscoveryClient discoveryClient : getSortedBeans(this.context, DiscoveryClient.class)) {
             String className = getClassName(discoveryClient.getClass());
             if (COMPOSITE_DISCOVERY_CLIENT_CLASS_NAME.equals(className) || this.equals(discoveryClient)) {

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/InMemoryServiceRegistry.java

@@ -20,9 +20,10 @@
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static io.microsphere.collection.MapUtils.newConcurrentHashMap;
+
 /**
  * In-Memory {@link ServiceRegistry}
  *
@@ -33,7 +34,7 @@ public class InMemoryServiceRegistry implements ServiceRegistry {
 
     private static final String STATUS_KEY = "_status_";
 
-    private final ConcurrentMap<String, Registration> storage = new ConcurrentHashMap<>(1);
+    private final ConcurrentMap<String, Registration> storage = newConcurrentHashMap(2);
 
     /**
      * Registers the given {@link Registration} instance in the in-memory storage,

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/MultipleRegistration.java

@@ -4,10 +4,10 @@
 
 import java.net.URI;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.collection.MapUtils.newHashMap;
 import static io.microsphere.util.Assert.assertNotEmpty;
 import static io.microsphere.util.ClassUtils.findAllClasses;
 import static io.microsphere.util.ClassUtils.isAssignableFrom;
@@ -23,7 +23,7 @@
  */
 public class MultipleRegistration implements Registration {
 
-    private Map<Class<? extends Registration>, Registration> registrationMap = new HashMap<>();
+    private Map<Class<? extends Registration>, Registration> registrationMap = newHashMap();
 
     private Registration defaultRegistration;
 

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/MultipleServiceRegistry.java

@@ -3,12 +3,12 @@
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
+import static io.microsphere.collection.MapUtils.newHashMap;
 import static io.microsphere.util.Assert.assertNotEmpty;
 import static org.springframework.aop.framework.AopProxyUtils.ultimateTargetClass;
 import static org.springframework.core.ResolvableType.forClass;
@@ -56,7 +56,7 @@ public MultipleServiceRegistry(Map<String, ServiceRegistry> registriesMap) {
         assertNotEmpty(registriesMap, () -> "registrations cannot be empty");
 
         this.registriesMap = registriesMap;
-        this.beanNameToRegistrationTypesMap = new HashMap<>(registriesMap.size());
+        this.beanNameToRegistrationTypesMap = newHashMap(registriesMap.size());
 
         for (Map.Entry<String, ServiceRegistry> entry : registriesMap.entrySet()) {
             String beanName = entry.getKey();

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/RegistrationMetaData.java

@@ -7,8 +7,8 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
+import static io.microsphere.collection.MapUtils.newConcurrentHashMap;
 import static io.microsphere.reflect.MethodUtils.invokeMethod;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtils.removeMetadata;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtils.setMetadata;
@@ -71,7 +71,7 @@ public final class RegistrationMetaData implements Map<String, String> {
     public RegistrationMetaData(Collection<Registration> registrations) {
         assertNotEmpty(registrations, () -> "registrations cannot be empty");
         this.registrations = registrations;
-        this.applicationMetaData = new ConcurrentHashMap<>();
+        this.applicationMetaData = newConcurrentHashMap();
         for (Registration registration : registrations) {
             initializeIfZookeeperRegistrationAvailable(registration);
 

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/SimpleServiceRegistry.java

@@ -22,10 +22,10 @@
 import org.springframework.cloud.client.discovery.simple.reactive.SimpleReactiveDiscoveryProperties;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.spring.cloud.client.discovery.util.DiscoveryUtils.getInstancesMap;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtils.getMetadata;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtils.setMetadata;
@@ -217,6 +217,6 @@ List<DefaultServiceInstance> getInstances(DefaultRegistration registration) {
      * @return the list of instances for the service ID
      */
     List<DefaultServiceInstance> getInstances(String serviceId) {
-        return this.instancesMap.computeIfAbsent(serviceId, k -> new ArrayList<>());
+        return this.instancesMap.computeIfAbsent(serviceId, k -> newLinkedList());
     }
 }

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebServiceRegistryAutoConfiguration.java

@@ -32,10 +32,10 @@
 import org.springframework.context.annotation.Configuration;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import static io.microsphere.collection.SetUtils.newHashSet;
 import static io.microsphere.logging.LoggerFactory.getLogger;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtils.attachMetadata;
 
@@ -84,7 +84,7 @@ public final void onApplicationEvent(WebEndpointMappingsReadyEvent event) {
     }
 
     private void attachWebMappingsMetadata(Registration registration, Collection<WebEndpointMapping> webEndpointMappings) {
-        Set<WebEndpointMapping> mappings = new HashSet<>(webEndpointMappings);
+        Set<WebEndpointMapping> mappings = newHashSet(webEndpointMappings);
         excludeMappings(mappings);
         attachMetadata(getContextPath(), registration, mappings);
     }

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceRegistrationEndpoint.java

@@ -5,9 +5,9 @@
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
 import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static io.microsphere.collection.MapUtils.newLinkedHashMap;
 import static io.microsphere.lang.function.ThrowableSupplier.execute;
 import static io.microsphere.reflect.MethodUtils.invokeMethod;
 
@@ -39,7 +39,7 @@ public class ServiceRegistrationEndpoint extends AbstractServiceRegistrationEndp
      */
     @ReadOperation
     public Map<String, Object> metadata() {
-        Map<String, Object> metadata = new LinkedHashMap<>(16);
+        Map<String, Object> metadata = newLinkedHashMap(16);
         metadata.put("application-name", applicationName);
         metadata.put("registration", registration);
         metadata.put("port", port);

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/event/RegistrationEvent.java

@@ -16,10 +16,10 @@
  */
 package io.microsphere.spring.cloud.client.service.registry.event;
 
+import io.microsphere.annotation.Nonnull;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 import org.springframework.context.ApplicationEvent;
-import io.microsphere.annotation.Nonnull;
 import org.springframework.util.Assert;
 
 import static io.microsphere.spring.cloud.client.service.registry.event.RegistrationEvent.Type.DEREGISTERED;

microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/discovery/ReactiveDiscoveryClientAdapterTest.java

@@ -29,12 +29,12 @@
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Scheduler;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
 import static io.microsphere.collection.Lists.ofList;
+import static io.microsphere.collection.MapUtils.newHashMap;
 import static io.microsphere.spring.cloud.client.discovery.ReactiveDiscoveryClientAdapter.toList;
 import static io.microsphere.spring.cloud.client.service.util.ServiceInstanceUtilsTest.createDefaultServiceInstance;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -65,7 +65,7 @@ class ReactiveDiscoveryClientAdapterTest {
 
     @BeforeEach
     void setUp() {
-        Map<String, List<DefaultServiceInstance>> instances = new HashMap<>();
+        Map<String, List<DefaultServiceInstance>> instances = newHashMap();
         this.serviceInstance = createDefaultServiceInstance();
         this.appName = this.serviceInstance.getServiceId();
         instances.put(appName, ofList(this.serviceInstance));