allow empty java package and proto package

Fadelis · Feb 9, 2022 · d3e6279 · d3e6279
1 parent 02162e8
commit d3e6279
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.../src/test/resources/no-package-type.proto → ...src/test/resources/no-packages-type.proto b/.../src/test/resources/no-package-type.proto → ...src/test/resources/no-packages-type.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option java_multiple_files = true;
 option java_package = "org.test.datatypes";
 
-message NoPackageTestMessage {
+message NoProtoPackageTestMessage {
   message NestedTestMessage {
     string string = 1;
     optional string optional_string = 2;

diff --git a/protoc-gen-java-optional-test/src/test/resources/no-proto-package-type.proto b/protoc-gen-java-optional-test/src/test/resources/no-proto-package-type.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+
+message NoPackagesTestMessage {
+  message NestedTestMessage {
+    string string = 1;
+    optional string optional_string = 2;
+  }
+}
+
diff --git a/protoc-gen-java-optional/src/main/java/org/grpcmock/protoc/plugin/OptionalGenerator.java b/protoc-gen-java-optional/src/main/java/org/grpcmock/protoc/plugin/OptionalGenerator.java
@@ -103,8 +103,10 @@ private Stream<File> handleMessage(
       String protoPackage,
       String javaPackage
   ) {
-    String filePath = javaPackage.replace(".", DIR_SEPARATOR) + DIR_SEPARATOR + fileName + JAVA_EXTENSION;
-    String fullMethodName = (protoPackage.isEmpty() ? "" : (protoPackage + ".")) + messageDescriptor.getName();
+    String javaPackagePath = javaPackage.isEmpty() ? "" : javaPackage.replace(".", DIR_SEPARATOR) + DIR_SEPARATOR;
+    String protoPackagePath = protoPackage.isEmpty() ? "" : protoPackage + ".";
+    String filePath = javaPackagePath + fileName + JAVA_EXTENSION;
+    String fullMethodName = protoPackagePath + messageDescriptor.getName();
 
     return Stream.concat(
         handleSingleMessage(messageDescriptor, filePath, fullMethodName),