Merge remote-tracking branch 'apache/master' into 2.7.11-release

apache · May 6, 2021 · 30616ea · 30616ea
2 parents 5f161b0 + f29663b
commit 30616ea
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -28,9 +28,11 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.dubbo.rpc.Constants.LOCAL_PROTOCOL;
+import static org.apache.dubbo.rpc.Constants.SCOPE_REMOTE;
 
 public class ReferenceConfigTest {
     private TestingServer zkServer;
@@ -52,6 +54,7 @@ public void tearDown() throws Exception {
     }
 
     @Test
+    @Disabled("Disabled due to Github Actions environment")
     public void testInjvm() throws Exception {
         ApplicationConfig application = new ApplicationConfig();
         application.setName("test-protocol-random-port");
@@ -60,7 +63,7 @@ public void testInjvm() throws Exception {
         registry.setAddress(registryUrl);
 
         ProtocolConfig protocol = new ProtocolConfig();
-        protocol.setName("mockprotocol");
+        protocol.setName("dubbo");
 
         ServiceConfig<DemoService> demoService;
         demoService = new ServiceConfig<DemoService>();
@@ -74,7 +77,7 @@ public void testInjvm() throws Exception {
         rc.setApplication(application);
         rc.setRegistry(registry);
         rc.setInterface(DemoService.class.getName());
-        rc.setInjvm(false);
+        rc.setScope(SCOPE_REMOTE);
 
         try {
             System.setProperty("java.net.preferIPv4Stack", "true");

diff --git a/.../java/org/apache/dubbo/config/event/listener/PublishingServiceDefinitionListenerTest.java b/.../java/org/apache/dubbo/config/event/listener/PublishingServiceDefinitionListenerTest.java
@@ -31,7 +31,7 @@
 import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
-import com.google.gson.Gson;
+import com.alibaba.fastjson.JSON;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -82,7 +82,7 @@ public void testOnServiceConfigExportedEvent() {
 
         ServiceDefinition serviceDefinitionBuild = ServiceDefinitionBuilder.build(serviceConfig.getInterfaceClass());
 
-        assertEquals(serviceDefinition, new Gson().toJson(serviceDefinitionBuild));
+        assertEquals(serviceDefinition, JSON.toJSONString(serviceDefinitionBuild));
         serviceConfig.unexport();
     }
 }
diff --git a/...data-api/src/main/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilder.java b/...data-api/src/main/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilder.java
@@ -27,7 +27,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...ta-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java b/...ta-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
@@ -30,6 +30,7 @@
 import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
 import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
 
+import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -252,8 +253,7 @@ private void storeProviderMetadataTask(MetadataIdentifier providerMetadataIdenti
             }
             allMetadataReports.put(providerMetadataIdentifier, serviceDefinition);
             failedReports.remove(providerMetadataIdentifier);
-            Gson gson = new Gson();
-            String data = gson.toJson(serviceDefinition);
+            String data = JSON.toJSONString(serviceDefinition);
             doStoreProviderMetadata(providerMetadataIdentifier, data);
             saveProperties(providerMetadataIdentifier, data, true, !syncReport);
         } catch (Exception e) {

diff --git a/...rc/main/java/org/apache/dubbo/metadata/store/AbstractAbstractWritableMetadataService.java b/...rc/main/java/org/apache/dubbo/metadata/store/AbstractAbstractWritableMetadataService.java
@@ -23,7 +23,7 @@
 import org.apache.dubbo.metadata.WritableMetadataService;
 import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
 
-import com.google.gson.Gson;
+import com.alibaba.fastjson.JSON;
 
 import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.PID_KEY;
@@ -78,8 +78,7 @@ protected String getServiceDefinition(URL exportedURL) {
             if (StringUtils.isNotEmpty(interfaceName) && !isGeneric(exportedURL.getParameter(GENERIC_KEY))) {
                 Class interfaceClass = forName(interfaceName);
                 ServiceDefinition serviceDefinition = buildFullDefinition(interfaceClass, exportedURL.getParameters());
-                Gson gson = new Gson();
-                json = gson.toJson(serviceDefinition);
+                json = JSON.toJSONString(serviceDefinition);
             }
         } catch (ClassNotFoundException e) {
             //ignore error

diff --git a/...java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java b/...java/org/apache/dubbo/registry/client/metadata/store/InMemoryWritableMetadataService.java
@@ -30,7 +30,7 @@
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.support.ProtocolUtils;
 
-import com.google.gson.Gson;
+import com.alibaba.fastjson.JSON;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -172,8 +172,7 @@ public void publishServiceDefinition(URL providerUrl) {
                 if (StringUtils.isNotEmpty(interfaceName)) {
                     Class interfaceClass = Class.forName(interfaceName);
                     ServiceDefinition serviceDefinition = ServiceDefinitionBuilder.build(interfaceClass);
-                    Gson gson = new Gson();
-                    String data = gson.toJson(serviceDefinition);
+                    String data = JSON.toJSONString(serviceDefinition);
                     serviceDefinitions.put(providerUrl.getServiceKey(), data);
                     return;
                 }