DUBBO-135

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1989 1a56cb94-b969-4eaa-88fa-be21384802f2

dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodec.java

@@ -98,10 +98,10 @@ public class ThriftCodec implements Codec {
             throws IOException {
 
         if ( message instanceof Request ) {
-            encodeRequest( output, ( Request ) message );
+            encodeRequest( channel, output, ( Request ) message );
         }
         else if ( message instanceof Response ) {
-            encodeResponse( output, ( Response ) message );
+            encodeResponse( channel, output, ( Response ) message );
         } else {
             throw new UnsupportedOperationException(
                     new StringBuilder( 32 )
@@ -184,7 +184,7 @@ public class ThriftCodec implements Codec {
             result.setMethodName( message.name );
 
             String argsClassName = ExtensionLoader.getExtensionLoader(ClassNameGenerator.class)
-                    .getDefaultExtension().generateArgsClassName( serviceName, message.name );
+                    .getExtension(ThriftClassNameGenerator.NAME).generateArgsClassName( serviceName, message.name );
 
             if ( StringUtils.isEmpty( argsClassName ) ) {
                 throw new RpcException( RpcException.SERIALIZATION_EXCEPTION,
@@ -295,7 +295,7 @@ public class ThriftCodec implements Codec {
         } else if ( message.type == TMessageType.REPLY ) {
 
             String resultClassName = ExtensionLoader.getExtensionLoader( ClassNameGenerator.class )
-                    .getDefaultExtension().generateResultClassName( serviceName, message.name );
+                    .getExtension(ThriftClassNameGenerator.NAME).generateResultClassName( serviceName, message.name );
 
             if ( StringUtils.isEmpty( resultClassName ) ) {
                 throw new IllegalArgumentException(
@@ -390,7 +390,7 @@ public class ThriftCodec implements Codec {
 
     }
 
-    private void encodeRequest( OutputStream output, Request request )
+    private void encodeRequest( Channel channel, OutputStream output, Request request )
             throws IOException {
 
         RpcInvocation inv = ( RpcInvocation ) request.getData();
@@ -413,7 +413,8 @@ public class ThriftCodec implements Codec {
                 seqId );
 
         String methodArgs = ExtensionLoader.getExtensionLoader( ClassNameGenerator.class )
-                .getDefaultExtension().generateArgsClassName( serviceName, inv.getMethodName() );
+            .getExtension(channel.getUrl().getParameter(ThriftConstants.CLASS_NAME_GENERATOR_KEY, ThriftClassNameGenerator.NAME))
+            .generateArgsClassName(serviceName, inv.getMethodName());
 
         if ( StringUtils.isEmpty( methodArgs ) ) {
             throw new RpcException( RpcException.SERIALIZATION_EXCEPTION,
@@ -529,15 +530,16 @@ public class ThriftCodec implements Codec {
 
     }
 
-    private void encodeResponse( OutputStream output, Response response )
+    private void encodeResponse( Channel channel, OutputStream output, Response response )
             throws IOException {
 
         RpcResult result = ( RpcResult ) response.getResult();
 
         RequestData rd = cachedRequest.get( response.getId() );
 
-        String resultClassName = ExtensionLoader.getExtensionLoader( ClassNameGenerator.class )
-                .getDefaultExtension().generateResultClassName( rd.serviceName, rd.methodName );
+        String resultClassName = ExtensionLoader.getExtensionLoader( ClassNameGenerator.class ).getExtension(
+                    channel.getUrl().getParameter(ThriftConstants.CLASS_NAME_GENERATOR_KEY, ThriftClassNameGenerator.NAME))
+                    .generateResultClassName(rd.serviceName, rd.methodName);
 
         if ( StringUtils.isEmpty( resultClassName ) ) {
             throw new RpcException( RpcException.SERIALIZATION_EXCEPTION,

dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftConstants.java

@@ -7,6 +7,7 @@ public final class ThriftConstants {
 
     public static final String THRIFT_PROTOCOL_KEY = "thrift.protocol";
     public static final String BINARY_THRIFT_PROTOCOL = "binary";
+    public static final String CLASS_NAME_GENERATOR_KEY = "class.name.generator";
     public static final String DEFAULT_PROTOCOL = BINARY_THRIFT_PROTOCOL;
     
     private ThriftConstants() {}

dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java

 package com.alibaba.dubbo.rpc.protocol.thrift.examples;
 
-import com.alibaba.dubbo.rpc.gen.dubbo.Demo;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import com.alibaba.dubbo.rpc.gen.thrift.Demo;
+
 /**
  * @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
  */
@@ -12,7 +13,7 @@ public class DubboDemoConsumer {
         ClassPathXmlApplicationContext context =
                 new ClassPathXmlApplicationContext("dubbo-demo-consumer.xml");
         context.start();
-        Demo demo = (Demo) context.getBean("demoService");
+        Demo.Iface demo = (Demo.Iface) context.getBean("demoService");
         System.out.println(demo.echoI32(32));
         for (int i = 0; i < 10; i++) {
             System.out.println(demo.echoI32(i + 1));

dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml

@@ -12,6 +12,6 @@
 
     <dubbo:protocol name="thrift" />
 
-    <dubbo:reference id="demoService" interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" timeout="1000000" />
+    <dubbo:reference id="demoService" interface="com.alibaba.dubbo.rpc.gen.thrift.Demo$Iface" timeout="1000000" />
 
 </beans>
\ No newline at end of file

dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml

@@ -12,8 +12,8 @@
 
     <dubbo:protocol id="thrift" name="thrift" />
 
-    <bean id="demoService" class="com.alibaba.dubbo.rpc.protocol.thrift.DubboDemoImpl"/>
+    <bean id="demoService" class="com.alibaba.dubbo.rpc.protocol.thrift.ThriftDemoImpl"/>
 
-    <dubbo:service protocol="thrift" interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" ref="demoService"/>
+    <dubbo:service protocol="thrift" interface="com.alibaba.dubbo.rpc.gen.thrift.Demo$Iface" ref="demoService"/>
 
 </beans>
\ No newline at end of file