Rollback TypeUtils.java changes

microsphere-java-core/src/main/java/io/microsphere/classloading/ArtifactDetector.java

@@ -25,6 +25,7 @@
 import static io.microsphere.util.SystemUtils.JAVA_HOME;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
+import static io.microsphere.collection.SetUtils.newLinkedHashSet;
 
 /**
  * The {@code ArtifactDetector} class is responsible for detecting and resolving artifacts from the classpath.
@@ -149,7 +150,7 @@
 
     protected Set<URL> getClassPathURLs(boolean includedJdkLibraries) {
         Set<URL> urls = findAllClassPathURLs(classLoader);
-        LinkedHashSet<URL> classPathURLs = new LinkedHashSet<>(urls);
+        LinkedHashSet<URL> classPathURLs = newLinkedHashSet(urls);
         if (!includedJdkLibraries) {
             removeJdkClassPathURLs(classPathURLs);
         }

microsphere-java-core/src/main/java/io/microsphere/classloading/BannedArtifactClassLoadingExecutor.java

@@ -18,6 +18,7 @@
 import static io.microsphere.util.StringUtils.isBlank;
 import static io.microsphere.util.StringUtils.split;
 import static io.microsphere.util.SystemUtils.FILE_ENCODING;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 
 /**
  * The executor for the banned artifacts that are loading by {@link ClassLoader}.
@@ -94,7 +95,7 @@ public void execute() {
     }
 
     static List<MavenArtifact> loadBannedArtifactConfigs(ClassLoader classLoader) {
-        LinkedList<MavenArtifact> bannedArtifactConfigs = new LinkedList<>();
+        LinkedList<MavenArtifact> bannedArtifactConfigs = newLinkedList();
         try {
             Enumeration<URL> configResources = classLoader.getResources(CONFIG_LOCATION);
             while (configResources.hasMoreElements()) {
@@ -109,7 +110,7 @@ static List<MavenArtifact> loadBannedArtifactConfigs(ClassLoader classLoader) {
     }
 
     static List<MavenArtifact> loadBannedArtifactConfigs(URL configResource) throws IOException {
-        LinkedList<MavenArtifact> bannedArtifactConfigs = new LinkedList<>();
+        LinkedList<MavenArtifact> bannedArtifactConfigs = newLinkedList();
         try (InputStream inputStream = configResource.openStream();
              BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, ENCODING))
         ) {

microsphere-java-core/src/main/java/io/microsphere/event/AbstractEventDispatcher.java

@@ -40,6 +40,7 @@
 import static io.microsphere.util.ServiceLoaderUtils.loadServicesList;
 import static java.util.Collections.sort;
 import static java.util.Collections.unmodifiableList;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 
 /**
  * Abstract implementation of {@link EventDispatcher} that provides common functionality for dispatching events to
@@ -127,7 +128,7 @@
     @Override
     @Immutable
     public List<EventListener<?>> getAllEventListeners() {
-        LinkedList<EventListener<?>> listeners = new LinkedList<>();
+        LinkedList<EventListener<?>> listeners = newLinkedList();
 
         sortedListeners().forEach(listener -> {
             addIfAbsent(listeners, listener);
@@ -192,7 +193,7 @@
     void doInListener(Class<? extends Event> eventType, Consumer<Collection<EventListener>> consumer) {
         if (eventType != null) {
             synchronized (mutex) {
-                List<EventListener> listeners = listenersCache.computeIfAbsent(eventType, e -> new LinkedList<>());
+                List<EventListener> listeners = listenersCache.computeIfAbsent(eventType, e -> newLinkedList());
                 // consume
                 consumer.accept(listeners);
                 // sort

microsphere-java-core/src/main/java/io/microsphere/event/GenericEventListener.java

@@ -21,7 +21,7 @@
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,6 +29,7 @@
 import static io.microsphere.lang.function.ThrowableConsumer.execute;
 import static java.util.Collections.emptySet;
 import static java.util.stream.Stream.of;
+import static io.microsphere.collection.SetUtils.newLinkedHashSet;
 
 /**
  * A generic implementation of the {@link EventListener} interface that supports multiple event handling methods.
@@ -97,7 +98,7 @@
         HashMap<Class<?>, Set<Method>> eventMethods = newHashMap();
         of(getClass().getMethods()).filter(this::isHandleEventMethod).forEach(method -> {
             Class<?> paramType = method.getParameterTypes()[0];
-            Set<Method> methods = eventMethods.computeIfAbsent(paramType, key -> new LinkedHashSet<>());
+            Set<Method> methods = eventMethods.computeIfAbsent(paramType, key -> newLinkedHashSet());
             methods.add(method);
         });
         return eventMethods;

microsphere-java-core/src/main/java/io/microsphere/event/Listenable.java

@@ -27,6 +27,7 @@
 import static io.microsphere.util.ClassUtils.getTypeName;
 import static java.lang.reflect.Modifier.isFinal;
 import static java.util.stream.StreamSupport.stream;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * A component that allows registration and management of {@link EventListener} instances.
@@ -111,7 +112,7 @@ static void assertListener(EventListener<?> listener) throws IllegalArgumentExce
      */
     default void addEventListeners(E listener, E... others) throws NullPointerException,
             IllegalArgumentException {
-        ArrayList<E> listeners = new ArrayList<>(1 + others.length);
+        ArrayList<E> listeners = newArrayList(1 + others.length);
         listeners.add(listener);
         addAll(listeners, others);
         addEventListeners(listeners);

microsphere-java-core/src/main/java/io/microsphere/filter/FilterUtils.java

@@ -12,6 +12,7 @@
 import java.util.List;
 
 import static java.util.Collections.unmodifiableList;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * Utility class for working with {@link Filter} instances.
@@ -74,7 +75,7 @@ public static <E> List<E> filter(Iterable<E> iterable, Filter<E> filter) {
     @Nonnull
     @Immutable
     public static <E> List<E> filter(Iterable<E> iterable, FilterOperator filterOperator, Filter<E>... filters) {
-        ArrayList<E> list = new ArrayList<E>();
+        ArrayList<E> list = newArrayList();
         Iterator<E> iterator = iterable.iterator();
         while (iterator.hasNext()) {
             E element = iterator.next();

microsphere-java-core/src/main/java/io/microsphere/io/StandardFileWatchService.java

@@ -33,7 +33,7 @@
 import java.nio.file.Watchable;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -63,6 +63,7 @@
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static io.microsphere.collection.SetUtils.newTreeSet;
 
 /**
  * /**
@@ -330,7 +331,7 @@
 
     private static class FileChangedMetadata {
 
-        private final Set<Path> filePaths = new TreeSet<>();
+        private final Set<Path> filePaths = newTreeSet();
 
         private EventDispatcher eventDispatcher;
 

microsphere-java-core/src/main/java/io/microsphere/json/JSONArray.java

@@ -19,7 +19,7 @@
 import io.microsphere.json.JSONStringer.Scope;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 
@@ -82,7 +82,7 @@
      * Creates a {@code JSONArray} with no values.
      */
     public JSONArray() {
-        this.values = new ArrayList<>();
+        this.values = newArrayList();
     }
 
     @SuppressWarnings("rawtypes")

microsphere-java-core/src/main/java/io/microsphere/json/JSONObject.java

@@ -18,7 +18,7 @@
 
 import io.microsphere.json.JSONStringer.Scope;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
@@ -43,6 +43,7 @@
 import static io.microsphere.util.ClassUtils.isEnum;
 import static io.microsphere.util.ClassUtils.isNumber;
 import static io.microsphere.util.ClassUtils.isWrapperType;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * A modifiable set of name/value mappings. Names are unique, non-null strings. Values may
@@ -730,7 +731,7 @@
      * @return the array
      */
     public JSONArray names() {
-        return this.nameValuePairs.isEmpty() ? null : new JSONArray(new ArrayList<>(this.nameValuePairs.keySet()));
+        return this.nameValuePairs.isEmpty() ? null : new JSONArray(newArrayList(this.nameValuePairs.keySet()));
     }
 
     /**

microsphere-java-core/src/main/java/io/microsphere/json/JSONStringer.java

@@ -16,7 +16,7 @@
 
 package io.microsphere.json;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static io.microsphere.json.JSONObject.NULL;
@@ -29,6 +29,7 @@
 import static io.microsphere.util.ClassUtils.getTypeName;
 import static java.lang.String.format;
 import static java.util.Arrays.fill;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * Implements {@link JSONObject#toString} and {@link JSONArray#toString}. Most application
@@ -121,7 +122,7 @@
      * Unlike the original implementation, this stack isn't limited to 20 levels of
      * nesting.
      */
-    private final List<Scope> stack = new ArrayList<>();
+    private final List<Scope> stack = newArrayList();
 
     /**
      * A string containing a full set of spaces for a single level of indentation, or null

microsphere-java-core/src/main/java/io/microsphere/management/builder/MBeanInfoBuilder.java

@@ -30,13 +30,14 @@
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 
 import static io.microsphere.reflect.MethodUtils.isIsMethod;
 import static io.microsphere.util.ClassUtils.getTypeName;
 import static java.util.Objects.nonNull;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 
 /**
  * The {@link MBeanInfo} Builder
@@ -54,16 +55,16 @@
     String className;
 
     @Nullable
-    List<MBeanAttributeInfoBuilder> attributeBuilders = new LinkedList<>();
+    List<MBeanAttributeInfoBuilder> attributeBuilders = newLinkedList();
 
     @Nullable
-    List<MBeanOperationInfoBuilder> operationBuilders = new LinkedList<>();
+    List<MBeanOperationInfoBuilder> operationBuilders = newLinkedList();
 
     @Nullable
-    List<MBeanConstructorInfoBuilder> constructorBuilders = new LinkedList<>();
+    List<MBeanConstructorInfoBuilder> constructorBuilders = newLinkedList();
 
     @Nullable
-    List<MBeanNotificationInfoBuilder> notificationBuilders = new LinkedList<>();
+    List<MBeanNotificationInfoBuilder> notificationBuilders = newLinkedList();
 
     public MBeanInfoBuilder attribute(String attributeName, Class<?> attributeType, Consumer<MBeanAttributeInfoBuilder> builderConsumer) {
         MBeanAttributeInfoBuilder builder = MBeanAttributeInfoBuilder.attribute(attributeType).name(attributeName);

microsphere-java-core/src/main/java/io/microsphere/net/ExtendableProtocolURLStreamHandler.java

@@ -24,7 +24,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -50,6 +50,7 @@
 import static java.lang.System.setProperty;
 import static java.net.Proxy.NO_PROXY;
 import static java.util.Collections.sort;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * Extendable Protocol {@link URLStreamHandler} class supports the sub-protocols,
@@ -133,7 +134,7 @@
 
     private final String protocol;
 
-    private final List<SubProtocolURLConnectionFactory> factories = new ArrayList<>();
+    private final List<SubProtocolURLConnectionFactory> factories = newArrayList();
 
     /**
      * The default constructor must obey the following conventions:

microsphere-java-core/src/main/java/io/microsphere/reflect/MethodUtils.java

@@ -34,6 +34,7 @@
 import java.util.function.Predicate;
 
 import static io.microsphere.annotation.ConfigurationProperty.SYSTEM_PROPERTIES_SOURCE;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.collection.ListUtils.of;
 import static io.microsphere.constants.PropertyConstants.MICROSPHERE_PROPERTY_NAME_PREFIX;
 import static io.microsphere.constants.SymbolConstants.COMMA_CHAR;
@@ -567,7 +568,7 @@ public static List<Method> findMethods(Class<?> targetClass, boolean includeInhe
         }
 
         // All methods
-        LinkedList<Method> allMethods = new LinkedList<>();
+        LinkedList<Method> allMethods = newLinkedList();
 
         if (includeInheritedTypes) {
             while (targetClass != null) {

microsphere-java-core/src/main/java/io/microsphere/reflect/ReflectionUtils.java

@@ -37,6 +37,7 @@
 import static java.lang.reflect.Array.getLength;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * Reflection Utility class , generic methods are defined from {@link FieldUtils} , {@link MethodUtils} , {@link
@@ -375,7 +376,7 @@ static String getCallerClassNameInSunReflectReflection() {
     @Nonnull
     public static <T> List<T> toList(Object array) throws IllegalArgumentException {
         int length = getLength(array);
-        ArrayList<T> list = new ArrayList<>(length);
+        ArrayList<T> list = newArrayList(length);
         for (int i = 0; i < length; i++) {
             Object element = get(array, i);
             list.add((T) toObject(element));

microsphere-java-core/src/main/java/io/microsphere/util/AnnotationUtils.java

@@ -853,7 +853,7 @@ public static List<Annotation> findAllDeclaredAnnotations(Class<?> type, Predica
             return emptyList();
         }
 
-        LinkedList<Annotation> allAnnotations = new LinkedList<>();
+        LinkedList<Annotation> allAnnotations = newLinkedList();
         List<Class<?>> allInheritedClasses = findAllInheritedClasses(type, NON_OBJECT_CLASS_FILTER);
 
         // Add the declared annotations

microsphere-java-core/src/main/java/io/microsphere/util/StopWatch.java

@@ -16,7 +16,7 @@
  */
 package io.microsphere.util;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
@@ -28,6 +28,7 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.hash;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 
 /**
  * <p>{@code StopWatch} provides a simple way to measure execution time for tasks, supporting nested task tracking.
@@ -80,12 +81,12 @@
     /**
      * Running tasks(FIFO)
      */
-    private final List<Task> runningTasks = new LinkedList<>();
+    private final List<Task> runningTasks = newLinkedList();
 
     /**
      * Completed tasks(FILO)
      */
-    private final List<Task> completedTasks = new LinkedList<>();
+    private final List<Task> completedTasks = newLinkedList();
 
     /**
      * Total running time.

microsphere-java-core/src/main/java/io/microsphere/util/StringUtils.java

@@ -32,6 +32,7 @@
 import static java.lang.Character.toLowerCase;
 import static java.lang.Character.toUpperCase;
 import static java.lang.String.valueOf;
+import static io.microsphere.collection.ListUtils.newArrayList;
 
 /**
  * The utilities class for {@link String}
@@ -169,7 +170,7 @@ public static String[] split(@Nullable String value, @Nullable String delimiter)
 
         int delimiterLength = delimiter.length();
 
-        ArrayList<String> result = new ArrayList<>();
+        ArrayList<String> result = newArrayList();
 
         if (delimiterLength == 0) {
             for (int i = 0; i < length; i++) {

microsphere-java-core/src/main/java/io/microsphere/util/jar/JarUtils.java

@@ -25,6 +25,7 @@
 import java.util.jar.JarFile;
 
 import static io.microsphere.collection.CollectionUtils.isEmpty;
+import static io.microsphere.collection.ListUtils.newLinkedList;
 import static io.microsphere.collection.ListUtils.ofList;
 import static io.microsphere.constants.ProtocolConstants.FILE_PROTOCOL;
 import static io.microsphere.constants.ProtocolConstants.JAR_PROTOCOL;
@@ -215,7 +216,7 @@ public static List<JarEntry> filter(JarFile jarFile, JarEntryFilter jarEntryFilt
     @Nonnull
     @Immutable
     protected static List<JarEntry> doFilter(Iterable<JarEntry> jarEntries, JarEntryFilter jarEntryFilter) {
-        LinkedList<JarEntry> jarEntriesList = new LinkedList<>();
+        LinkedList<JarEntry> jarEntriesList = newLinkedList();
         for (JarEntry jarEntry : jarEntries) {
             if (jarEntryFilter == null || jarEntryFilter.accept(jarEntry)) {
                 jarEntriesList.add(jarEntry);