Change back to using String instead of Class as the argument on the Poison Pill.

The reason to change this back is that one purpose of this method to provide a good message when e.g. someone tries to use 4.33.0 gencode against 4.30 runtime. The 4.30 runtime only has the `String` argument method, so by having new gencode try to call the `Class` one it will result in ABI behavior of a NoSuchMethodError instead of getting the clean message when that 'bad direction skew' happens.

This partial-rollback tries to retain the benefit of avoiding the small cost of the .class.getName() call by having new gencode simply emit the name as a string literal like `"MyMessageProto"` instead of  `MyMessageProto.class.getName()` when calling the poison pill.

Because we didn't do any open source releases with this change quite yet, we can remove the `Class` overload here instead of it having to linger forever.

PiperOrigin-RevId: 813433985

Author: protobuf-github-bot

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

@@ -65,38 +65,16 @@ public enum RuntimeDomain {
    * @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/.
-   *
-   * <p>This method is currently only used by Protobuf Java **full version** gencode. 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.
-   * @throws ProtobufRuntimeVersionException if versions are incompatible.
-   */
-  public static void validateProtobufGencodeVersion(
-      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, Object location) {
+      RuntimeDomain domain, int major, int minor, int patch, String suffix, String location) {
     if (checkDisabled()) {
       return;
     }

src/google/protobuf/compiler/java/helpers.cc

@@ -102,13 +102,13 @@ void PrintGencodeVersionValidator(io::Printer* printer, bool oss_runtime,
       "  $minor$,\n"
       "  $patch$,\n"
       "  $suffix$,\n"
-      "  $location$);\n",
-      "domain", oss_runtime ? "PUBLIC" : "GOOGLE_INTERNAL", "major",
-      absl::StrCat("/* major= */ ", version.major()), "minor",
-      absl::StrCat("/* minor= */ ", version.minor()), "patch",
-      absl::StrCat("/* patch= */ ", version.patch()), "suffix",
-      absl::StrCat("/* suffix= */ \"", version.suffix(), "\""), "location",
-      absl::StrCat(java_class_name, ".class"));
+      "  \"$location$\");\n",
+      "domain", oss_runtime ? "PUBLIC" : "GOOGLE_INTERNAL",                //
+      "major", absl::StrCat("/* major= */ ", version.major()),             //
+      "minor", absl::StrCat("/* minor= */ ", version.minor()),             //
+      "patch", absl::StrCat("/* patch= */ ", version.patch()),             //
+      "suffix", absl::StrCat("/* suffix= */ \"", version.suffix(), "\""),  //
+      "location", java_class_name);                                        //
 }
 
 std::string UnderscoresToCamelCase(absl::string_view input,