[dubbo] 01/03: Revert CallbackServiceCodec for dev

[kylixs]

This is an automated email from the ASF dual-hosted git repository.

kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 4b624186bace89c66929da577b2600cad91a5735
Author: gongdewei <kyl...@qq.com>
AuthorDate: Tue Aug 31 12:28:45 2021 +0800

    Revert CallbackServiceCodec for dev
---
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
index 7386d0f..deaeec9 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
@@ -16,7 +16,6 @@
  */
 package org.apache.dubbo.rpc.protocol.dubbo;
 
-import org.apache.dubbo.common.BaseServiceMetadata;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.bytecode.Wrapper;
 import org.apache.dubbo.common.extension.ExtensionLoader;
@@ -34,11 +33,7 @@ import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Protocol;
 import org.apache.dubbo.rpc.ProxyFactory;
 import org.apache.dubbo.rpc.RpcInvocation;
-import org.apache.dubbo.rpc.model.ModuleModel;
-import org.apache.dubbo.rpc.model.ProviderModel;
 import org.apache.dubbo.rpc.model.ScopeModelUtil;
-import org.apache.dubbo.rpc.model.ServiceDescriptor;
-import org.apache.dubbo.rpc.model.ServiceMetadata;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -98,7 +93,7 @@ class CallbackServiceCodec {
      * @throws IOException
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
-    private static String exportOrUnexportCallbackService(Channel channel, 
RpcInvocation inv, URL url, Class clazz, Object inst, Boolean export) throws 
IOException {
+    private static String exportOrUnexportCallbackService(Channel channel, URL 
url, Class clazz, Object inst, Boolean export) throws IOException {
         int instid = System.identityHashCode(inst);
 
         Map<String, String> params = new HashMap<>(3);
@@ -134,17 +129,7 @@ class CallbackServiceCodec {
             // one channel can have multiple callback instances, no need to 
re-export for different instance.
             if (!channel.hasAttribute(cacheKey)) {
                 if (!isInstancesOverLimit(channel, url, clazz.getName(), 
instid, false)) {
-                    ModuleModel moduleModel = 
inv.getServiceModel().getModuleModel();
-                    ServiceDescriptor serviceDescriptor = 
ScopeModelUtil.getApplicationModel(moduleModel).getApplicationServiceRepository().registerService(clazz);
-                    ProviderModel providerModel = new 
ProviderModel(BaseServiceMetadata.buildServiceKey(exportUrl.getPath(), group, 
exportUrl.getVersion()),
-                        inst,
-                        serviceDescriptor,
-                        moduleModel,
-                        null,
-                        new ServiceMetadata(clazz.getName() + "." + instid, 
exportUrl.getGroup(), exportUrl.getVersion(), clazz));
-                    
moduleModel.getApplicationModel().getApplicationServiceRepository().registerProvider(providerModel);
-                    exportUrl = exportUrl.setScopeModel(moduleModel);
-                    exportUrl = exportUrl.setServiceModel(providerModel);
+                    
ScopeModelUtil.getApplicationModel(url.getScopeModel()).getApplicationServiceRepository().registerService(clazz);
                     Invoker<?> invoker = PROXY_FACTORY.getInvoker(inst, clazz, 
exportUrl);
                     // should destroy resource?
                     Exporter<?> exporter = PROTOCOL.export(invoker);
@@ -291,10 +276,10 @@ class CallbackServiceCodec {
         Class<?>[] pts = inv.getParameterTypes();
         switch (callbackStatus) {
             case CallbackServiceCodec.CALLBACK_CREATE:
-                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, 
exportOrUnexportCallbackService(channel, inv,  url, pts[paraIndex], 
args[paraIndex], true));
+                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, 
exportOrUnexportCallbackService(channel, url, pts[paraIndex], args[paraIndex], 
true));
                 return null;
             case CallbackServiceCodec.CALLBACK_DESTROY:
-                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, 
exportOrUnexportCallbackService(channel, inv,  url, pts[paraIndex], 
args[paraIndex], false));
+                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, 
exportOrUnexportCallbackService(channel, url, pts[paraIndex], args[paraIndex], 
false));
                 return null;
             default:
                 return args[paraIndex];