Improve Java gencode static initialization to avoid unnecessary temporaries

PiperOrigin-RevId: 799633296

Author: protobuf-github-bot

java/core/src/main/java/com/google/protobuf/Descriptors.java

@@ -211,21 +211,53 @@ public List<Descriptor> getMessageTypes() {
       return Collections.unmodifiableList(Arrays.asList(messageTypes));
     }
 
+    public int getMessageTypeCount() {
+      return messageTypes.length;
+    }
+
+    public Descriptor getMessageType(int index) {
+      return messageTypes[index];
+    }
+
     /** Get a list of top-level enum types declared in this file. */
     public List<EnumDescriptor> getEnumTypes() {
       return Collections.unmodifiableList(Arrays.asList(enumTypes));
     }
 
+    public int getEnumTypeCount() {
+      return enumTypes.length;
+    }
+
+    public EnumDescriptor getEnumType(int index) {
+      return enumTypes[index];
+    }
+
     /** Get a list of top-level services declared in this file. */
     public List<ServiceDescriptor> getServices() {
       return Collections.unmodifiableList(Arrays.asList(services));
     }
 
+    public int getServiceCount() {
+      return services.length;
+    }
+
+    public ServiceDescriptor getService(int index) {
+      return services[index];
+    }
+
     /** Get a list of top-level extensions declared in this file. */
     public List<FieldDescriptor> getExtensions() {
       return Collections.unmodifiableList(Arrays.asList(extensions));
     }
 
+    public int getExtensionCount() {
+      return extensions.length;
+    }
+
+    public FieldDescriptor getExtension(int index) {
+      return extensions[index];
+    }
+
     /** Get a list of this file's dependencies (imports). */
     public List<FileDescriptor> getDependencies() {
       return Collections.unmodifiableList(Arrays.asList(dependencies));
@@ -844,31 +876,94 @@ public List<FieldDescriptor> getFields() {
       return Collections.unmodifiableList(Arrays.asList(fields));
     }
 
+    /** Get a count of this message type's fields. */
+    public int getFieldCount() {
+      return fields.length;
+    }
+
+    /** Get the message type's field at the specified index. */
+    public FieldDescriptor getField(int index) {
+      return fields[index];
+    }
+
     /** Get a list of this message type's oneofs. */
     public List<OneofDescriptor> getOneofs() {
       return Collections.unmodifiableList(Arrays.asList(oneofs));
     }
 
+    /** Get a count of this message type's oneofs. */
+    public int getOneofCount() {
+      return oneofs.length;
+    }
+
+    /** Get the message type's oneof at the specified index. */
+    public OneofDescriptor getOneof(int index) {
+      return oneofs[index];
+    }
+
     /** Get a list of this message type's real oneofs. */
     public List<OneofDescriptor> getRealOneofs() {
       return Collections.unmodifiableList(Arrays.asList(oneofs).subList(0, realOneofCount));
     }
 
+    /** Get a count of this message type's real oneofs. */
+    public int getRealOneofCount() {
+      return realOneofCount;
+    }
+
+    /** Get the message type's real oneof at the specified index. */
+    public OneofDescriptor getRealOneof(int index) {
+      if (index >= realOneofCount) {
+        throw new ArrayIndexOutOfBoundsException(index);
+      }
+      return oneofs[index];
+    }
+
     /** Get a list of the extensions defined nested within this message type's scope. */
     public List<FieldDescriptor> getExtensions() {
       return Collections.unmodifiableList(Arrays.asList(extensions));
     }
 
+    /** Get a count of the extensions defined nested within this message type's scope. */
+    public int getExtensionCount() {
+      return extensions.length;
+    }
+
+    /** Get the extension defined nested within this message type's scope at the specified index. */
+    public FieldDescriptor getExtension(int index) {
+      return extensions[index];
+    }
+
     /** Get a list of message types nested within this one. */
     public List<Descriptor> getNestedTypes() {
       return Collections.unmodifiableList(Arrays.asList(nestedTypes));
     }
 
+    /** Get a count of message types nested within this one. */
+    public int getNestedTypeCount() {
+      return nestedTypes.length;
+    }
+
+    /** Get the message type's nested message type at the specified index. */
+    public Descriptor getNestedType(int index) {
+      return nestedTypes[index];
+    }
+
     /** Get a list of enum types nested within this one. */
     public List<EnumDescriptor> getEnumTypes() {
       return Collections.unmodifiableList(Arrays.asList(enumTypes));
     }
 
+    /** Get a count of enum types nested within this one. */
+    public int getEnumTypeCount() {
+      return enumTypes.length;
+    }
+
+    /** Get the message type's nested enum type at the specified index. */
+    public EnumDescriptor getEnumType(int index) {
+      return enumTypes[index];
+    }
+
     /** Determines if the given field number is an extension. */
     public boolean isExtensionNumber(final int number) {
       int index = Arrays.binarySearch(extensionRangeLowerBounds, number);
@@ -2633,6 +2728,16 @@ public List<MethodDescriptor> getMethods() {
       return Collections.unmodifiableList(Arrays.asList(methods));
     }
 
+    /** Get a count of methods for this service. */
+    public int getMethodCount() {
+      return methods.length;
+    }
+
+    /** Get the service's method at the specified index. */
+    public MethodDescriptor getMethod(int index) {
+      return methods[index];
+    }
+
     /**
      * Find a method by name.
      *

java/core/src/main/java/com/google/protobuf/GeneratedMessage.java

@@ -1797,7 +1797,7 @@ GeneratedExtension<ContainingT, T> newMessageScopedGeneratedExtension(
         new CachedDescriptorRetriever() {
           @Override
           public FieldDescriptor loadDescriptor() {
-            return scope.getDescriptorForType().getExtensions().get(descriptorIndex);
+            return scope.getDescriptorForType().getExtension(descriptorIndex);
           }
         },
         singularType,
@@ -2151,8 +2151,8 @@ public FieldAccessorTable(
     public FieldAccessorTable(final Descriptor descriptor, final String[] camelCaseNames) {
       this.descriptor = descriptor;
       this.camelCaseNames = camelCaseNames;
-      fields = new FieldAccessor[descriptor.getFields().size()];
-      oneofs = new OneofAccessor[descriptor.getOneofs().size()];
+      fields = new FieldAccessor[descriptor.getFieldCount()];
+      oneofs = new OneofAccessor[descriptor.getOneofCount()];
       initialized = false;
     }
 
@@ -2175,7 +2175,7 @@ public FieldAccessorTable ensureFieldAccessorsInitialized(
         }
         int fieldsSize = fields.length;
         for (int i = 0; i < fieldsSize; i++) {
-          FieldDescriptor field = descriptor.getFields().get(i);
+          FieldDescriptor field = descriptor.getField(i);
           String containingOneofCamelCaseName = null;
           if (field.getContainingOneof() != null) {
             int index = fieldsSize + field.getContainingOneof().getIndex();
@@ -2235,8 +2235,8 @@ public FieldAccessorTable ensureFieldAccessorsInitialized(
           }
         }
 
-        for (int i = 0; i < descriptor.getOneofs().size(); i++) {
-          if (i < descriptor.getRealOneofs().size()) {
+        for (int i = 0; i < descriptor.getOneofCount(); i++) {
+          if (i < descriptor.getRealOneofCount()) {
             oneofs[i] =
                 new RealOneofAccessor(
                     descriptor, camelCaseNames[i + fieldsSize], messageClass, builderClass);
@@ -2383,8 +2383,8 @@ public void clear(final Builder<?> builder) {
     /** SyntheticOneofAccessor provides access to a single synthetic oneof. */
     private static class SyntheticOneofAccessor implements OneofAccessor {
       SyntheticOneofAccessor(final Descriptor descriptor, final int oneofIndex) {
-        OneofDescriptor oneofDescriptor = descriptor.getOneofs().get(oneofIndex);
-        fieldDescriptor = oneofDescriptor.getFields().get(0);
+        OneofDescriptor oneofDescriptor = descriptor.getOneof(oneofIndex);
+        fieldDescriptor = oneofDescriptor.getField(0);
       }
 
       private final FieldDescriptor fieldDescriptor;

java/core/src/main/java/com/google/protobuf/RuntimeVersion.java

@@ -7,6 +7,7 @@
 
 package com.google.protobuf;
 
+import java.util.Locale;
 import java.util.logging.Logger;
 
 /**
@@ -48,6 +49,28 @@ public enum RuntimeDomain {
   private static final String VERSION_STRING = versionString(MAJOR, MINOR, PATCH, SUFFIX);
   private static final Logger logger = Logger.getLogger(RuntimeVersion.class.getName());
 
+  /**
+   * Validates that the gencode version is compatible with this runtime version according to
+   * https://protobuf.dev/support/cross-version-runtime-guarantee/.
+   *
+   * <p>This method is currently only used by Protobuf Java **full version** gencode (<=32.x), it is
+   * left for compatibility. Do not call it elsewhere.
+   *
+   * @param domain the domain where Protobuf Java code was generated.
+   * @param major the major version of Protobuf Java gencode.
+   * @param minor the minor version of Protobuf Java gencode.
+   * @param patch the micro/patch version of Protobuf Java gencode.
+   * @param suffix the version suffix e.g. "-rc2", "-dev", etc.
+   * @param location the debugging location e.g. generated Java class to put in the error messages.
+   * @deprecated Use other overload.
+   * @throws ProtobufRuntimeVersionException if versions are incompatible.
+   */
+  @Deprecated
+  public static void validateProtobufGencodeVersion(
+      RuntimeDomain domain, int major, int minor, int patch, String suffix, String location) {
+    validateProtobufGencodeVersionImpl(domain, major, minor, patch, suffix, location);
+  }
+
   /**
    * Validates that the gencode version is compatible with this runtime version according to
    * https://protobuf.dev/support/cross-version-runtime-guarantee/.
@@ -64,13 +87,13 @@ public enum RuntimeDomain {
    * @throws ProtobufRuntimeVersionException if versions are incompatible.
    */
   public static void validateProtobufGencodeVersion(
-      RuntimeDomain domain, int major, int minor, int patch, String suffix, String location) {
+      RuntimeDomain domain, int major, int minor, int patch, String suffix, Class<?> location) {
     validateProtobufGencodeVersionImpl(domain, major, minor, patch, suffix, location);
   }
 
   /** The actual implementation of version validation. */
   private static void validateProtobufGencodeVersionImpl(
-      RuntimeDomain domain, int major, int minor, int patch, String suffix, String location) {
+      RuntimeDomain domain, int major, int minor, int patch, String suffix, Object location) {
     if (checkDisabled()) {
       return;
     }
@@ -84,9 +107,12 @@ private static void validateProtobufGencodeVersionImpl(
     if (domain != DOMAIN) {
       throw new ProtobufRuntimeVersionException(
           String.format(
+              Locale.US,
               "Detected mismatched Protobuf Gencode/Runtime domains when loading %s: gencode %s,"
                   + " runtime %s. Cross-domain usage of Protobuf is not supported.",
-              location, domain, DOMAIN));
+              location,
+              domain,
+              DOMAIN));
     }
 
     String gencodeVersionString = null;
@@ -97,17 +123,23 @@ private static void validateProtobufGencodeVersionImpl(
         gencodeVersionString = versionString(major, minor, patch, suffix);
         logger.warning(
             String.format(
+                Locale.US,
                 " Protobuf gencode version %s is exactly one major version older than the runtime"
                     + " version %s at %s. Please update the gencode to avoid compatibility"
                     + " violations in the next runtime release.",
-                gencodeVersionString, VERSION_STRING, location));
+                gencodeVersionString,
+                VERSION_STRING,
+                location));
         majorWarningLoggedCount++;
       } else {
         throw new ProtobufRuntimeVersionException(
             String.format(
+                Locale.US,
                 "Detected mismatched Protobuf Gencode/Runtime major versions when loading %s:"
                     + " gencode %s, runtime %s. Same major version is required.",
-                location, versionString(major, minor, patch, suffix), VERSION_STRING));
+                location,
+                versionString(major, minor, patch, suffix),
+                VERSION_STRING));
       }
     }
 
@@ -118,9 +150,12 @@ private static void validateProtobufGencodeVersionImpl(
       }
       throw new ProtobufRuntimeVersionException(
           String.format(
+              Locale.US,
               "Detected incompatible Protobuf Gencode/Runtime versions when loading %s: gencode %s,"
                   + " runtime %s. Runtime version cannot be older than the linked gencode version.",
-              location, gencodeVersionString, VERSION_STRING));
+              location,
+              gencodeVersionString,
+              VERSION_STRING));
     }
 
     // Check that runtime version suffix is the same as the gencode version suffix.
@@ -130,9 +165,12 @@ private static void validateProtobufGencodeVersionImpl(
       }
       throw new ProtobufRuntimeVersionException(
           String.format(
+              Locale.US,
               "Detected mismatched Protobuf Gencode/Runtime version suffixes when loading %s:"
                   + " gencode %s, runtime %s. Version suffixes must be the same.",
-              location, gencodeVersionString, VERSION_STRING));
+              location,
+              gencodeVersionString,
+              VERSION_STRING));
     }
   }
 
@@ -148,7 +186,7 @@ public ProtobufRuntimeVersionException(String message) {
 
   /** Gets the version string given the version segments. */
   private static String versionString(int major, int minor, int patch, String suffix) {
-    return String.format("%d.%d.%d%s", major, minor, patch, suffix);
+    return String.format(Locale.US, "%d.%d.%d%s", major, minor, patch, suffix);
   }
 
   private static boolean checkDisabled() {

src/google/protobuf/compiler/java/full/message.cc

@@ -152,13 +152,12 @@ int ImmutableMessageGenerator::GenerateStaticVariableInitializers(
   if (descriptor_->containing_type() == nullptr) {
     printer->Print(vars,
                    "internal_$identifier$_descriptor =\n"
-                   "  getDescriptor().getMessageTypes().get($index$);\n");
+                   "  getDescriptor().getMessageType($index$);\n");
     bytecode_estimate += 30;
   } else {
-    printer->Print(
-        vars,
-        "internal_$identifier$_descriptor =\n"
-        "  internal_$parent$_descriptor.getNestedTypes().get($index$);\n");
+    printer->Print(vars,
+                   "internal_$identifier$_descriptor =\n"
+                   "  internal_$parent$_descriptor.getNestedType($index$);\n");
     bytecode_estimate += 30;
   }
 

src/google/protobuf/compiler/java/full/service.cc

@@ -65,7 +65,7 @@ void ImmutableServiceGenerator::Generate(io::Printer* printer) {
       "public static final\n"
       "    com.google.protobuf.Descriptors.ServiceDescriptor\n"
       "    getDescriptor() {\n"
-      "  return $file$.getDescriptor().getServices().get($index$);\n"
+      "  return $file$.getDescriptor().getService($index$);\n"
       "}\n",
       "file", name_resolver_->GetImmutableClassName(descriptor_->file()),
       "index", absl::StrCat(descriptor_->index()));
@@ -339,7 +339,7 @@ void ImmutableServiceGenerator::GenerateStub(io::Printer* printer) {
     vars["output"] = GetOutput(method);
     printer->Print(vars,
                    "channel.callMethod(\n"
-                   "  getDescriptor().getMethods().get($index$),\n"
+                   "  getDescriptor().getMethod($index$),\n"
                    "  controller,\n"
                    "  request,\n"
                    "  $output$.getDefaultInstance(),\n"
@@ -403,7 +403,7 @@ void ImmutableServiceGenerator::GenerateBlockingStub(io::Printer* printer) {
     vars["output"] = GetOutput(method);
     printer->Print(vars,
                    "return ($output$) channel.callBlockingMethod(\n"
-                   "  getDescriptor().getMethods().get($index$),\n"
+                   "  getDescriptor().getMethod($index$),\n"
                    "  controller,\n"
                    "  request,\n"
                    "  $output$.getDefaultInstance());\n");