[version 2.7.0]remove the StaticContext class and refactor the code r…

…elated to Async (apache#2688)

* [Dubbo] move the classes of model from config to rpc-api for reusing

* remove ServiceClassHolder and use the ApplicationModel replacedly

* [Dubbo] delete the unused imported of ApplicationModel

* Update dubbo-demo-consumer.xml

this commits is no need to commit to remote repo.

* remove StaticContext

* remove the unused imported classes of ReferenceConfig

* fix NPE of ConsumerModel

* fix the failed testcase of AbstractClusterInvokerTest

* [Dubbo] #PR2688 to fix the review issues

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouterTest.java

@@ -26,8 +26,8 @@
 import org.apache.dubbo.rpc.cluster.Router;
 import org.apache.dubbo.rpc.cluster.RouterFactory;
 import org.apache.dubbo.rpc.cluster.router.MockInvoker;
+import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -47,8 +47,9 @@ public class TagRouterTest {
     public static void setUpBeforeClass() throws Exception {
     }
 
-    @Before
-    public void setUp() throws Exception {
+    @After
+    public void teardown() throws Exception {
+        RpcContext.getContext().clearAttachments();
     }
 
     @Test

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java

@@ -34,6 +34,7 @@
 import org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance;
 import org.apache.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -74,6 +75,11 @@ public class AbstractClusterInvokerTest {
     public static void setUpBeforeClass() throws Exception {
     }
 
+    @After
+    public void teardown() throws Exception {
+        RpcContext.getContext().clearAttachments();
+    }
+
     @SuppressWarnings({"unchecked"})
     @Before
     public void setUp() throws Exception {

dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java

@@ -20,6 +20,9 @@
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.config.MethodConfig;
 import com.alibaba.dubbo.config.ArgumentConfig;
+
+import org.apache.dubbo.rpc.model.ConsumerMethodModel;
+import org.apache.dubbo.service.Person;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
@@ -34,6 +37,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class MethodConfigTest {
     @Test
@@ -97,12 +101,23 @@ public void testSticky() throws Exception {
         assertThat(method.getSticky(), is(true));
     }
 
+    @Test
+    public void testConverMethodConfig2AsyncInfo() throws Exception{
+        org.apache.dubbo.config.MethodConfig methodConfig = new org.apache.dubbo.config.MethodConfig();
+        methodConfig.setOninvokeMethod("setName");
+        methodConfig.setOninvoke(new Person());
+
+        ConsumerMethodModel.AsyncMethodInfo methodInfo = org.apache.dubbo.config.MethodConfig.convertMethodConfig2AyncInfo(methodConfig);
+
+        assertTrue(methodInfo.getOninvokeMethod().equals( Person.class.getMethod("setName", String.class)));
+    }
+
     @Test
     public void testOnreturn() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOnreturn("on-return-object");
         assertThat(method.getOnreturn(), equalTo((Object) "on-return-object"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_RETURN_INSTANCE_KEY, (Object) "on-return-object"));
         Map<String, String> parameters = new HashMap<String, String>();
@@ -115,7 +130,7 @@ public void testOnreturnMethod() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOnreturnMethod("on-return-method");
         assertThat(method.getOnreturnMethod(), equalTo("on-return-method"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_RETURN_METHOD_KEY, (Object) "on-return-method"));
         Map<String, String> parameters = new HashMap<String, String>();
@@ -128,7 +143,7 @@ public void testOnthrow() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOnthrow("on-throw-object");
         assertThat(method.getOnthrow(), equalTo((Object) "on-throw-object"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_THROW_INSTANCE_KEY, (Object) "on-throw-object"));
         Map<String, String> parameters = new HashMap<String, String>();
@@ -141,7 +156,7 @@ public void testOnthrowMethod() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOnthrowMethod("on-throw-method");
         assertThat(method.getOnthrowMethod(), equalTo("on-throw-method"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_THROW_METHOD_KEY, (Object) "on-throw-method"));
         Map<String, String> parameters = new HashMap<String, String>();
@@ -154,7 +169,7 @@ public void testOninvoke() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOninvoke("on-invoke-object");
         assertThat(method.getOninvoke(), equalTo((Object) "on-invoke-object"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_INVOKE_INSTANCE_KEY, (Object) "on-invoke-object"));
         Map<String, String> parameters = new HashMap<String, String>();
@@ -167,7 +182,7 @@ public void testOninvokeMethod() throws Exception {
         MethodConfig method = new MethodConfig();
         method.setOninvokeMethod("on-invoke-method");
         assertThat(method.getOninvokeMethod(), equalTo("on-invoke-method"));
-        Map<Object, Object> attribute = new HashMap<Object, Object>();
+        Map<String, Object> attribute = new HashMap<String, Object>();
         MethodConfig.appendAttributes(attribute, method);
         assertThat(attribute, hasEntry((Object) Constants.ON_INVOKE_METHOD_KEY, (Object) "on-invoke-method"));
         Map<String, String> parameters = new HashMap<String, String>();