From e5c4f9c8bb0226ca371298c24de451b623ff9d10 Mon Sep 17 00:00:00 2001
From: crazyhzm <crazyhzm@gmail.com>
Date: Tue, 19 Dec 2023 14:11:56 +0800
Subject: [PATCH] Revert dubbo module refactor

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
---
 .../rpc/cluster/support/MockInvokerTest.java  | 71 +++++++++----------
 dubbo-rpc/dubbo-rpc-api/pom.xml               |  5 --
 .../src/test/resources/log4j2-test.xml        | 33 ---------
 3 files changed, 33 insertions(+), 76 deletions(-)
 delete mode 100644 dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j2-test.xml

diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MockInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MockInvokerTest.java
index cc752951e297..ae0509ffadc2 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MockInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MockInvokerTest.java
@@ -36,29 +36,27 @@ class MockInvokerTest {
 
     @Test
     void testParseMockValue() throws Exception {
-        Assertions.assertNull(org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("null"));
-        Assertions.assertNull(org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("empty"));
+        Assertions.assertNull(MockInvoker.parseMockValue("null"));
+        Assertions.assertNull(MockInvoker.parseMockValue("empty"));
 
-        Assertions.assertTrue((Boolean) org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("true"));
-        Assertions.assertFalse((Boolean) org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("false"));
+        Assertions.assertTrue((Boolean) MockInvoker.parseMockValue("true"));
+        Assertions.assertFalse((Boolean) MockInvoker.parseMockValue("false"));
 
-        Assertions.assertEquals(123, org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("123"));
-        Assertions.assertEquals("foo", org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("foo"));
-        Assertions.assertEquals("foo", org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("\"foo\""));
-        Assertions.assertEquals("foo", org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("\'foo\'"));
+        Assertions.assertEquals(123, MockInvoker.parseMockValue("123"));
+        Assertions.assertEquals("foo", MockInvoker.parseMockValue("foo"));
+        Assertions.assertEquals("foo", MockInvoker.parseMockValue("\"foo\""));
+        Assertions.assertEquals("foo", MockInvoker.parseMockValue("\'foo\'"));
 
-        Assertions.assertEquals(new HashMap<>(), org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("{}"));
-        Assertions.assertEquals(new ArrayList<>(), org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("[]"));
-        Assertions.assertEquals(
-                "foo", org.apache.dubbo.rpc.support.MockInvoker.parseMockValue("foo", new Type[] {String.class}));
+        Assertions.assertEquals(new HashMap<>(), MockInvoker.parseMockValue("{}"));
+        Assertions.assertEquals(new ArrayList<>(), MockInvoker.parseMockValue("[]"));
+        Assertions.assertEquals("foo", MockInvoker.parseMockValue("foo", new Type[] {String.class}));
     }
 
     @Test
     void testInvoke() {
         URL url = URL.valueOf("remote://1.2.3.4/" + String.class.getName());
         url = url.addParameter(MOCK_KEY, "return ");
-        org.apache.dubbo.rpc.support.MockInvoker mockInvoker =
-                new org.apache.dubbo.rpc.support.MockInvoker(url, String.class);
+        MockInvoker mockInvoker = new MockInvoker(url, String.class);
 
         RpcInvocation invocation = new RpcInvocation();
         invocation.setMethodName("getSomething");
@@ -71,8 +69,7 @@ void testGetDefaultObject() {
         final Class<DemoServiceA> demoServiceAClass = DemoServiceA.class;
         URL url = URL.valueOf("remote://1.2.3.4/" + demoServiceAClass.getName());
         url = url.addParameter(MOCK_KEY, "force:true");
-        org.apache.dubbo.rpc.support.MockInvoker mockInvoker =
-                new org.apache.dubbo.rpc.support.MockInvoker(url, demoServiceAClass);
+        MockInvoker mockInvoker = new MockInvoker(url, demoServiceAClass);
 
         RpcInvocation invocation = new RpcInvocation();
         invocation.setMethodName("methodA");
@@ -82,7 +79,7 @@ void testGetDefaultObject() {
         final Class<DemoServiceB> demoServiceBClass = DemoServiceB.class;
         url = URL.valueOf("remote://1.2.3.4/" + demoServiceBClass.getName());
         url = url.addParameter(MOCK_KEY, "force:true");
-        mockInvoker = new org.apache.dubbo.rpc.support.MockInvoker(url, demoServiceBClass);
+        mockInvoker = new MockInvoker(url, demoServiceBClass);
         invocation = new RpcInvocation();
         invocation.setMethodName("methodB");
         Assertions.assertEquals(new HashMap<>(), mockInvoker.invoke(invocation).getObjectAttachments());
@@ -91,7 +88,7 @@ void testGetDefaultObject() {
     @Test
     void testInvokeThrowsRpcException1() {
         URL url = URL.valueOf("remote://1.2.3.4/" + String.class.getName());
-        org.apache.dubbo.rpc.support.MockInvoker mockInvoker = new org.apache.dubbo.rpc.support.MockInvoker(url, null);
+        MockInvoker mockInvoker = new MockInvoker(url, null);
 
         Assertions.assertThrows(RpcException.class, () -> mockInvoker.invoke(new RpcInvocation()));
     }
@@ -100,8 +97,7 @@ void testInvokeThrowsRpcException1() {
     void testInvokeThrowsRpcException2() {
         URL url = URL.valueOf("remote://1.2.3.4/" + String.class.getName());
         url = url.addParameter(MOCK_KEY, "fail");
-        org.apache.dubbo.rpc.support.MockInvoker mockInvoker =
-                new org.apache.dubbo.rpc.support.MockInvoker(url, String.class);
+        MockInvoker mockInvoker = new MockInvoker(url, String.class);
 
         RpcInvocation invocation = new RpcInvocation();
         invocation.setMethodName("getSomething");
@@ -112,8 +108,7 @@ void testInvokeThrowsRpcException2() {
     void testInvokeThrowsRpcException3() {
         URL url = URL.valueOf("remote://1.2.3.4/" + String.class.getName());
         url = url.addParameter(MOCK_KEY, "throw");
-        org.apache.dubbo.rpc.support.MockInvoker mockInvoker =
-                new org.apache.dubbo.rpc.support.MockInvoker(url, String.class);
+        MockInvoker mockInvoker = new MockInvoker(url, String.class);
 
         RpcInvocation invocation = new RpcInvocation();
         invocation.setMethodName("getSomething");
@@ -130,24 +125,24 @@ void testGetThrowable() {
     void testGetMockObject() {
         Assertions.assertEquals(
                 "",
-                org.apache.dubbo.rpc.support.MockInvoker.getMockObject(
+                MockInvoker.getMockObject(
                         ApplicationModel.defaultModel().getExtensionDirector(), "java.lang.String", String.class));
 
         Assertions.assertThrows(
                 IllegalStateException.class,
-                () -> org.apache.dubbo.rpc.support.MockInvoker.getMockObject(
+                () -> MockInvoker.getMockObject(
                         ApplicationModel.defaultModel().getExtensionDirector(), "true", String.class));
         Assertions.assertThrows(
                 IllegalStateException.class,
-                () -> org.apache.dubbo.rpc.support.MockInvoker.getMockObject(
+                () -> MockInvoker.getMockObject(
                         ApplicationModel.defaultModel().getExtensionDirector(), "default", String.class));
         Assertions.assertThrows(
                 IllegalStateException.class,
-                () -> org.apache.dubbo.rpc.support.MockInvoker.getMockObject(
+                () -> MockInvoker.getMockObject(
                         ApplicationModel.defaultModel().getExtensionDirector(), "java.lang.String", Integer.class));
         Assertions.assertThrows(
                 IllegalStateException.class,
-                () -> org.apache.dubbo.rpc.support.MockInvoker.getMockObject(
+                () -> MockInvoker.getMockObject(
                         ApplicationModel.defaultModel().getExtensionDirector(),
                         "java.io.Serializable",
                         Serializable.class));
@@ -155,17 +150,17 @@ void testGetMockObject() {
 
     @Test
     void testNormalizeMock() {
-        Assertions.assertNull(org.apache.dubbo.rpc.support.MockInvoker.normalizeMock(null));
-
-        Assertions.assertEquals("", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock(""));
-        Assertions.assertEquals("", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("fail:"));
-        Assertions.assertEquals("", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("force:"));
-        Assertions.assertEquals("throw", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("throw"));
-        Assertions.assertEquals("default", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("fail"));
-        Assertions.assertEquals("default", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("force"));
-        Assertions.assertEquals("default", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("true"));
-        Assertions.assertEquals("default", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("default"));
-        Assertions.assertEquals("return null", org.apache.dubbo.rpc.support.MockInvoker.normalizeMock("return"));
+        Assertions.assertNull(MockInvoker.normalizeMock(null));
+
+        Assertions.assertEquals("", MockInvoker.normalizeMock(""));
+        Assertions.assertEquals("", MockInvoker.normalizeMock("fail:"));
+        Assertions.assertEquals("", MockInvoker.normalizeMock("force:"));
+        Assertions.assertEquals("throw", MockInvoker.normalizeMock("throw"));
+        Assertions.assertEquals("default", MockInvoker.normalizeMock("fail"));
+        Assertions.assertEquals("default", MockInvoker.normalizeMock("force"));
+        Assertions.assertEquals("default", MockInvoker.normalizeMock("true"));
+        Assertions.assertEquals("default", MockInvoker.normalizeMock("default"));
+        Assertions.assertEquals("return null", MockInvoker.normalizeMock("return"));
         Assertions.assertEquals("return null", MockInvoker.normalizeMock("return null"));
     }
 }
diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml
index f7c8272edf30..be73b201ff8f 100644
--- a/dubbo-rpc/dubbo-rpc-api/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-api/pom.xml
@@ -51,11 +51,6 @@
       <artifactId>hessian-lite</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j2-test.xml b/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 8ff642b32f0f..000000000000
--- a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<Configuration status="WARN">
-    <Appenders>
-        <Dubbo name="Dubbo" fileName="../../dubbo.log">
-            <PatternLayout pattern="[%d{HH:mm:ss:SSS}] %5p %t %c{2}: %m%n%ex" charset="UTF-8"/>
-        </Dubbo>
-        <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} |-%highlight{%-5p} [%t] %40.40c:%-3L -| %m%n%rEx{filters(jdk.internal.reflect,java.lang.reflect,sun.reflect,org.junit,org.mockito)}" charset="UTF-8"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Dubbo"/>
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>