Merge pull request #224 from salesforce/grpc-refresh

gRPC 1.54.0 and protobuf 3.22.2

Author: rmichela

contrib/pom.xml

@@ -59,8 +59,8 @@
         <mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
 
         <!-- Dependency Versions -->
-        <grpc.version>1.51.0</grpc.version>
-        <protoc.version>3.21.9</protoc.version> <!-- Same version as grpc-proto -->
+        <grpc.version>1.54.0</grpc.version>
+        <protoc.version>3.22.2</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>2.0.5</slf4j.version>
         <gson.version>2.10</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.10</mustache-java.version>

demos/pom.xml

@@ -59,8 +59,8 @@
         <contrib.version>0.8.2-SNAPSHOT</contrib.version>
         <jprotoc.version>0.8.1</jprotoc.version>
 
-        <grpc.version>1.51.0</grpc.version>
-        <protoc.version>3.21.9</protoc.version> <!-- Same version as grpc-proto -->
+        <grpc.version>1.54.0</grpc.version>
+        <protoc.version>3.22.2</protoc.version> <!-- Same version as grpc-proto -->
         <slf4j.version>2.0.5</slf4j.version>
         <gson.version>2.10</gson.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>

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

@@ -44,21 +44,13 @@ public static ProtoTypeMap of(@Nonnull Collection<DescriptorProtos.FileDescripto
             final DescriptorProtos.FileOptions fileOptions = fileDescriptor.getOptions();
 
             final String protoPackage = fileDescriptor.hasPackage() ? "." + fileDescriptor.getPackage() : "";
-            final String javaPackage = Strings.emptyToNull(
-                    fileOptions.hasJavaPackage() ?
-                            fileOptions.getJavaPackage() :
-                            fileDescriptor.getPackage());
-            final String enclosingClassName =
-                    fileOptions.getJavaMultipleFiles() ?
-                            null :
-                            getJavaOuterClassname(fileDescriptor, fileOptions);
-
+            final String javaPackage = Strings.emptyToNull(fileOptions.hasJavaPackage() ? fileOptions.getJavaPackage() : fileDescriptor.getPackage());
+            final String enclosingClassName = fileOptions.getJavaMultipleFiles() ? null : getJavaOuterClassname(fileDescriptor);
 
             // Identify top-level enums
-            fileDescriptor.getEnumTypeList().forEach(
-                e -> types.put(
-                        protoPackage + "." + e.getName(),
-                        DOT_JOINER.join(javaPackage, enclosingClassName, e.getName())));
+            fileDescriptor.getEnumTypeList().forEach(e -> types.put(
+                    protoPackage + "." + e.getName(),
+                    DOT_JOINER.join(javaPackage, enclosingClassName, e.getName())));
 
             // Identify top-level messages, and nested types
             fileDescriptor.getMessageTypeList().forEach(
@@ -102,9 +94,15 @@ public String toJavaTypeName(@Nonnull String protoTypeName) {
         return types.get(protoTypeName);
     }
 
-    private static String getJavaOuterClassname(
-            DescriptorProtos.FileDescriptorProto fileDescriptor,
-            DescriptorProtos.FileOptions fileOptions) {
+    /**
+     * Computes the Java outer class name for a given FileDescriptorProto, for use when multiple classes are generated
+     * in the same outer class.
+     * @param fileDescriptor
+     * @return
+     */
+    public static String getJavaOuterClassname(DescriptorProtos.FileDescriptorProto fileDescriptor) {
+        Preconditions.checkNotNull(fileDescriptor, "fileDescriptor");
+        DescriptorProtos.FileOptions fileOptions = fileDescriptor.getOptions();
 
         if (fileOptions.hasJavaOuterClassname()) {
             return fileOptions.getJavaOuterClassname();

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

@@ -160,6 +160,7 @@ public static void debug(
                     String name = Files.getNameWithoutExtension(file.getName()) +
                             "-" +
                             file.getInsertionPoint() +
+                            "." +
                             Files.getFileExtension(file.getName());
                     outFile = new File(name);
                 }

jprotoc/pom.xml

@@ -58,13 +58,13 @@
         <mavenBaseUrl>https://oss.sonatype.org/content/repositories</mavenBaseUrl>
 
         <!-- Dependency Versions -->
-        <protoc.version>3.21.9</protoc.version>
+        <protoc.version>3.22.2</protoc.version>
         <gson.version>2.10</gson.version>
         <mustache-java.version>0.9.10</mustache-java.version>
 
         <!-- Test Dependency Versions -->
         <contrib.version>0.8.1</contrib.version>
-        <grpc.version>1.51.0</grpc.version>
+        <grpc.version>1.54.0</grpc.version>
         <junit.version>4.13.1</junit.version>
         <assertj.version>3.23.1</assertj.version>
         <commons-lang.version>2.6</commons-lang.version>