Move implements to sub package. (sofastack#28)

core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/JavassistProxy.java → core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/javassist/JavassistProxy.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.javassist;
 
 import com.alipay.sofa.rpc.common.utils.ClassLoaderUtils;
 import com.alipay.sofa.rpc.common.utils.ClassTypeUtils;
@@ -28,6 +28,7 @@
 import com.alipay.sofa.rpc.log.Logger;
 import com.alipay.sofa.rpc.log.LoggerFactory;
 import com.alipay.sofa.rpc.message.MessageBuilder;
+import com.alipay.sofa.rpc.proxy.Proxy;
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtConstructor;

core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/UselessInvocationHandler.java → core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/javassist/UselessInvocationHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.javassist;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/JDKInvocationHandler.java → core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/jdk/JDKInvocationHandler.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.jdk;
 
 import com.alipay.sofa.rpc.core.exception.RpcErrorType;
 import com.alipay.sofa.rpc.core.exception.SofaRpcException;

core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/JDKProxy.java → core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/jdk/JDKProxy.java

@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.jdk;
 
 import com.alipay.sofa.rpc.common.utils.ClassLoaderUtils;
 import com.alipay.sofa.rpc.ext.Extension;
 import com.alipay.sofa.rpc.invoke.Invoker;
+import com.alipay.sofa.rpc.proxy.Proxy;
 
 import java.lang.reflect.InvocationHandler;
 

core-impl/proxy/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.proxy.Proxy

@@ -1,2 +1,2 @@
-jdk=com.alipay.sofa.rpc.proxy.JDKProxy
-javassist=com.alipay.sofa.rpc.proxy.JavassistProxy
+jdk=com.alipay.sofa.rpc.proxy.jdk.JDKProxy
+javassist=com.alipay.sofa.rpc.proxy.javassist.JavassistProxy

core-impl/proxy/src/test/java/com/alipay/sofa/rpc/proxy/JavassistProxyTest.java → core-impl/proxy/src/test/java/com/alipay/sofa/rpc/proxy/javassist/JavassistProxyTest.java

@@ -14,8 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.javassist;
 
+import com.alipay.sofa.rpc.proxy.AbstractTestClass;
+import com.alipay.sofa.rpc.proxy.TestInterface;
+import com.alipay.sofa.rpc.proxy.TestInvoker;
 import org.junit.Assert;
 import org.junit.Test;
 

core-impl/proxy/src/test/java/com/alipay/sofa/rpc/proxy/JDKProxyTest.java → core-impl/proxy/src/test/java/com/alipay/sofa/rpc/proxy/jdk/JDKProxyTest.java

@@ -14,8 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.proxy;
+package com.alipay.sofa.rpc.proxy.jdk;
 
+import com.alipay.sofa.rpc.proxy.AbstractTestClass;
+import com.alipay.sofa.rpc.proxy.TestInterface;
+import com.alipay.sofa.rpc.proxy.TestInvoker;
 import org.junit.Assert;
 import org.junit.Test;
 

example/src/test/java/com/alipay/sofa/rpc/asynchain/ServiceBImpl.java

@@ -16,9 +16,9 @@
  */
 package com.alipay.sofa.rpc.asynchain;
 
-import com.alipay.sofa.rpc.client.bolt.AsyncSofaResponseCallback;
 import com.alipay.sofa.rpc.context.RpcInvokeContext;
 import com.alipay.sofa.rpc.core.request.RequestBase;
+import com.alipay.sofa.rpc.message.bolt.BoltSendableResponseCallback;
 
 import java.util.Random;
 
@@ -39,7 +39,7 @@ public ServiceBImpl(ServiceC serviceC) {
 
     @Override
     public int getInt(int num) {
-        RpcInvokeContext.getContext().setResponseCallback(new AsyncSofaResponseCallback() {
+        RpcInvokeContext.getContext().setResponseCallback(new BoltSendableResponseCallback() {
             @Override
             public void onAppResponse(Object appResponse, String methodName, RequestBase request) {
                 // 此时C-异步返回->B

example/src/test/java/com/alipay/sofa/rpc/invoke/future/FutureClientMain.java

@@ -23,7 +23,7 @@
 import com.alipay.sofa.rpc.context.RpcRuntimeContext;
 import com.alipay.sofa.rpc.log.Logger;
 import com.alipay.sofa.rpc.log.LoggerFactory;
-import com.alipay.sofa.rpc.message.BoltResponseFuture;
+import com.alipay.sofa.rpc.message.bolt.BoltResponseFuture;
 import com.alipay.sofa.rpc.test.EchoService;
 import com.alipay.sofa.rpc.test.HelloService;
 

extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/BoltFutureInvokeCallback.java → extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/bolt/BoltFutureInvokeCallback.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.message;
+package com.alipay.sofa.rpc.message.bolt;
 
 import com.alipay.remoting.InvokeCallback;
 import com.alipay.sofa.rpc.client.ProviderInfo;

extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/BoltInvokerCallback.java → extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/bolt/BoltInvokerCallback.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.message;
+package com.alipay.sofa.rpc.message.bolt;
 
 import com.alipay.remoting.InvokeCallback;
 import com.alipay.sofa.rpc.client.ProviderInfo;

extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/BoltResponseFuture.java → extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/bolt/BoltResponseFuture.java

@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.message;
+package com.alipay.sofa.rpc.message.bolt;
 
 import com.alipay.sofa.rpc.context.RpcRuntimeContext;
 import com.alipay.sofa.rpc.core.invoke.SofaResponseCallback;
 import com.alipay.sofa.rpc.core.request.SofaRequest;
+import com.alipay.sofa.rpc.message.ResponseFuture;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/client/bolt/AsyncSofaResponseCallback.java → extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/message/bolt/BoltSendableResponseCallback.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.rpc.client.bolt;
+package com.alipay.sofa.rpc.message.bolt;
 
 import com.alipay.remoting.AsyncContext;
 import com.alipay.sofa.rpc.context.BaggageResolver;
@@ -35,7 +35,7 @@
  *
  * @author <a href="mailto:[email protected]">GengZhang</a>
  */
-public abstract class AsyncSofaResponseCallback<T> implements SendableResponseCallback<T> {
+public abstract class BoltSendableResponseCallback<T> implements SendableResponseCallback<T> {
 
     /**
      * 请求对应的上下文
@@ -52,7 +52,7 @@ public abstract class AsyncSofaResponseCallback<T> implements SendableResponseCa
      */
     private boolean        sent;
 
-    public AsyncSofaResponseCallback() {
+    public BoltSendableResponseCallback() {
         init();
     }
 

extension-impl/remoting-bolt/src/main/java/com/alipay/sofa/rpc/transport/bolt/BoltClientTransport.java

@@ -50,10 +50,10 @@
 import com.alipay.sofa.rpc.ext.Extension;
 import com.alipay.sofa.rpc.log.Logger;
 import com.alipay.sofa.rpc.log.LoggerFactory;
-import com.alipay.sofa.rpc.message.BoltFutureInvokeCallback;
-import com.alipay.sofa.rpc.message.BoltInvokerCallback;
-import com.alipay.sofa.rpc.message.BoltResponseFuture;
 import com.alipay.sofa.rpc.message.ResponseFuture;
+import com.alipay.sofa.rpc.message.bolt.BoltFutureInvokeCallback;
+import com.alipay.sofa.rpc.message.bolt.BoltInvokerCallback;
+import com.alipay.sofa.rpc.message.bolt.BoltResponseFuture;
 import com.alipay.sofa.rpc.transport.AbstractChannel;
 import com.alipay.sofa.rpc.transport.ClientTransport;
 import com.alipay.sofa.rpc.transport.ClientTransportConfig;

test/test-integration/src/test/java/com/alipay/sofa/rpc/test/async/AsyncHelloServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package com.alipay.sofa.rpc.test.async;
 
-import com.alipay.sofa.rpc.client.bolt.AsyncSofaResponseCallback;
+import com.alipay.sofa.rpc.message.bolt.BoltSendableResponseCallback;
 import com.alipay.sofa.rpc.context.RpcInvokeContext;
 import com.alipay.sofa.rpc.core.request.RequestBase;
 import com.alipay.sofa.rpc.log.Logger;
@@ -44,7 +44,7 @@ public String sayHello(String name, int age) {
         // 模拟A-->B-->C场景
         RpcInvokeContext context = RpcInvokeContext.getContext();
         context.setTimeout(2000);
-        context.setResponseCallback(new AsyncSofaResponseCallback() {
+        context.setResponseCallback(new BoltSendableResponseCallback() {
             @Override
             public void onAppResponse(Object appResponse, String methodName, RequestBase request) {
                 // 此时C-异步返回->B

test/test-integration/src/test/java/com/alipay/sofa/rpc/test/baggage/BAsyncChainSampleServiceImpl.java

@@ -16,9 +16,9 @@
  */
 package com.alipay.sofa.rpc.test.baggage;
 
-import com.alipay.sofa.rpc.client.bolt.AsyncSofaResponseCallback;
 import com.alipay.sofa.rpc.context.RpcInvokeContext;
 import com.alipay.sofa.rpc.core.request.RequestBase;
+import com.alipay.sofa.rpc.message.bolt.BoltSendableResponseCallback;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -50,7 +50,7 @@ public String hello() {
         context.putResponseBaggage("respBaggageB_useful1", "在返A之前写入有用");
         final CountDownLatch latch = new CountDownLatch(1);
         try {
-            RpcInvokeContext.getContext().setResponseCallback(new AsyncSofaResponseCallback() {
+            RpcInvokeContext.getContext().setResponseCallback(new BoltSendableResponseCallback() {
                 @Override
                 public void onAppResponse(Object appResponse, String methodName, RequestBase request) {
                     // 返回一定要写在这里

test/test-integration/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltConsumerBootstrapTest.java

@@ -24,7 +24,7 @@
 import com.alipay.sofa.rpc.config.ServerConfig;
 import com.alipay.sofa.rpc.core.exception.SofaRpcRuntimeException;
 import com.alipay.sofa.rpc.invoke.Invoker;
-import com.alipay.sofa.rpc.proxy.JDKProxy;
+import com.alipay.sofa.rpc.proxy.jdk.JDKProxy;
 import com.alipay.sofa.rpc.test.ActivelyDestroyTest;
 import com.alipay.sofa.rpc.test.HelloService;
 import com.alipay.sofa.rpc.test.HelloServiceImpl;

test/test-integration/src/test/java/com/alipay/sofa/rpc/test/bootstrap/bolt/BoltProviderBootstrapTest.java

@@ -23,7 +23,7 @@
 import com.alipay.sofa.rpc.config.ServerConfig;
 import com.alipay.sofa.rpc.core.exception.SofaRpcRuntimeException;
 import com.alipay.sofa.rpc.invoke.Invoker;
-import com.alipay.sofa.rpc.proxy.JDKProxy;
+import com.alipay.sofa.rpc.proxy.jdk.JDKProxy;
 import com.alipay.sofa.rpc.test.ActivelyDestroyTest;
 import com.alipay.sofa.rpc.test.HelloService;
 import com.alipay.sofa.rpc.test.HelloServiceImpl;