From cbf61db971b581583b6e81cc60e27c3addc638f2 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Thu, 22 Jun 2023 15:35:21 +0800
Subject: [PATCH] Support get alibaba GenericService from spring context

---
 .../main/java/com/alibaba/dubbo/rpc/service/EchoService.java    | 0
 .../java/com/alibaba/dubbo/rpc/service/GenericException.java    | 0
 .../main/java/com/alibaba/dubbo/rpc/service/GenericService.java | 2 +-
 .../main/java/org/apache/dubbo/config/ReferenceConfigBase.java  | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {dubbo-rpc/dubbo-rpc-api => dubbo-common}/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java (100%)
 rename {dubbo-rpc/dubbo-rpc-api => dubbo-common}/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java (100%)
 rename {dubbo-rpc/dubbo-rpc-api => dubbo-common}/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java (93%)

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java b/dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
similarity index 100%
rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
rename to dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java b/dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
similarity index 100%
rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
rename to dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java b/dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
similarity index 93%
rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
rename to dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
index b63b60bd3e1..cc3282a7a08 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
+++ b/dubbo-common/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
@@ -22,5 +22,5 @@ public interface GenericService extends org.apache.dubbo.rpc.service.GenericServ
 
     @Override
     Object $invoke(String method, String[] parameterTypes, Object[] args)
-            throws com.alibaba.dubbo.rpc.service.GenericException;
+            throws GenericException;
 }
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
index 4b41ea2786d..e2115e5cde6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
@@ -227,7 +227,7 @@ public static Class<?> determineInterfaceClass(String generic, String interfaceN
 
     public static Class<?> determineInterfaceClass(String generic, String interfaceName, ClassLoader classLoader) {
         if (ProtocolUtils.isGeneric(generic)) {
-            return GenericService.class;
+            return com.alibaba.dubbo.rpc.service.GenericService.class;
         }
         try {
             if (StringUtils.isNotEmpty(interfaceName)) {