From d3e627915af0dbf72fa9bc3d1a911d2f61c9a6a1 Mon Sep 17 00:00:00 2001 From: Fadelis Date: Wed, 9 Feb 2022 09:40:38 +0100 Subject: [PATCH] allow empty java package and proto package --- .../{no-package-type.proto => no-packages-type.proto} | 2 +- .../src/test/resources/no-proto-package-type.proto | 11 +++++++++++ .../org/grpcmock/protoc/plugin/OptionalGenerator.java | 6 ++++-- 3 files changed, 16 insertions(+), 3 deletions(-) rename protoc-gen-java-optional-test/src/test/resources/{no-package-type.proto => no-packages-type.proto} (84%) create mode 100644 protoc-gen-java-optional-test/src/test/resources/no-proto-package-type.proto diff --git a/protoc-gen-java-optional-test/src/test/resources/no-package-type.proto b/protoc-gen-java-optional-test/src/test/resources/no-packages-type.proto similarity index 84% rename from protoc-gen-java-optional-test/src/test/resources/no-package-type.proto rename to protoc-gen-java-optional-test/src/test/resources/no-packages-type.proto index 1e1959d..1a05d36 100644 --- a/protoc-gen-java-optional-test/src/test/resources/no-package-type.proto +++ b/protoc-gen-java-optional-test/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 new file mode 100644 index 0000000..77f6f4e --- /dev/null +++ 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 index 664123f..7a291bd 100644 --- 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 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),