From a799dd95286fa314ddae1d282bfea149539d6254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=BC=E5=8D=8E?= <43363120+BurningCN@users.noreply.github.com> Date: Thu, 3 Jun 2021 16:54:04 +0800 Subject: [PATCH] Use constants instead of literals (#7962) * Use constants instead of literals * Remove unused variables * Remove unnecessary modifiers * Use constants instead of literals --- .../org/apache/dubbo/common/bytecode/ClassGenerator.java | 2 +- .../java/org/apache/dubbo/common/compiler/Compiler.java | 3 ++- .../dubbo/common/compiler/support/JavassistCompiler.java | 2 ++ .../apache/dubbo/common/compiler/support/JdkCompiler.java | 2 ++ .../org/apache/dubbo/common/threadpool/ThreadPool.java | 3 ++- .../threadpool/manager/DefaultExecutorRepository.java | 3 --- .../common/threadpool/support/cached/CachedThreadPool.java | 2 ++ .../common/threadpool/support/eager/EagerThreadPool.java | 2 ++ .../common/threadpool/support/fixed/FixedThreadPool.java | 2 ++ .../threadpool/support/limited/LimitedThreadPool.java | 2 ++ .../src/main/java/org/apache/dubbo/cache/CacheFactory.java | 7 +++++-- .../dubbo/cache/support/expiring/ExpiringCacheFactory.java | 2 ++ .../apache/dubbo/cache/support/jcache/JCacheFactory.java | 2 ++ .../apache/dubbo/cache/support/lfu/LfuCacheFactory.java | 2 ++ .../apache/dubbo/cache/support/lru/LruCacheFactory.java | 2 ++ 15 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java index 252c3aa719..3267c67356 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java @@ -382,7 +382,7 @@ public final class ClassGenerator { return getCtClass(c.getDeclaringClass()).getConstructor(ReflectUtils.getDesc(c)); } - public static interface DC { + public interface DC { } // dynamic class tag interface. } \ No newline at end of file diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/Compiler.java b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/Compiler.java index 3b8961d83f..1107abbd86 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/Compiler.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/Compiler.java @@ -16,12 +16,13 @@ */ package org.apache.dubbo.common.compiler; +import org.apache.dubbo.common.compiler.support.JavassistCompiler; import org.apache.dubbo.common.extension.SPI; /** * Compiler. (SPI, Singleton, ThreadSafe) */ -@SPI("javassist") +@SPI(JavassistCompiler.NAME) public interface Compiler { /** diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JavassistCompiler.java b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JavassistCompiler.java index 3a058849d8..0a77d5c20b 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JavassistCompiler.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JavassistCompiler.java @@ -28,6 +28,8 @@ import java.util.regex.Pattern; */ public class JavassistCompiler extends AbstractCompiler { + public static final String NAME = "javassist"; + private static final Pattern IMPORT_PATTERN = Pattern.compile("import\\s+([\\w\\.\\*]+);\n"); private static final Pattern EXTENDS_PATTERN = Pattern.compile("\\s+extends\\s+([\\w\\.]+)[^\\{]*\\{\n"); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JdkCompiler.java b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JdkCompiler.java index c82e48dd4c..e5d5b22401 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JdkCompiler.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JdkCompiler.java @@ -53,6 +53,8 @@ import java.util.Set; */ public class JdkCompiler extends AbstractCompiler { + public static final String NAME = "jdk"; + private final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); private final DiagnosticCollector diagnosticCollector = new DiagnosticCollector(); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java index 312cd690ff..adb054b662 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java @@ -19,6 +19,7 @@ package org.apache.dubbo.common.threadpool; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Adaptive; import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.common.threadpool.support.fixed.FixedThreadPool; import java.util.concurrent.Executor; @@ -27,7 +28,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREADPOOL_KEY; /** * ThreadPool */ -@SPI("fixed") +@SPI(FixedThreadPool.NAME) public interface ThreadPool { /** diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java index ebd89449f4..21b22aed5c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java @@ -51,7 +51,6 @@ public class DefaultExecutorRepository implements ExecutorRepository { private ScheduledExecutorService serviceExporterExecutor; - private ScheduledExecutorService reconnectScheduledExecutor; private ConcurrentMap> data = new ConcurrentHashMap<>(); @@ -60,8 +59,6 @@ public class DefaultExecutorRepository implements ExecutorRepository { ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-framework-scheduler")); scheduledExecutors.addItem(scheduler); } -// -// reconnectScheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-reconnect-scheduler")); serviceExporterExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Dubbo-exporter-scheduler")); } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java index 6dbbced16f..97cb5be317 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java @@ -45,6 +45,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY; */ public class CachedThreadPool implements ThreadPool { + public static final String NAME = "cached"; + @Override public Executor getExecutor(URL url) { String name = url.getParameter(THREAD_NAME_KEY, DEFAULT_THREAD_NAME); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java index 6d126894aa..05546e77cf 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java @@ -42,6 +42,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY; */ public class EagerThreadPool implements ThreadPool { + public static final String NAME = "eager"; + @Override public Executor getExecutor(URL url) { String name = url.getParameter(THREAD_NAME_KEY, DEFAULT_THREAD_NAME); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java index 606d7e1f91..a08226a042 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java @@ -41,6 +41,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY; */ public class FixedThreadPool implements ThreadPool { + public static final String NAME = "fixed"; + @Override public Executor getExecutor(URL url) { String name = url.getParameter(THREAD_NAME_KEY, DEFAULT_THREAD_NAME); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java index 87c46d3742..0605c4800c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java @@ -43,6 +43,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY; */ public class LimitedThreadPool implements ThreadPool { + public static final String NAME = "limited"; + @Override public Executor getExecutor(URL url) { String name = url.getParameter(THREAD_NAME_KEY, DEFAULT_THREAD_NAME); diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java index 77256bb5ee..8c58203388 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java @@ -16,18 +16,21 @@ */ package org.apache.dubbo.cache; +import org.apache.dubbo.cache.support.lru.LruCacheFactory; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Adaptive; import org.apache.dubbo.common.extension.SPI; import org.apache.dubbo.rpc.Invocation; +import static org.apache.dubbo.common.constants.FilterConstants.CACHE_KEY; + /** * Interface needs to be implemented by all the cache store provider.Along with implementing CacheFactory interface * entry needs to be added in org.apache.dubbo.cache.CacheFactory file in a classpath META-INF sub directories. * * @see Cache */ -@SPI("lru") +@SPI(LruCacheFactory.NAME) public interface CacheFactory { /** @@ -37,7 +40,7 @@ public interface CacheFactory { * @param invocation * @return Instance of Cache containing cached value against method url and invocation. */ - @Adaptive("cache") + @Adaptive(CACHE_KEY) Cache getCache(URL url, Invocation invocation); } diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java index 5259d74b6e..3330d738e5 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java @@ -32,6 +32,8 @@ import org.apache.dubbo.common.URL; public class ExpiringCacheFactory extends AbstractCacheFactory { + public static final String NAME = "expiring"; + /** * Takes url as an method argument and return new instance of cache store implemented by JCache. * @param url url of the method diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java index c4d713f0b1..be5640ce58 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java @@ -35,6 +35,8 @@ import javax.cache.spi.CachingProvider; */ public class JCacheFactory extends AbstractCacheFactory { + public static final String NAME = "jcache"; + /** * Takes url as an method argument and return new instance of cache store implemented by JCache. * @param url url of the method diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java index f04edca429..7fd384b9d3 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lfu/LfuCacheFactory.java @@ -30,6 +30,8 @@ import org.apache.dubbo.common.URL; */ public class LfuCacheFactory extends AbstractCacheFactory { + public static final String NAME = "lfu"; + /** * Takes url as an method argument and return new instance of cache store implemented by LfuCache. * @param url url of the method diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java index cda21292e8..b118399196 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java @@ -30,6 +30,8 @@ import org.apache.dubbo.common.URL; */ public class LruCacheFactory extends AbstractCacheFactory { + public static final String NAME = "lru"; + /** * Takes url as an method argument and return new instance of cache store implemented by LruCache. * @param url url of the method