Merge pull request apache#4 from Rawven/3.3

3.3

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/SingleRouterChain.java

@@ -212,7 +212,7 @@ private void printRouterSnapshot(URL url, BitList<Invoker<T>> availableInvokers,
     public RouterSnapshotNode<T> buildRouterSnapshot(
             URL url, BitList<Invoker<T>> availableInvokers, Invocation invocation) {
         BitList<Invoker<T>> resultInvokers = availableInvokers.clone();
-        RouterSnapshotNode<T> parentNode = new RouterSnapshotNode<T>("Parent", resultInvokers.clone());
+        RouterSnapshotNode<T> parentNode = new RouterSnapshotNode<>("Parent", resultInvokers.clone());
         parentNode.setNodeOutputInvokers(resultInvokers.clone());
 
         // 1. route state router
@@ -227,7 +227,7 @@ public RouterSnapshotNode<T> buildRouterSnapshot(
             return parentNode;
         }
 
-        RouterSnapshotNode<T> commonRouterNode = new RouterSnapshotNode<T>("CommonRouter", resultInvokers.clone());
+        RouterSnapshotNode<T> commonRouterNode = new RouterSnapshotNode<>("CommonRouter", resultInvokers.clone());
         parentNode.appendNode(commonRouterNode);
         List<Invoker<T>> commonRouterResult = resultInvokers;
 
@@ -237,7 +237,7 @@ public RouterSnapshotNode<T> buildRouterSnapshot(
             List<Invoker<T>> inputInvokers = new ArrayList<>(commonRouterResult);
 
             RouterSnapshotNode<T> currentNode =
-                    new RouterSnapshotNode<T>(router.getClass().getSimpleName(), inputInvokers);
+                    new RouterSnapshotNode<>(router.getClass().getSimpleName(), inputInvokers);
 
             // append to router node chain
             commonRouterNode.appendNode(currentNode);

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java

@@ -223,7 +223,7 @@ private boolean isDeprecatedConditionMatch(Set<String> conditionKeys, URL url) {
     }
 
     private Set<String> genConditionKeys() {
-        Set<String> conditionKeys = new HashSet<String>();
+        Set<String> conditionKeys = new HashSet<>();
         conditionKeys.add(CATEGORY_KEY);
         conditionKeys.add(Constants.CHECK_KEY);
         conditionKeys.add(DYNAMIC_KEY);

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java

@@ -46,8 +46,7 @@ public class ConsistentHashLoadBalance extends AbstractLoadBalance {
      */
     public static final String HASH_ARGUMENTS = "hash.arguments";
 
-    private final ConcurrentMap<String, ConsistentHashSelector<?>> selectors =
-            new ConcurrentHashMap<String, ConsistentHashSelector<?>>();
+    private final ConcurrentMap<String, ConsistentHashSelector<?>> selectors = new ConcurrentHashMap<>();
 
     @SuppressWarnings("unchecked")
     @Override
@@ -75,7 +74,7 @@ private static final class ConsistentHashSelector<T> {
         private final int[] argumentIndex;
 
         ConsistentHashSelector(List<Invoker<T>> invokers, String methodName, int identityHashCode) {
-            this.virtualInvokers = new TreeMap<Long, Invoker<T>>();
+            this.virtualInvokers = new TreeMap<>();
             this.identityHashCode = identityHashCode;
             URL url = invokers.get(0).getUrl();
             this.replicaNumber = url.getMethodParameter(methodName, HASH_NODES, 160);

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java

@@ -32,7 +32,7 @@ public class MapMerger implements Merger<Map<?, ?>> {
         if (ArrayUtils.isEmpty(items)) {
             return Collections.emptyMap();
         }
-        Map<Object, Object> result = new HashMap<Object, Object>();
+        Map<Object, Object> result = new HashMap<>();
         Stream.of(items).filter(Objects::nonNull).forEach(result::putAll);
         return result;
     }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java

@@ -36,7 +36,7 @@ public class MergerFactory implements ScopeModelAware {
 
     private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MergerFactory.class);
 
-    private ConcurrentMap<Class<?>, Merger<?>> MERGER_CACHE = new ConcurrentHashMap<Class<?>, Merger<?>>();
+    private ConcurrentMap<Class<?>, Merger<?>> MERGER_CACHE = new ConcurrentHashMap<>();
     private ScopeModel scopeModel;
 
     @Override

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java

@@ -32,7 +32,7 @@ public Set<Object> merge(Set<?>... items) {
         if (ArrayUtils.isEmpty(items)) {
             return Collections.emptySet();
         }
-        Set<Object> result = new HashSet<Object>();
+        Set<Object> result = new HashSet<>();
         Stream.of(items).filter(Objects::nonNull).forEach(result::addAll);
         return result;
     }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionStateRouterFactory.java

@@ -30,6 +30,6 @@ public class ConditionStateRouterFactory extends CacheableStateRouterFactory {
 
     @Override
     protected <T> StateRouter<T> createRouter(Class<T> interfaceClass, URL url) {
-        return new ConditionStateRouter<T>(url);
+        return new ConditionStateRouter<>(url);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ServiceStateRouterFactory.java

@@ -32,6 +32,6 @@ public class ServiceStateRouterFactory extends CacheableStateRouterFactory {
 
     @Override
     protected <T> StateRouter<T> createRouter(Class<T> interfaceClass, URL url) {
-        return new ServiceStateRouter<T>(url);
+        return new ServiceStateRouter<>(url);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCache.java

@@ -136,7 +136,7 @@ public static <T> MeshRuleCache<T> build(
                     Collections.unmodifiableMap(totalSubsetMap),
                     unmatchedInvokers);
         } else {
-            return new MeshRuleCache<T>(
+            return new MeshRuleCache<>(
                     Collections.emptyList(), Collections.emptyMap(), Collections.emptyMap(), invokers);
         }
     }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockStateRouterFactory.java

@@ -30,6 +30,6 @@ public class MockStateRouterFactory implements StateRouterFactory {
 
     @Override
     public <T> StateRouter<T> getRouter(Class<T> interfaceClass, URL url) {
-        return new MockInvokersSelector<T>(url);
+        return new MockInvokersSelector<>(url);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagStateRouterFactory.java

@@ -31,6 +31,6 @@ public class TagStateRouterFactory extends CacheableStateRouterFactory {
 
     @Override
     protected <T> StateRouter<T> createRouter(Class<T> interfaceClass, URL url) {
-        return new TagStateRouter<T>(url);
+        return new TagStateRouter<>(url);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java

@@ -63,8 +63,8 @@ public Result doInvoke(Invocation invocation, final List<Invoker<T>> invokers, L
         int len = calculateInvokeTimes(methodName);
         // retry loop.
         RpcException le = null; // last exception.
-        List<Invoker<T>> invoked = new ArrayList<Invoker<T>>(copyInvokers.size()); // invoked invokers.
-        Set<String> providers = new HashSet<String>(len);
+        List<Invoker<T>> invoked = new ArrayList<>(copyInvokers.size()); // invoked invokers.
+        Set<String> providers = new HashSet<>(len);
         for (int i = 0; i < len; i++) {
             // Reselect before retry to avoid a change of candidate `invokers`.
             // NOTE: if `invokers` changed, then `invoked` also lose accuracy.

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableCluster.java

@@ -26,6 +26,6 @@ public class MergeableCluster extends AbstractCluster {
 
     @Override
     public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
-        return new MergeableClusterInvoker<T>(directory);
+        return new MergeableClusterInvoker<>(directory);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareCluster.java

@@ -27,6 +27,6 @@ public class ZoneAwareCluster extends AbstractCluster {
 
     @Override
     protected <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
-        return new ZoneAwareClusterInvoker<T>(directory);
+        return new ZoneAwareClusterInvoker<>(directory);
     }
 }

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java

@@ -35,7 +35,7 @@ public MockClusterWrapper(Cluster cluster) {
 
     @Override
     public <T> Invoker<T> join(Directory<T> directory, boolean buildFilterChain) throws RpcException {
-        return new MockClusterInvoker<T>(directory, this.cluster.join(directory, buildFilterChain));
+        return new MockClusterInvoker<>(directory, this.cluster.join(directory, buildFilterChain));
     }
 
     public Cluster getCluster() {

dubbo-common/src/main/java/org/apache/dubbo/common/Version.java

@@ -60,7 +60,7 @@ public final class Version {
     public static final int LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT = 2000200; // 2.0.2
 
     public static final int HIGHEST_PROTOCOL_VERSION = 2009900; // 2.0.99
-    private static final Map<String, Integer> VERSION2INT = new HashMap<String, Integer>();
+    private static final Map<String, Integer> VERSION2INT = new HashMap<>();
 
     static {
         // get dubbo version and last commit id

dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtil.java

@@ -35,7 +35,7 @@
 public final class JavaBeanSerializeUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(JavaBeanSerializeUtil.class);
-    private static final Map<String, Class<?>> TYPES = new HashMap<String, Class<?>>();
+    private static final Map<String, Class<?>> TYPES = new HashMap<>();
     private static final String ARRAY_PREFIX = "[";
     private static final String REFERENCE_TYPE_PREFIX = "L";
     private static final String REFERENCE_TYPE_SUFFIX = ";";
@@ -72,7 +72,7 @@ public static JavaBeanDescriptor serialize(Object obj, JavaBeanAccessor accessor
         if (obj instanceof JavaBeanDescriptor) {
             return (JavaBeanDescriptor) obj;
         }
-        IdentityHashMap<Object, JavaBeanDescriptor> cache = new IdentityHashMap<Object, JavaBeanDescriptor>();
+        IdentityHashMap<Object, JavaBeanDescriptor> cache = new IdentityHashMap<>();
         return createDescriptorIfAbsent(obj, accessor, cache);
     }
 
@@ -209,7 +209,7 @@ public static Object deserialize(JavaBeanDescriptor beanDescriptor, ClassLoader
         if (beanDescriptor == null) {
             return null;
         }
-        IdentityHashMap<JavaBeanDescriptor, Object> cache = new IdentityHashMap<JavaBeanDescriptor, Object>();
+        IdentityHashMap<JavaBeanDescriptor, Object> cache = new IdentityHashMap<>();
         Object result = instantiateForDeserialize(beanDescriptor, loader, cache);
         deserializeInternal(result, beanDescriptor, loader, cache);
         return result;

dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/Mixin.java

@@ -120,7 +120,7 @@ public static Mixin mixin(Class<?>[] ics, Class<?>[] dcs, ClassLoader cl) {
 
             Class<?> neighbor = null;
             // impl methods.
-            Set<String> worked = new HashSet<String>();
+            Set<String> worked = new HashSet<>();
             for (int i = 0; i < ics.length; i++) {
                 if (!Modifier.isPublic(ics[i].getModifiers())) {
                     String npkg = ics[i].getPackage().getName();

dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/Wrapper.java

@@ -42,8 +42,8 @@
  * Wrapper.
  */
 public abstract class Wrapper {
-    private static final ConcurrentMap<Class<?>, Wrapper> WRAPPER_MAP =
-            new ConcurrentHashMap<Class<?>, Wrapper>(); // class wrapper map
+    // class wrapper map
+    private static final ConcurrentMap<Class<?>, Wrapper> WRAPPER_MAP = new ConcurrentHashMap<>();
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
     private static final String[] OBJECT_METHODS = new String[] {"getClass", "hashCode", "toString", "equals"};
     private static final Wrapper OBJECT_WRAPPER = new Wrapper() {

dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/ClassUtils.java

@@ -392,7 +392,7 @@ public static String getInitCode(Class<?> type) {
     }
 
     public static <K, V> Map<K, V> toMap(Map.Entry<K, V>[] entries) {
-        Map<K, V> map = new HashMap<K, V>();
+        Map<K, V> map = new HashMap<>();
         if (entries != null && entries.length > 0) {
             for (Map.Entry<K, V> entry : entries) {
                 map.put(entry.getKey(), entry.getValue());

dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java

@@ -28,7 +28,7 @@ public final class InternalThreadLocalMap {
 
     private Object[] indexedVariables;
 
-    private static ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap = new ThreadLocal<InternalThreadLocalMap>();
+    private static ThreadLocal<InternalThreadLocalMap> slowThreadLocalMap = new ThreadLocal<>();
 
     private static final AtomicInteger NEXT_INDEX = new AtomicInteger();
 

dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java

@@ -428,7 +428,7 @@ private static void reportTooManyInstances() {
     }
 
     private final class Worker implements Runnable {
-        private final Set<Timeout> unprocessedTimeouts = new HashSet<Timeout>();
+        private final Set<Timeout> unprocessedTimeouts = new HashSet<>();
 
         private long tick;
 

dubbo-common/src/main/java/org/apache/dubbo/common/utils/CIDRUtils.java

@@ -98,7 +98,7 @@ private void calculate() throws UnknownHostException {
 
     private byte[] toBytes(byte[] array, int targetSize) {
         int counter = 0;
-        List<Byte> newArr = new ArrayList<Byte>();
+        List<Byte> newArr = new ArrayList<>();
         while (counter < targetSize && (array.length - 1 - counter >= 0)) {
             newArr.add(0, array[array.length - 1 - counter]);
             counter++;

dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassLoaderResourceLoader.java

@@ -16,14 +16,12 @@
  */
 package org.apache.dubbo.common.utils;
 
-import org.apache.dubbo.common.aot.NativeDetector;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.resource.GlobalResourcesRepository;
 
 import java.io.IOException;
 import java.lang.ref.SoftReference;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
@@ -32,7 +30,6 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 
@@ -81,15 +78,9 @@ public static Set<URL> loadResources(String fileName, ClassLoader currentClassLo
             Enumeration<URL> urls;
             try {
                 urls = currentClassLoader.getResources(fileName);
-                boolean isNative = NativeDetector.inNativeImage();
                 if (urls != null) {
                     while (urls.hasMoreElements()) {
                         URL url = urls.nextElement();
-                        if (isNative) {
-                            // In native mode, the address of each URL is the same instead of different paths, so it is
-                            // necessary to set the ref to make it different
-                            setRef(url);
-                        }
                         set.add(url);
                     }
                 }
@@ -113,15 +104,6 @@ public static void destroy() {
         }
     }
 
-    private static void setRef(URL url) {
-        try {
-            Field field = URL.class.getDeclaredField("ref");
-            field.setAccessible(true);
-            field.set(url, UUID.randomUUID().toString());
-        } catch (Throwable ignore) {
-        }
-    }
-
     // for test
     protected static SoftReference<Map<ClassLoader, Map<String, Set<URL>>>> getClassLoaderResourcesCache() {
         return classLoaderResourcesCache;

dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java

@@ -87,7 +87,7 @@ public static boolean isDefault(String value) {
      */
     public static List<String> mergeValues(
             ExtensionDirector extensionDirector, Class<?> type, String cfg, List<String> def) {
-        List<String> defaults = new ArrayList<String>();
+        List<String> defaults = new ArrayList<>();
         if (def != null) {
             for (String name : def) {
                 if (extensionDirector.getExtensionLoader(type).hasExtension(name)) {
@@ -96,7 +96,7 @@ public static List<String> mergeValues(
             }
         }
 
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
 
         // add initial values
         String[] configs = (cfg == null || cfg.trim().length() == 0) ? new String[0] : COMMA_SPLIT_PATTERN.split(cfg);

dubbo-common/src/main/java/org/apache/dubbo/common/utils/IOUtils.java

@@ -179,7 +179,7 @@ public static String[] readLines(File file) throws IOException {
      * @throws IOException If an I/O error occurs
      */
     public static String[] readLines(InputStream is) throws IOException {
-        List<String> lines = new ArrayList<String>();
+        List<String> lines = new ArrayList<>();
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
             String line;
             while ((line = reader.readLine()) != null) {

dubbo-common/src/main/java/org/apache/dubbo/common/utils/Stack.java

@@ -26,7 +26,7 @@
 public class Stack<E> {
     private int mSize = 0;
 
-    private final List<E> mElements = new ArrayList<E>();
+    private final List<E> mElements = new ArrayList<>();
 
     public Stack() {}
 

dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java

@@ -878,7 +878,7 @@ public static String join(final Object[] array, final char delimiter, final int
      */
     private static Map<String, String> parseKeyValuePair(String str, String itemSeparator) {
         String[] tmp = str.split(itemSeparator);
-        Map<String, String> map = new HashMap<String, String>(tmp.length);
+        Map<String, String> map = new HashMap<>(tmp.length);
         for (int i = 0; i < tmp.length; i++) {
             Matcher matcher = KVP_PATTERN.matcher(tmp[i]);
             if (!matcher.matches()) {
@@ -902,7 +902,7 @@ public static String getQueryStringValue(String qs, String key) {
      */
     public static Map<String, String> parseQueryString(String qs) {
         if (isEmpty(qs)) {
-            return new HashMap<String, String>();
+            return new HashMap<>();
         }
         return parseKeyValuePair(qs, "\\&");
     }

dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java

@@ -181,7 +181,7 @@ public static List<URL> parseURLs(String address, Map<String, String> defaults)
             throw new IllegalArgumentException(
                     "Addresses is not allowed to be empty, please re-enter."); // here won't be empty
         }
-        List<URL> registries = new ArrayList<URL>();
+        List<URL> registries = new ArrayList<>();
         for (String addr : addresses) {
             registries.add(parseURL(addr, defaults));
         }

dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java

@@ -221,7 +221,7 @@ public AbstractInterfaceConfig(ModuleModel moduleModel) {
     /**
      * The url of the reference service
      */
-    protected final transient List<URL> urls = new ArrayList<URL>();
+    protected final transient List<URL> urls = new ArrayList<>();
 
     @Transient
     public List<URL> getExportedUrls() {

dubbo-common/src/main/java/org/apache/dubbo/config/ModuleConfig.java

@@ -186,7 +186,7 @@ public RegistryConfig getRegistry() {
     }
 
     public void setRegistry(RegistryConfig registry) {
-        List<RegistryConfig> registries = new ArrayList<RegistryConfig>(1);
+        List<RegistryConfig> registries = new ArrayList<>(1);
         registries.add(registry);
         this.registries = registries;
     }

dubbo-common/src/main/java/org/apache/dubbo/metadata/definition/util/ClassUtils.java

@@ -96,7 +96,7 @@ public static List<Field> getNonStaticFields(final Class<?> clazz) {
      * @return methods list
      */
     public static List<Method> getPublicNonStaticMethods(final Class<?> clazz) {
-        List<Method> result = new ArrayList<Method>();
+        List<Method> result = new ArrayList<>();
 
         Method[] methods = clazz.getMethods();
         for (Method method : methods) {