feat: optimize code (#11671)

apache · Feb 27, 2023 · a70cc27 · a70cc27
1 parent c4d6f94
commit a70cc27
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.rpc.cluster;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.common.extension.SPI;
 
@@ -33,7 +34,7 @@ public interface ConfiguratorFactory {
      * @param url - configurator url.
      * @return configurator instance.
      */
-    @Adaptive("protocol")
+    @Adaptive(CommonConstants.PROTOCOL_KEY)
     Configurator getConfigurator(URL url);
 
 }
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.rpc.cluster;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.common.extension.SPI;
 
@@ -42,6 +43,6 @@ public interface RouterFactory {
      * @param url url
      * @return router instance
      */
-    @Adaptive("protocol")
+    @Adaptive(CommonConstants.PROTOCOL_KEY)
     Router getRouter(URL url);
 }
diff --git a/...o-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouterFactory.java b/...o-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouterFactory.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.rpc.cluster.router.state;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.common.extension.SPI;
 
@@ -29,6 +30,6 @@ public interface StateRouterFactory {
      * @return router instance
      * @since 3.0
      */
-    @Adaptive("protocol")
+    @Adaptive(CommonConstants.PROTOCOL_KEY)
     <T> StateRouter<T> getRouter(Class<T> interfaceClass, URL url);
 }
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.common.extension;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.StringUtils;
@@ -268,7 +269,7 @@ private String generateExtNameAssignment(String[] value, boolean hasInvocation)
         for (int i = value.length - 1; i >= 0; --i) {
             if (i == value.length - 1) {
                 if (null != defaultExtName) {
-                    if (!"protocol".equals(value[i])) {
+                    if (!CommonConstants.PROTOCOL_KEY.equals(value[i])) {
                         if (hasInvocation) {
                             getNameCode = String.format("url.getMethodParameter(methodName, \"%s\", \"%s\")", value[i], defaultExtName);
                         } else {
@@ -278,7 +279,7 @@ private String generateExtNameAssignment(String[] value, boolean hasInvocation)
                         getNameCode = String.format("( url.getProtocol() == null ? \"%s\" : url.getProtocol() )", defaultExtName);
                     }
                 } else {
-                    if (!"protocol".equals(value[i])) {
+                    if (!CommonConstants.PROTOCOL_KEY.equals(value[i])) {
                         if (hasInvocation) {
                             getNameCode = String.format("url.getMethodParameter(methodName, \"%s\", \"%s\")", value[i], defaultExtName);
                         } else {
@@ -289,7 +290,7 @@ private String generateExtNameAssignment(String[] value, boolean hasInvocation)
                     }
                 }
             } else {
-                if (!"protocol".equals(value[i])) {
+                if (!CommonConstants.PROTOCOL_KEY.equals(value[i])) {
                     if (hasInvocation) {
                         getNameCode = String.format("url.getMethodParameter(methodName, \"%s\", \"%s\")", value[i], defaultExtName);
                     } else {

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/ConfiguratorFactory.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/ConfiguratorFactory.java
@@ -17,12 +17,13 @@
 package com.alibaba.dubbo.rpc.cluster;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.rpc.cluster.Configurator;
 
 @Deprecated
 public interface ConfiguratorFactory extends org.apache.dubbo.rpc.cluster.ConfiguratorFactory {
-    @Adaptive("protocol")
+    @Adaptive(CommonConstants.PROTOCOL_KEY)
     com.alibaba.dubbo.rpc.cluster.Configurator getConfigurator(com.alibaba.dubbo.common.URL url);
 
     @Override

diff --git a/...bbo-metrics-api/src/main/java/org/apache/dubbo/metrics/report/MetricsReporterFactory.java b/...bbo-metrics-api/src/main/java/org/apache/dubbo/metrics/report/MetricsReporterFactory.java
@@ -18,6 +18,7 @@
 package org.apache.dubbo.metrics.report;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.common.extension.ExtensionScope;
 import org.apache.dubbo.common.extension.SPI;
@@ -34,6 +35,6 @@ public interface MetricsReporterFactory {
      * @param url URL
      * @return Metrics reporter implementation.
      */
-    @Adaptive({"protocol"})
+    @Adaptive({CommonConstants.PROTOCOL_KEY})
     MetricsReporter createMetricsReporter(URL url);
 }
diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.monitor;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Adaptive;
 import org.apache.dubbo.common.extension.SPI;
 
@@ -32,7 +33,7 @@ public interface MonitorFactory {
      * @param url
      * @return monitor
      */
-    @Adaptive("protocol")
+    @Adaptive(CommonConstants.PROTOCOL_KEY)
     Monitor getMonitor(URL url);
 
 }