Merge pull request #67 from salesforce/bugfix/jprotoc-outer-class

Append 'OuterClass' to outer proto type names when the outer and inne…

Author: rmichela

jprotoc-test/src/test/proto/helloworld.proto

@@ -4,6 +4,7 @@ package helloworld;
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
+import "some_parameter.proto";
 
 option java_multiple_files = true;
 option java_package = "com.salesforce.jprotoc";
@@ -16,11 +17,14 @@ service Greeter {
 
     // Sends the current time
     rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+
+    rpc SomeParam (my.someparameters.SomeParameter) returns (my.someparameters.SomeParameter) {}
 }
 
 // The request message containing the user's name.
 message HelloRequest {
     string name = 1;
+    my.someparameters.SomeParameter sp = 2;
 }
 
 // The response message containing the greetings

jprotoc-test/src/test/proto/some_parameter.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+//option java_outer_classname = "SomeParameterProto";
+
+package my.someparameters;
+
+message SomeParameter {
+    string id = 1;
+}

jprotoc/src/main/java/com/salesforce/jprotoc/ProtoTypeMap.java

@@ -56,6 +56,8 @@ public static ProtoTypeMap of(@Nonnull Collection<DescriptorProtos.FileDescripto
                             null :
                             getJavaOuterClassname(fileDescriptor, fileOptions);
 
+
+
             fileDescriptor.getEnumTypeList().forEach(
                 e -> types.put(
                         protoPackage + "." + e.getName(),
@@ -109,7 +111,20 @@ private static String getJavaOuterClassname(
         // If the outer class name is not explicitly defined, then we take the proto filename, strip its extension,
         // and convert it from snake case to camel case.
         String filename = fileDescriptor.getName().substring(0, fileDescriptor.getName().length() - ".proto".length());
+        filename = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, filename);
+        return appendOuterClassSuffix(filename, fileDescriptor);
+    }
 
-        return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, filename);
+    /**
+     * In the event of a name conflict between the outer and inner type names, protoc adds an OuterClass suffix to the
+     * outer type's name.
+     */
+    private static String appendOuterClassSuffix(final String enclosingClassName, DescriptorProtos.FileDescriptorProto fd) {
+        if (fd.getEnumTypeList().stream().anyMatch(enumProto -> enumProto.getName().equals(enclosingClassName)) ||
+            fd.getMessageTypeList().stream().anyMatch(messageProto -> messageProto.getName().equals(enclosingClassName))) {
+            return enclosingClassName + "OuterClass";
+        } else {
+            return enclosingClassName;
+        }
     }
 }