Remove the suffix of 'Service' on generated types

This commit removes the 'Service' suffix on RPC service interface, favouring the name defined in the proto file. This prevents awkward class naming such as 'StatusServiceService'.

Author: Alex Davies-Moore

plugin/src/main/java/com/flit/protoc/gen/server/ServiceGenerator.java

@@ -12,11 +12,11 @@ public class ServiceGenerator extends BaseGenerator {
 
     public ServiceGenerator(DescriptorProtos.FileDescriptorProto proto, DescriptorProtos.ServiceDescriptorProto s, TypeMapper mapper) {
         super(proto, s, mapper);
-        this.filename = javaPackage.replace(".", "/") + "/Rpc" + service.getName() + "Service.java";
+        this.filename = javaPackage.replace(".", "/") + "/Rpc" + service.getName() + ".java";
     }
 
     public void open() {
-        b.wn("public interface Rpc", service.getName(), "Service {");
+        b.wn("public interface Rpc", service.getName(), " {");
         b.n();
         b.inc();
     }

plugin/src/main/java/com/flit/protoc/gen/server/spring/RpcGenerator.java

@@ -55,7 +55,7 @@ void open() {
         // add the service handler
         b.inc();
         b.iwn("@Autowired");
-        b.iwn("private Rpc", service.getName(), "Service service;");
+        b.iwn("private Rpc", service.getName(), " service;");
         b.n();
     }
 

plugin/src/main/java/com/flit/protoc/gen/server/undertow/RpcGenerator.java

@@ -67,12 +67,12 @@ void open(DescriptorProtos.ServiceDescriptorProto s) {
         b.n();
 
         // add the service handler
-        b.iwn("private final Rpc", service.getName(), "Service service;");
+        b.iwn("private final Rpc", service.getName(), " service;");
         b.iwn("private final ErrorWriter errorWriter;");
         b.n();
 
         // add the constructor for the service
-        b.iwn("public Rpc", service.getName(), "Handler(Rpc", service.getName() + "Service service) {");
+        b.iwn("public Rpc", service.getName(), "Handler(Rpc", service.getName() + " service) {");
         b.inc();
         b.iwn("this.service = service;");
         b.iwn("this.errorWriter = new ErrorWriter();");

plugin/src/test/java/com/flit/protoc/gen/server/undertow/ContextGeneratorTest.java

@@ -56,7 +56,7 @@ private void test_Route(String file, String route) throws Exception {
             Function.identity()
         ));
 
-        assertTrue(files.containsKey("com/example/context/rpc/RpcNullServiceService.java"));
+        assertTrue(files.containsKey("com/example/context/rpc/RpcNullService.java"));
         assertTrue(files.containsKey("com/example/context/rpc/RpcNullServiceHandler.java"));
 
         assertTrue(files.get("com/example/context/rpc/RpcNullServiceHandler.java").getContent().contains(

plugin/src/test/java/com/flit/protoc/gen/server/undertow/HelloworldGeneratorTest.java

@@ -33,11 +33,11 @@ public void test_Generate() throws Exception {
             Function.identity()
         ));
 
-        assertTrue(files.containsKey("com/example/helloworld/RpcHelloWorldService.java"));
+        assertTrue(files.containsKey("com/example/helloworld/RpcHelloWorld.java"));
         assertTrue(files.containsKey("com/example/helloworld/RpcHelloWorldHandler.java"));
 
         // ensure it's parseable java
-        test_Service(files.get("com/example/helloworld/RpcHelloWorldService.java"));
+        test_Service(files.get("com/example/helloworld/RpcHelloWorld.java"));
         test_Handler(files.get("com/example/helloworld/RpcHelloWorldHandler.java"));
     }
 
@@ -92,7 +92,7 @@ private void test_Service(PluginProtos.CodeGeneratorResponse.File file) throws E
         assertEquals(1, cu.getTypes().size());
 
         assertTrue(cu.getType(0).isPublic());
-        assertEquals("RpcHelloWorldService", cu.getType(0).getNameAsString());
+        assertEquals("RpcHelloWorld", cu.getType(0).getNameAsString());
 
         Map<String, MethodDeclaration> methods = cu
             .findAll(MethodDeclaration.class)

plugin/src/test/java/com/flit/protoc/gen/server/undertow/StatusGeneratorTest.java

@@ -36,10 +36,10 @@ public void test_Generate() throws Exception {
             Function.identity()
         ));
 
-        assertTrue(files.containsKey("com/example/helloworld/RpcStatusService.java"));
+        assertTrue(files.containsKey("com/example/helloworld/RpcStatus.java"));
         assertTrue(files.containsKey("com/example/helloworld/RpcStatusHandler.java"));
 
-        test_Service(files.get("com/example/helloworld/RpcStatusService.java"));
+        test_Service(files.get("com/example/helloworld/RpcStatus.java"));
         test_Handler(files.get("com/example/helloworld/RpcStatusHandler.java"));
     }
 
@@ -85,7 +85,7 @@ private void test_Service(PluginProtos.CodeGeneratorResponse.File file) throws E
         assertEquals(1, cu.getTypes().size());
 
         assertTrue(cu.getType(0).isPublic());
-        assertEquals("RpcStatusService", cu.getType(0).getNameAsString());
+        assertEquals("RpcStatus", cu.getType(0).getNameAsString());
 
         Map<String, MethodDeclaration> methods = cu
             .findAll(MethodDeclaration.class)