Add functional test.

7 files changed, 661 insertions, 276 deletions

diff --git a/build_protobufs.sh b/build_protobufs.sh
index 59136c6..fd1e2d1 100755
--- a/build_protobufs.sh
+++ b/build_protobufs.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
 
+find src/test/java -name '*.proto' -exec \
+    protoc {} --java_out=src/test/java \;
+
 find src/main/java -name '*.proto' -exec \
     protoc {} --java_out=src/main/java \;
diff --git a/src/main/java/com/orbekk/protobuf/SimpleProtobufClient.java b/src/main/java/com/orbekk/protobuf/SimpleProtobufClient.java
index b17c0bc..7d0dc6a 100644
--- a/src/main/java/com/orbekk/protobuf/SimpleProtobufClient.java
+++ b/src/main/java/com/orbekk/protobuf/SimpleProtobufClient.java
@@ -9,31 +9,31 @@ public class SimpleProtobufClient {
     static final Logger logger =
             Logger.getLogger(SimpleProtobufClient.class.getName());
 
-    public void run() {
-        RpcChannel channel = RpcChannel.create("localhost", 10000);
-        Test.TestService test = Test.TestService.newStub(channel);
-        Test.TestRequest request = Test.TestRequest.newBuilder()
-                .setId("Hello!")
-                .build();
-        int count = 10;
-        final CountDownLatch stop = new CountDownLatch(count);
-        for (int i = 0; i < count; i++) {
-            logger.info("Sending request.");
-            test.run(null, request, new RpcCallback<Test.TestResponse>() {
-                @Override public void run(Test.TestResponse response) {
-                    System.out.println("Response from server: " + response);
-                    stop.countDown();
-                }
-            });
-        }
-        try {
-            stop.await();
-        } catch (InterruptedException e) {
-            // Stop waiting.
-        }
-    }
-
-    public static void main(String[] args) {
-        new SimpleProtobufClient().run();
-    }
+//    public void run() {
+//        RpcChannel channel = RpcChannel.create("localhost", 10000);
+//        Test.TestService test = Test.TestService.newStub(channel);
+//        Test.TestRequest request = Test.TestRequest.newBuilder()
+//                .setId("Hello!")
+//                .build();
+//        int count = 10;
+//        final CountDownLatch stop = new CountDownLatch(count);
+//        for (int i = 0; i < count; i++) {
+//            logger.info("Sending request.");
+//            test.run(null, request, new RpcCallback<Test.TestResponse>() {
+//                @Override public void run(Test.TestResponse response) {
+//                    System.out.println("Response from server: " + response);
+//                    stop.countDown();
+//                }
+//            });
+//        }
+//        try {
+//            stop.await();
+//        } catch (InterruptedException e) {
+//            // Stop waiting.
+//        }
+//    }
+//
+//    public static void main(String[] args) {
+//        new SimpleProtobufClient().run();
+//    }
 }
diff --git a/src/main/java/com/orbekk/protobuf/SimpleProtobufServer.java b/src/main/java/com/orbekk/protobuf/SimpleProtobufServer.java
index a6dd7c4..690da81 100644
--- a/src/main/java/com/orbekk/protobuf/SimpleProtobufServer.java
+++ b/src/main/java/com/orbekk/protobuf/SimpleProtobufServer.java
@@ -39,6 +39,10 @@ public class SimpleProtobufServer extends Thread {
     public SimpleProtobufServer(ServerSocket serverSocket) {
         this.serverSocket = serverSocket;
     }
+    
+    public int getPort() {
+        return serverSocket.getLocalPort();
+    }
 
     public synchronized void registerService(Service service) {
         String serviceName = service.getDescriptorForType().getFullName();
@@ -120,24 +124,24 @@ public class SimpleProtobufServer extends Thread {
         }
     }
 
-    public static void main(String[] args) {
-        SimpleProtobufServer server = SimpleProtobufServer.create(10000);
-        Test.TestService testService = new Test.TestService() {
-            @Override public void run(RpcController controller,
-                    Test.TestRequest request,
-                    RpcCallback<Test.TestResponse> done) {
-                System.out.println("Hello from TestService!");
-                done.run(Test.TestResponse.newBuilder()
-                        .setId("Hello from server.")
-                        .build());
-            }
-        };
-        server.registerService(testService);
-        server.start();
-        try {
-            server.join();
-        } catch (InterruptedException e) {
-            System.out.println("Stopped.");
-        }
-    }
+//    public static void main(String[] args) {
+//        SimpleProtobufServer server = SimpleProtobufServer.create(10000);
+//        Test.TestService testService = new Test.TestService() {
+//            @Override public void run(RpcController controller,
+//                    Test.TestRequest request,
+//                    RpcCallback<Test.TestResponse> done) {
+//                System.out.println("Hello from TestService!");
+//                done.run(Test.TestResponse.newBuilder()
+//                        .setId("Hello from server.")
+//                        .build());
+//            }
+//        };
+//        server.registerService(testService);
+//        server.start();
+//        try {
+//            server.join();
+//        } catch (InterruptedException e) {
+//            System.out.println("Stopped.");
+//        }
+//    }
 }
diff --git a/src/main/java/com/orbekk/protobuf/Test.proto b/src/main/java/com/orbekk/protobuf/Test.proto
deleted file mode 100644
index 3abb507..0000000
--- a/src/main/java/com/orbekk/protobuf/Test.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.orbekk.protobuf;
-
-option java_generic_services = true;
-
-message TestRequest {
-    optional string id = 1;
-}
-
-message TestResponse {
-    optional string id = 1;
-}
-
-service TestService {
-    rpc Run (TestRequest) returns (TestResponse);
-}
diff --git a/src/test/java/com/orbekk/protobuf/ProtobufFunctionalTest.java b/src/test/java/com/orbekk/protobuf/ProtobufFunctionalTest.java
new file mode 100644
index 0000000..d60a016
--- /dev/null
+++ b/src/test/java/com/orbekk/protobuf/ProtobufFunctionalTest.java
@@ -0,0 +1,68 @@
+package com.orbekk.protobuf;
+
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Before;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import com.google.protobuf.RpcCallback;
+import com.google.protobuf.RpcController;
+import com.orbekk.protobuf.Test.Type1;
+import com.orbekk.protobuf.Test.Type2;
+
+public class ProtobufFunctionalTest {
+    CountDownLatch returnC = new CountDownLatch(1);
+    SimpleProtobufServer server = SimpleProtobufServer.create(0);
+    int serverport = server.getPort();
+    RpcChannel channel = RpcChannel.create("localhost", serverport);
+    TestService directService = new TestService();
+    Test.Service service = Test.Service.newStub(channel);
+    
+    @Before public void setUp() {
+        server.registerService(directService);
+    }
+    
+    public class TestService extends Test.Service {
+        @Override
+        public void testA(RpcController controller, Type1 request,
+                RpcCallback<Type2> done) {
+            Type2 response = Type2.newBuilder()
+                    .setMessage("TestA")
+                    .build();
+            done.run(response);
+        }
+
+        @Override
+        public void testB(RpcController controller, Type1 request,
+                RpcCallback<Type2> done) {
+            controller.setFailed("error");
+        }
+
+        @Override
+        public void testC(RpcController controller, Type1 request,
+                RpcCallback<Type2> done) {
+            try {
+                returnC.await();
+            } catch (InterruptedException e) {
+            }
+            Type2 response = Type2.newBuilder()
+                    .setResult(request.getA() + request.getB())
+                    .setMessage("TestC result")
+                    .build();
+            done.run(response);
+        }
+    }
+    
+    @org.junit.Test public void respondsNormally() {
+        Test.Type1 request = Test.Type1.newBuilder().build();
+        int count = 10;
+        final CountDownLatch stop = new CountDownLatch(count);
+        service.testA(null, request, new RpcCallback<Type2>() {
+            @Override public void run(Type2 result) {
+                assertThat(result.getMessage(), is("TestA"));
+                stop.countDown();
+            }
+        });
+    }
+}
diff --git a/src/main/java/com/orbekk/protobuf/Test.java b/src/test/java/com/orbekk/protobuf/Test.java
index f1be1a9..3fe8efb 100644
--- a/src/main/java/com/orbekk/protobuf/Test.java
+++ b/src/test/java/com/orbekk/protobuf/Test.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: src/main/java/com/orbekk/protobuf/Test.proto
+// source: src/test/java/com/orbekk/protobuf/Test.proto
 
 package com.orbekk.protobuf;
 
@@ -8,50 +8,78 @@ public final class Test {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public interface TestRequestOrBuilder
+  public interface Type1OrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // optional string id = 1;
-    boolean hasId();
-    String getId();
+    // optional int32 a = 1;
+    boolean hasA();
+    int getA();
+    
+    // optional int32 b = 2;
+    boolean hasB();
+    int getB();
+    
+    // optional string message = 3;
+    boolean hasMessage();
+    String getMessage();
   }
-  public static final class TestRequest extends
+  public static final class Type1 extends
       com.google.protobuf.GeneratedMessage
-      implements TestRequestOrBuilder {
-    // Use TestRequest.newBuilder() to construct.
-    private TestRequest(Builder builder) {
+      implements Type1OrBuilder {
+    // Use Type1.newBuilder() to construct.
+    private Type1(Builder builder) {
       super(builder);
     }
-    private TestRequest(boolean noInit) {}
+    private Type1(boolean noInit) {}
     
-    private static final TestRequest defaultInstance;
-    public static TestRequest getDefaultInstance() {
+    private static final Type1 defaultInstance;
+    public static Type1 getDefaultInstance() {
       return defaultInstance;
     }
     
-    public TestRequest getDefaultInstanceForType() {
+    public Type1 getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestRequest_descriptor;
+      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type1_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestRequest_fieldAccessorTable;
+      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type1_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // optional string id = 1;
-    public static final int ID_FIELD_NUMBER = 1;
-    private java.lang.Object id_;
-    public boolean hasId() {
+    // optional int32 a = 1;
+    public static final int A_FIELD_NUMBER = 1;
+    private int a_;
+    public boolean hasA() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getId() {
-      java.lang.Object ref = id_;
+    public int getA() {
+      return a_;
+    }
+    
+    // optional int32 b = 2;
+    public static final int B_FIELD_NUMBER = 2;
+    private int b_;
+    public boolean hasB() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    public int getB() {
+      return b_;
+    }
+    
+    // optional string message = 3;
+    public static final int MESSAGE_FIELD_NUMBER = 3;
+    private java.lang.Object message_;
+    public boolean hasMessage() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    public String getMessage() {
+      java.lang.Object ref = message_;
       if (ref instanceof String) {
         return (String) ref;
       } else {
@@ -59,17 +87,17 @@ public final class Test {
             (com.google.protobuf.ByteString) ref;
         String s = bs.toStringUtf8();
         if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          id_ = s;
+          message_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getIdBytes() {
-      java.lang.Object ref = id_;
+    private com.google.protobuf.ByteString getMessageBytes() {
+      java.lang.Object ref = message_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        id_ = b;
+        message_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -77,7 +105,9 @@ public final class Test {
     }
     
     private void initFields() {
-      id_ = "";
+      a_ = 0;
+      b_ = 0;
+      message_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -92,7 +122,13 @@ public final class Test {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getIdBytes());
+        output.writeInt32(1, a_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeInt32(2, b_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, getMessageBytes());
       }
       getUnknownFields().writeTo(output);
     }
@@ -105,7 +141,15 @@ public final class Test {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getIdBytes());
+          .computeInt32Size(1, a_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, b_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getMessageBytes());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -119,41 +163,41 @@ public final class Test {
       return super.writeReplace();
     }
     
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(byte[] data)
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(java.io.InputStream input)
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseDelimitedFrom(java.io.InputStream input)
+    public static com.orbekk.protobuf.Test.Type1 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -162,7 +206,7 @@ public final class Test {
         return null;
       }
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseDelimitedFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -173,12 +217,12 @@ public final class Test {
         return null;
       }
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestRequest parseFrom(
+    public static com.orbekk.protobuf.Test.Type1 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -188,7 +232,7 @@ public final class Test {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.orbekk.protobuf.Test.TestRequest prototype) {
+    public static Builder newBuilder(com.orbekk.protobuf.Test.Type1 prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -201,18 +245,18 @@ public final class Test {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.orbekk.protobuf.Test.TestRequestOrBuilder {
+       implements com.orbekk.protobuf.Test.Type1OrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestRequest_descriptor;
+        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type1_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestRequest_fieldAccessorTable;
+        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type1_fieldAccessorTable;
       }
       
-      // Construct using com.orbekk.protobuf.Test.TestRequest.newBuilder()
+      // Construct using com.orbekk.protobuf.Test.Type1.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -231,8 +275,12 @@ public final class Test {
       
       public Builder clear() {
         super.clear();
-        id_ = "";
+        a_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
+        b_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        message_ = "";
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
       
@@ -242,24 +290,24 @@ public final class Test {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.orbekk.protobuf.Test.TestRequest.getDescriptor();
+        return com.orbekk.protobuf.Test.Type1.getDescriptor();
       }
       
-      public com.orbekk.protobuf.Test.TestRequest getDefaultInstanceForType() {
-        return com.orbekk.protobuf.Test.TestRequest.getDefaultInstance();
+      public com.orbekk.protobuf.Test.Type1 getDefaultInstanceForType() {
+        return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
       }
       
-      public com.orbekk.protobuf.Test.TestRequest build() {
-        com.orbekk.protobuf.Test.TestRequest result = buildPartial();
+      public com.orbekk.protobuf.Test.Type1 build() {
+        com.orbekk.protobuf.Test.Type1 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private com.orbekk.protobuf.Test.TestRequest buildParsed()
+      private com.orbekk.protobuf.Test.Type1 buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        com.orbekk.protobuf.Test.TestRequest result = buildPartial();
+        com.orbekk.protobuf.Test.Type1 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -267,32 +315,46 @@ public final class Test {
         return result;
       }
       
-      public com.orbekk.protobuf.Test.TestRequest buildPartial() {
-        com.orbekk.protobuf.Test.TestRequest result = new com.orbekk.protobuf.Test.TestRequest(this);
+      public com.orbekk.protobuf.Test.Type1 buildPartial() {
+        com.orbekk.protobuf.Test.Type1 result = new com.orbekk.protobuf.Test.Type1(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.id_ = id_;
+        result.a_ = a_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.b_ = b_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.message_ = message_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.orbekk.protobuf.Test.TestRequest) {
-          return mergeFrom((com.orbekk.protobuf.Test.TestRequest)other);
+        if (other instanceof com.orbekk.protobuf.Test.Type1) {
+          return mergeFrom((com.orbekk.protobuf.Test.Type1)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(com.orbekk.protobuf.Test.TestRequest other) {
-        if (other == com.orbekk.protobuf.Test.TestRequest.getDefaultInstance()) return this;
-        if (other.hasId()) {
-          setId(other.getId());
+      public Builder mergeFrom(com.orbekk.protobuf.Test.Type1 other) {
+        if (other == com.orbekk.protobuf.Test.Type1.getDefaultInstance()) return this;
+        if (other.hasA()) {
+          setA(other.getA());
+        }
+        if (other.hasB()) {
+          setB(other.getB());
+        }
+        if (other.hasMessage()) {
+          setMessage(other.getMessage());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -325,9 +387,19 @@ public final class Test {
               }
               break;
             }
-            case 10: {
+            case 8: {
               bitField0_ |= 0x00000001;
-              id_ = input.readBytes();
+              a_ = input.readInt32();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              b_ = input.readInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              message_ = input.readBytes();
               break;
             }
           }
@@ -336,97 +408,153 @@ public final class Test {
       
       private int bitField0_;
       
-      // optional string id = 1;
-      private java.lang.Object id_ = "";
-      public boolean hasId() {
+      // optional int32 a = 1;
+      private int a_ ;
+      public boolean hasA() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getId() {
-        java.lang.Object ref = id_;
+      public int getA() {
+        return a_;
+      }
+      public Builder setA(int value) {
+        bitField0_ |= 0x00000001;
+        a_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearA() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        a_ = 0;
+        onChanged();
+        return this;
+      }
+      
+      // optional int32 b = 2;
+      private int b_ ;
+      public boolean hasB() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      public int getB() {
+        return b_;
+      }
+      public Builder setB(int value) {
+        bitField0_ |= 0x00000002;
+        b_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearB() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        b_ = 0;
+        onChanged();
+        return this;
+      }
+      
+      // optional string message = 3;
+      private java.lang.Object message_ = "";
+      public boolean hasMessage() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      public String getMessage() {
+        java.lang.Object ref = message_;
         if (!(ref instanceof String)) {
           String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          id_ = s;
+          message_ = s;
           return s;
         } else {
           return (String) ref;
         }
       }
-      public Builder setId(String value) {
+      public Builder setMessage(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000001;
-        id_ = value;
+  bitField0_ |= 0x00000004;
+        message_ = value;
         onChanged();
         return this;
       }
-      public Builder clearId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        id_ = getDefaultInstance().getId();
+      public Builder clearMessage() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        message_ = getDefaultInstance().getMessage();
         onChanged();
         return this;
       }
-      void setId(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        id_ = value;
+      void setMessage(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000004;
+        message_ = value;
         onChanged();
       }
       
-      // @@protoc_insertion_point(builder_scope:com.orbekk.protobuf.TestRequest)
+      // @@protoc_insertion_point(builder_scope:com.orbekk.protobuf.Type1)
     }
     
     static {
-      defaultInstance = new TestRequest(true);
+      defaultInstance = new Type1(true);
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:com.orbekk.protobuf.TestRequest)
+    // @@protoc_insertion_point(class_scope:com.orbekk.protobuf.Type1)
   }
   
-  public interface TestResponseOrBuilder
+  public interface Type2OrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // optional string id = 1;
-    boolean hasId();
-    String getId();
+    // optional int32 result = 1;
+    boolean hasResult();
+    int getResult();
+    
+    // optional string message = 2;
+    boolean hasMessage();
+    String getMessage();
   }
-  public static final class TestResponse extends
+  public static final class Type2 extends
       com.google.protobuf.GeneratedMessage
-      implements TestResponseOrBuilder {
-    // Use TestResponse.newBuilder() to construct.
-    private TestResponse(Builder builder) {
+      implements Type2OrBuilder {
+    // Use Type2.newBuilder() to construct.
+    private Type2(Builder builder) {
       super(builder);
     }
-    private TestResponse(boolean noInit) {}
+    private Type2(boolean noInit) {}
     
-    private static final TestResponse defaultInstance;
-    public static TestResponse getDefaultInstance() {
+    private static final Type2 defaultInstance;
+    public static Type2 getDefaultInstance() {
       return defaultInstance;
     }
     
-    public TestResponse getDefaultInstanceForType() {
+    public Type2 getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestResponse_descriptor;
+      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type2_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestResponse_fieldAccessorTable;
+      return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type2_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // optional string id = 1;
-    public static final int ID_FIELD_NUMBER = 1;
-    private java.lang.Object id_;
-    public boolean hasId() {
+    // optional int32 result = 1;
+    public static final int RESULT_FIELD_NUMBER = 1;
+    private int result_;
+    public boolean hasResult() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getId() {
-      java.lang.Object ref = id_;
+    public int getResult() {
+      return result_;
+    }
+    
+    // optional string message = 2;
+    public static final int MESSAGE_FIELD_NUMBER = 2;
+    private java.lang.Object message_;
+    public boolean hasMessage() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    public String getMessage() {
+      java.lang.Object ref = message_;
       if (ref instanceof String) {
         return (String) ref;
       } else {
@@ -434,17 +562,17 @@ public final class Test {
             (com.google.protobuf.ByteString) ref;
         String s = bs.toStringUtf8();
         if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          id_ = s;
+          message_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getIdBytes() {
-      java.lang.Object ref = id_;
+    private com.google.protobuf.ByteString getMessageBytes() {
+      java.lang.Object ref = message_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        id_ = b;
+        message_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -452,7 +580,8 @@ public final class Test {
     }
     
     private void initFields() {
-      id_ = "";
+      result_ = 0;
+      message_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -467,7 +596,10 @@ public final class Test {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getIdBytes());
+        output.writeInt32(1, result_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(2, getMessageBytes());
       }
       getUnknownFields().writeTo(output);
     }
@@ -480,7 +612,11 @@ public final class Test {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getIdBytes());
+          .computeInt32Size(1, result_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, getMessageBytes());
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -494,41 +630,41 @@ public final class Test {
       return super.writeReplace();
     }
     
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(byte[] data)
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(java.io.InputStream input)
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseDelimitedFrom(java.io.InputStream input)
+    public static com.orbekk.protobuf.Test.Type2 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -537,7 +673,7 @@ public final class Test {
         return null;
       }
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseDelimitedFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -548,12 +684,12 @@ public final class Test {
         return null;
       }
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.orbekk.protobuf.Test.TestResponse parseFrom(
+    public static com.orbekk.protobuf.Test.Type2 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -563,7 +699,7 @@ public final class Test {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.orbekk.protobuf.Test.TestResponse prototype) {
+    public static Builder newBuilder(com.orbekk.protobuf.Test.Type2 prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -576,18 +712,18 @@ public final class Test {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements com.orbekk.protobuf.Test.TestResponseOrBuilder {
+       implements com.orbekk.protobuf.Test.Type2OrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestResponse_descriptor;
+        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type2_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_TestResponse_fieldAccessorTable;
+        return com.orbekk.protobuf.Test.internal_static_com_orbekk_protobuf_Type2_fieldAccessorTable;
       }
       
-      // Construct using com.orbekk.protobuf.Test.TestResponse.newBuilder()
+      // Construct using com.orbekk.protobuf.Test.Type2.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -606,8 +742,10 @@ public final class Test {
       
       public Builder clear() {
         super.clear();
-        id_ = "";
+        result_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
+        message_ = "";
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
       
@@ -617,24 +755,24 @@ public final class Test {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return com.orbekk.protobuf.Test.TestResponse.getDescriptor();
+        return com.orbekk.protobuf.Test.Type2.getDescriptor();
       }
       
-      public com.orbekk.protobuf.Test.TestResponse getDefaultInstanceForType() {
-        return com.orbekk.protobuf.Test.TestResponse.getDefaultInstance();
+      public com.orbekk.protobuf.Test.Type2 getDefaultInstanceForType() {
+        return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
       }
       
-      public com.orbekk.protobuf.Test.TestResponse build() {
-        com.orbekk.protobuf.Test.TestResponse result = buildPartial();
+      public com.orbekk.protobuf.Test.Type2 build() {
+        com.orbekk.protobuf.Test.Type2 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private com.orbekk.protobuf.Test.TestResponse buildParsed()
+      private com.orbekk.protobuf.Test.Type2 buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        com.orbekk.protobuf.Test.TestResponse result = buildPartial();
+        com.orbekk.protobuf.Test.Type2 result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -642,32 +780,39 @@ public final class Test {
         return result;
       }
       
-      public com.orbekk.protobuf.Test.TestResponse buildPartial() {
-        com.orbekk.protobuf.Test.TestResponse result = new com.orbekk.protobuf.Test.TestResponse(this);
+      public com.orbekk.protobuf.Test.Type2 buildPartial() {
+        com.orbekk.protobuf.Test.Type2 result = new com.orbekk.protobuf.Test.Type2(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.id_ = id_;
+        result.result_ = result_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.message_ = message_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.orbekk.protobuf.Test.TestResponse) {
-          return mergeFrom((com.orbekk.protobuf.Test.TestResponse)other);
+        if (other instanceof com.orbekk.protobuf.Test.Type2) {
+          return mergeFrom((com.orbekk.protobuf.Test.Type2)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(com.orbekk.protobuf.Test.TestResponse other) {
-        if (other == com.orbekk.protobuf.Test.TestResponse.getDefaultInstance()) return this;
-        if (other.hasId()) {
-          setId(other.getId());
+      public Builder mergeFrom(com.orbekk.protobuf.Test.Type2 other) {
+        if (other == com.orbekk.protobuf.Test.Type2.getDefaultInstance()) return this;
+        if (other.hasResult()) {
+          setResult(other.getResult());
+        }
+        if (other.hasMessage()) {
+          setMessage(other.getMessage());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -700,9 +845,14 @@ public final class Test {
               }
               break;
             }
-            case 10: {
+            case 8: {
               bitField0_ |= 0x00000001;
-              id_ = input.readBytes();
+              result_ = input.readInt32();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              message_ = input.readBytes();
               break;
             }
           }
@@ -711,74 +861,121 @@ public final class Test {
       
       private int bitField0_;
       
-      // optional string id = 1;
-      private java.lang.Object id_ = "";
-      public boolean hasId() {
+      // optional int32 result = 1;
+      private int result_ ;
+      public boolean hasResult() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getId() {
-        java.lang.Object ref = id_;
+      public int getResult() {
+        return result_;
+      }
+      public Builder setResult(int value) {
+        bitField0_ |= 0x00000001;
+        result_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearResult() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        result_ = 0;
+        onChanged();
+        return this;
+      }
+      
+      // optional string message = 2;
+      private java.lang.Object message_ = "";
+      public boolean hasMessage() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      public String getMessage() {
+        java.lang.Object ref = message_;
         if (!(ref instanceof String)) {
           String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          id_ = s;
+          message_ = s;
           return s;
         } else {
           return (String) ref;
         }
       }
-      public Builder setId(String value) {
+      public Builder setMessage(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000001;
-        id_ = value;
+  bitField0_ |= 0x00000002;
+        message_ = value;
         onChanged();
         return this;
       }
-      public Builder clearId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        id_ = getDefaultInstance().getId();
+      public Builder clearMessage() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        message_ = getDefaultInstance().getMessage();
         onChanged();
         return this;
       }
-      void setId(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        id_ = value;
+      void setMessage(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000002;
+        message_ = value;
         onChanged();
       }
       
-      // @@protoc_insertion_point(builder_scope:com.orbekk.protobuf.TestResponse)
+      // @@protoc_insertion_point(builder_scope:com.orbekk.protobuf.Type2)
     }
     
     static {
-      defaultInstance = new TestResponse(true);
+      defaultInstance = new Type2(true);
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:com.orbekk.protobuf.TestResponse)
+    // @@protoc_insertion_point(class_scope:com.orbekk.protobuf.Type2)
   }
   
-  public static abstract class TestService
+  public static abstract class Service
       implements com.google.protobuf.Service {
-    protected TestService() {}
+    protected Service() {}
     
     public interface Interface {
-      public abstract void run(
+      public abstract void testA(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
+      
+      public abstract void testB(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
+      
+      public abstract void testC(
           com.google.protobuf.RpcController controller,
-          com.orbekk.protobuf.Test.TestRequest request,
-          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.TestResponse> done);
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
       
     }
     
     public static com.google.protobuf.Service newReflectiveService(
         final Interface impl) {
-      return new TestService() {
+      return new Service() {
+        @java.lang.Override
+        public  void testA(
+            com.google.protobuf.RpcController controller,
+            com.orbekk.protobuf.Test.Type1 request,
+            com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
+          impl.testA(controller, request, done);
+        }
+        
         @java.lang.Override
-        public  void run(
+        public  void testB(
             com.google.protobuf.RpcController controller,
-            com.orbekk.protobuf.Test.TestRequest request,
-            com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.TestResponse> done) {
-          impl.run(controller, request, done);
+            com.orbekk.protobuf.Test.Type1 request,
+            com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
+          impl.testB(controller, request, done);
+        }
+        
+        @java.lang.Override
+        public  void testC(
+            com.google.protobuf.RpcController controller,
+            com.orbekk.protobuf.Test.Type1 request,
+            com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
+          impl.testC(controller, request, done);
         }
         
       };
@@ -804,7 +1001,11 @@ public final class Test {
           }
           switch(method.getIndex()) {
             case 0:
-              return impl.run(controller, (com.orbekk.protobuf.Test.TestRequest)request);
+              return impl.testA(controller, (com.orbekk.protobuf.Test.Type1)request);
+            case 1:
+              return impl.testB(controller, (com.orbekk.protobuf.Test.Type1)request);
+            case 2:
+              return impl.testC(controller, (com.orbekk.protobuf.Test.Type1)request);
             default:
               throw new java.lang.AssertionError("Can't get here.");
           }
@@ -820,7 +1021,11 @@ public final class Test {
           }
           switch(method.getIndex()) {
             case 0:
-              return com.orbekk.protobuf.Test.TestRequest.getDefaultInstance();
+              return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
+            case 1:
+              return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
+            case 2:
+              return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
             default:
               throw new java.lang.AssertionError("Can't get here.");
           }
@@ -836,7 +1041,11 @@ public final class Test {
           }
           switch(method.getIndex()) {
             case 0:
-              return com.orbekk.protobuf.Test.TestResponse.getDefaultInstance();
+              return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
+            case 1:
+              return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
+            case 2:
+              return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
             default:
               throw new java.lang.AssertionError("Can't get here.");
           }
@@ -845,10 +1054,20 @@ public final class Test {
       };
     }
     
-    public abstract void run(
+    public abstract void testA(
+        com.google.protobuf.RpcController controller,
+        com.orbekk.protobuf.Test.Type1 request,
+        com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
+    
+    public abstract void testB(
+        com.google.protobuf.RpcController controller,
+        com.orbekk.protobuf.Test.Type1 request,
+        com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
+    
+    public abstract void testC(
         com.google.protobuf.RpcController controller,
-        com.orbekk.protobuf.Test.TestRequest request,
-        com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.TestResponse> done);
+        com.orbekk.protobuf.Test.Type1 request,
+        com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done);
     
     public static final
         com.google.protobuf.Descriptors.ServiceDescriptor
@@ -873,8 +1092,18 @@ public final class Test {
       }
       switch(method.getIndex()) {
         case 0:
-          this.run(controller, (com.orbekk.protobuf.Test.TestRequest)request,
-            com.google.protobuf.RpcUtil.<com.orbekk.protobuf.Test.TestResponse>specializeCallback(
+          this.testA(controller, (com.orbekk.protobuf.Test.Type1)request,
+            com.google.protobuf.RpcUtil.<com.orbekk.protobuf.Test.Type2>specializeCallback(
+              done));
+          return;
+        case 1:
+          this.testB(controller, (com.orbekk.protobuf.Test.Type1)request,
+            com.google.protobuf.RpcUtil.<com.orbekk.protobuf.Test.Type2>specializeCallback(
+              done));
+          return;
+        case 2:
+          this.testC(controller, (com.orbekk.protobuf.Test.Type1)request,
+            com.google.protobuf.RpcUtil.<com.orbekk.protobuf.Test.Type2>specializeCallback(
               done));
           return;
         default:
@@ -892,7 +1121,11 @@ public final class Test {
       }
       switch(method.getIndex()) {
         case 0:
-          return com.orbekk.protobuf.Test.TestRequest.getDefaultInstance();
+          return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
+        case 1:
+          return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
+        case 2:
+          return com.orbekk.protobuf.Test.Type1.getDefaultInstance();
         default:
           throw new java.lang.AssertionError("Can't get here.");
       }
@@ -908,7 +1141,11 @@ public final class Test {
       }
       switch(method.getIndex()) {
         case 0:
-          return com.orbekk.protobuf.Test.TestResponse.getDefaultInstance();
+          return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
+        case 1:
+          return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
+        case 2:
+          return com.orbekk.protobuf.Test.Type2.getDefaultInstance();
         default:
           throw new java.lang.AssertionError("Can't get here.");
       }
@@ -919,7 +1156,7 @@ public final class Test {
       return new Stub(channel);
     }
     
-    public static final class Stub extends com.orbekk.protobuf.Test.TestService implements Interface {
+    public static final class Stub extends com.orbekk.protobuf.Test.Service implements Interface {
       private Stub(com.google.protobuf.RpcChannel channel) {
         this.channel = channel;
       }
@@ -930,19 +1167,49 @@ public final class Test {
         return channel;
       }
       
-      public  void run(
+      public  void testA(
           com.google.protobuf.RpcController controller,
-          com.orbekk.protobuf.Test.TestRequest request,
-          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.TestResponse> done) {
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
         channel.callMethod(
           getDescriptor().getMethods().get(0),
           controller,
           request,
-          com.orbekk.protobuf.Test.TestResponse.getDefaultInstance(),
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance(),
           com.google.protobuf.RpcUtil.generalizeCallback(
             done,
-            com.orbekk.protobuf.Test.TestResponse.class,
-            com.orbekk.protobuf.Test.TestResponse.getDefaultInstance()));
+            com.orbekk.protobuf.Test.Type2.class,
+            com.orbekk.protobuf.Test.Type2.getDefaultInstance()));
+      }
+      
+      public  void testB(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
+        channel.callMethod(
+          getDescriptor().getMethods().get(1),
+          controller,
+          request,
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance(),
+          com.google.protobuf.RpcUtil.generalizeCallback(
+            done,
+            com.orbekk.protobuf.Test.Type2.class,
+            com.orbekk.protobuf.Test.Type2.getDefaultInstance()));
+      }
+      
+      public  void testC(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request,
+          com.google.protobuf.RpcCallback<com.orbekk.protobuf.Test.Type2> done) {
+        channel.callMethod(
+          getDescriptor().getMethods().get(2),
+          controller,
+          request,
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance(),
+          com.google.protobuf.RpcUtil.generalizeCallback(
+            done,
+            com.orbekk.protobuf.Test.Type2.class,
+            com.orbekk.protobuf.Test.Type2.getDefaultInstance()));
       }
     }
     
@@ -952,9 +1219,19 @@ public final class Test {
     }
     
     public interface BlockingInterface {
-      public com.orbekk.protobuf.Test.TestResponse run(
+      public com.orbekk.protobuf.Test.Type2 testA(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request)
+          throws com.google.protobuf.ServiceException;
+      
+      public com.orbekk.protobuf.Test.Type2 testB(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request)
+          throws com.google.protobuf.ServiceException;
+      
+      public com.orbekk.protobuf.Test.Type2 testC(
           com.google.protobuf.RpcController controller,
-          com.orbekk.protobuf.Test.TestRequest request)
+          com.orbekk.protobuf.Test.Type1 request)
           throws com.google.protobuf.ServiceException;
     }
     
@@ -965,30 +1242,54 @@ public final class Test {
       
       private final com.google.protobuf.BlockingRpcChannel channel;
       
-      public com.orbekk.protobuf.Test.TestResponse run(
+      public com.orbekk.protobuf.Test.Type2 testA(
           com.google.protobuf.RpcController controller,
-          com.orbekk.protobuf.Test.TestRequest request)
+          com.orbekk.protobuf.Test.Type1 request)
           throws com.google.protobuf.ServiceException {
-        return (com.orbekk.protobuf.Test.TestResponse) channel.callBlockingMethod(
+        return (com.orbekk.protobuf.Test.Type2) channel.callBlockingMethod(
           getDescriptor().getMethods().get(0),
           controller,
           request,
-          com.orbekk.protobuf.Test.TestResponse.getDefaultInstance());
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance());
+      }
+      
+      
+      public com.orbekk.protobuf.Test.Type2 testB(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request)
+          throws com.google.protobuf.ServiceException {
+        return (com.orbekk.protobuf.Test.Type2) channel.callBlockingMethod(
+          getDescriptor().getMethods().get(1),
+          controller,
+          request,
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance());
+      }
+      
+      
+      public com.orbekk.protobuf.Test.Type2 testC(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.protobuf.Test.Type1 request)
+          throws com.google.protobuf.ServiceException {
+        return (com.orbekk.protobuf.Test.Type2) channel.callBlockingMethod(
+          getDescriptor().getMethods().get(2),
+          controller,
+          request,
+          com.orbekk.protobuf.Test.Type2.getDefaultInstance());
       }
       
     }
   }
   
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_com_orbekk_protobuf_TestRequest_descriptor;
+    internal_static_com_orbekk_protobuf_Type1_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_com_orbekk_protobuf_TestRequest_fieldAccessorTable;
+      internal_static_com_orbekk_protobuf_Type1_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_com_orbekk_protobuf_TestResponse_descriptor;
+    internal_static_com_orbekk_protobuf_Type2_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_com_orbekk_protobuf_TestResponse_fieldAccessorTable;
+      internal_static_com_orbekk_protobuf_Type2_fieldAccessorTable;
   
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -998,34 +1299,38 @@ public final class Test {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n,src/main/java/com/orbekk/protobuf/Test" +
-      ".proto\022\023com.orbekk.protobuf\"\031\n\013TestReque" +
-      "st\022\n\n\002id\030\001 \001(\t\"\032\n\014TestResponse\022\n\n\002id\030\001 \001" +
-      "(\t2Y\n\013TestService\022J\n\003Run\022 .com.orbekk.pr" +
-      "otobuf.TestRequest\032!.com.orbekk.protobuf" +
-      ".TestResponseB\003\210\001\001"
+      "\n,src/test/java/com/orbekk/protobuf/Test" +
+      ".proto\022\023com.orbekk.protobuf\".\n\005Type1\022\t\n\001" +
+      "a\030\001 \001(\005\022\t\n\001b\030\002 \001(\005\022\017\n\007message\030\003 \001(\t\"(\n\005T" +
+      "ype2\022\016\n\006result\030\001 \001(\005\022\017\n\007message\030\002 \001(\t2\314\001" +
+      "\n\007Service\022?\n\005TestA\022\032.com.orbekk.protobuf" +
+      ".Type1\032\032.com.orbekk.protobuf.Type2\022?\n\005Te" +
+      "stB\022\032.com.orbekk.protobuf.Type1\032\032.com.or" +
+      "bekk.protobuf.Type2\022?\n\005TestC\022\032.com.orbek" +
+      "k.protobuf.Type1\032\032.com.orbekk.protobuf.T" +
+      "ype2B\003\210\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_com_orbekk_protobuf_TestRequest_descriptor =
+          internal_static_com_orbekk_protobuf_Type1_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_com_orbekk_protobuf_TestRequest_fieldAccessorTable = new
+          internal_static_com_orbekk_protobuf_Type1_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_com_orbekk_protobuf_TestRequest_descriptor,
-              new java.lang.String[] { "Id", },
-              com.orbekk.protobuf.Test.TestRequest.class,
-              com.orbekk.protobuf.Test.TestRequest.Builder.class);
-          internal_static_com_orbekk_protobuf_TestResponse_descriptor =
+              internal_static_com_orbekk_protobuf_Type1_descriptor,
+              new java.lang.String[] { "A", "B", "Message", },
+              com.orbekk.protobuf.Test.Type1.class,
+              com.orbekk.protobuf.Test.Type1.Builder.class);
+          internal_static_com_orbekk_protobuf_Type2_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_com_orbekk_protobuf_TestResponse_fieldAccessorTable = new
+          internal_static_com_orbekk_protobuf_Type2_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_com_orbekk_protobuf_TestResponse_descriptor,
-              new java.lang.String[] { "Id", },
-              com.orbekk.protobuf.Test.TestResponse.class,
-              com.orbekk.protobuf.Test.TestResponse.Builder.class);
+              internal_static_com_orbekk_protobuf_Type2_descriptor,
+              new java.lang.String[] { "Result", "Message", },
+              com.orbekk.protobuf.Test.Type2.class,
+              com.orbekk.protobuf.Test.Type2.Builder.class);
           return null;
         }
       };
diff --git a/src/test/java/com/orbekk/protobuf/Test.proto b/src/test/java/com/orbekk/protobuf/Test.proto
new file mode 100644
index 0000000..9bbe629
--- /dev/null
+++ b/src/test/java/com/orbekk/protobuf/Test.proto
@@ -0,0 +1,20 @@
+package com.orbekk.protobuf;
+
+option java_generic_services = true;
+
+message Type1 {
+    optional int32 a = 1;
+    optional int32 b = 2;
+    optional string message = 3;
+}
+
+message Type2 {
+    optional int32 result = 1;
+    optional string message = 2;
+}
+
+service Service {
+    rpc TestA (Type1) returns (Type2);
+    rpc TestB (Type1) returns (Type2);
+    rpc TestC (Type1) returns (Type2);
+}