Support for Protobuf 4.x

This commit compiles our Protobuf against 4.27, effectively raising our
baseline to 3.9+.

This commit also re-generates all the Java messages from the .proto spec
using the latest protoc binary.

Closes gh-33011

spring-web/src/test/java/org/springframework/protobuf/Msg.java

@@ -1,5 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
 // source: sample.proto
+// Protobuf Java Version: 4.27.0
 
 package org.springframework.protobuf;
 
@@ -7,47 +9,49 @@ package org.springframework.protobuf;
  * Protobuf type {@code Msg}
  */
 public final class Msg extends
-    com.google.protobuf.GeneratedMessageV3 implements
+    com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:Msg)
     MsgOrBuilder {
 private static final long serialVersionUID = 0L;
+  static {
+    com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 27,
+      /* patch= */ 0,
+      /* suffix= */ "",
+      Msg.class.getName());
+  }
   // Use Msg.newBuilder() to construct.
-  private Msg(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+  private Msg(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
     super(builder);
   }
   private Msg() {
     foo_ = "";
   }
 
-  @Override
-  @SuppressWarnings({"unused"})
-  protected Object newInstance(
-      UnusedPrivateParameter unused) {
-    return new Msg();
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_Msg_descriptor;
+    return org.springframework.protobuf.OuterSample.internal_static_Msg_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_Msg_fieldAccessorTable
+    return org.springframework.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            Msg.class, Builder.class);
+            org.springframework.protobuf.Msg.class, org.springframework.protobuf.Msg.Builder.class);
   }
 
   private int bitField0_;
   public static final int FOO_FIELD_NUMBER = 1;
   @SuppressWarnings("serial")
-  private volatile Object foo_ = "";
+  private volatile java.lang.Object foo_ = "";
   /**
    * <code>optional string foo = 1;</code>
    * @return Whether the foo field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasFoo() {
     return ((bitField0_ & 0x00000001) != 0);
   }
@@ -55,15 +59,15 @@ private static final long serialVersionUID = 0L;
    * <code>optional string foo = 1;</code>
    * @return The foo.
    */
-  @Override
-  public String getFoo() {
-    Object ref = foo_;
-    if (ref instanceof String) {
-      return (String) ref;
+  @java.lang.Override
+  public java.lang.String getFoo() {
+    java.lang.Object ref = foo_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
-      String s = bs.toStringUtf8();
+      java.lang.String s = bs.toStringUtf8();
       if (bs.isValidUtf8()) {
         foo_ = s;
       }
@@ -74,14 +78,14 @@ private static final long serialVersionUID = 0L;
    * <code>optional string foo = 1;</code>
    * @return The bytes for foo.
    */
-  @Override
+  @java.lang.Override
   public com.google.protobuf.ByteString
       getFooBytes() {
-    Object ref = foo_;
-    if (ref instanceof String) {
+    java.lang.Object ref = foo_;
+    if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
-              (String) ref);
+              (java.lang.String) ref);
       foo_ = b;
       return b;
     } else {
@@ -90,12 +94,12 @@ private static final long serialVersionUID = 0L;
   }
 
   public static final int BLAH_FIELD_NUMBER = 2;
-  private SecondMsg blah_;
+  private org.springframework.protobuf.SecondMsg blah_;
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    * @return Whether the blah field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasBlah() {
     return ((bitField0_ & 0x00000002) != 0);
   }
@@ -103,20 +107,20 @@ private static final long serialVersionUID = 0L;
    * <code>optional .SecondMsg blah = 2;</code>
    * @return The blah.
    */
-  @Override
-  public SecondMsg getBlah() {
-    return blah_ == null ? SecondMsg.getDefaultInstance() : blah_;
+  @java.lang.Override
+  public org.springframework.protobuf.SecondMsg getBlah() {
+    return blah_ == null ? org.springframework.protobuf.SecondMsg.getDefaultInstance() : blah_;
   }
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  @Override
-  public SecondMsgOrBuilder getBlahOrBuilder() {
-    return blah_ == null ? SecondMsg.getDefaultInstance() : blah_;
+  @java.lang.Override
+  public org.springframework.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
+    return blah_ == null ? org.springframework.protobuf.SecondMsg.getDefaultInstance() : blah_;
   }
 
   private byte memoizedIsInitialized = -1;
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -126,11 +130,11 @@ private static final long serialVersionUID = 0L;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (((bitField0_ & 0x00000001) != 0)) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, foo_);
+      com.google.protobuf.GeneratedMessage.writeString(output, 1, foo_);
     }
     if (((bitField0_ & 0x00000002) != 0)) {
       output.writeMessage(2, getBlah());
@@ -138,14 +142,14 @@ private static final long serialVersionUID = 0L;
     getUnknownFields().writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
     if (((bitField0_ & 0x00000001) != 0)) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, foo_);
+      size += com.google.protobuf.GeneratedMessage.computeStringSize(1, foo_);
     }
     if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
@@ -156,15 +160,15 @@ private static final long serialVersionUID = 0L;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof Msg)) {
+    if (!(obj instanceof org.springframework.protobuf.Msg)) {
       return super.equals(obj);
     }
-    Msg other = (Msg) obj;
+    org.springframework.protobuf.Msg other = (org.springframework.protobuf.Msg) obj;
 
     if (hasFoo() != other.hasFoo()) return false;
     if (hasFoo()) {
@@ -180,7 +184,7 @@ private static final long serialVersionUID = 0L;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -200,95 +204,95 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static Msg parseFrom(byte[] data)
+  public static org.springframework.protobuf.Msg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static Msg parseFrom(java.io.InputStream input)
+  public static org.springframework.protobuf.Msg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static Msg parseDelimitedFrom(java.io.InputStream input)
+  public static org.springframework.protobuf.Msg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static Msg parseDelimitedFrom(
+  public static org.springframework.protobuf.Msg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(Msg prototype) {
+  public static Builder newBuilder(org.springframework.protobuf.Msg prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
+  @java.lang.Override
   protected Builder newBuilderForType(
-      BuilderParent parent) {
+      com.google.protobuf.GeneratedMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -296,20 +300,20 @@ private static final long serialVersionUID = 0L;
    * Protobuf type {@code Msg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:Msg)
-      MsgOrBuilder {
+      org.springframework.protobuf.MsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_Msg_fieldAccessorTable
+      return org.springframework.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              Msg.class, Builder.class);
+              org.springframework.protobuf.Msg.class, org.springframework.protobuf.Msg.Builder.class);
     }
 
     // Construct using org.springframework.protobuf.Msg.newBuilder()
@@ -318,17 +322,17 @@ private static final long serialVersionUID = 0L;
     }
 
     private Builder(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
+      if (com.google.protobuf.GeneratedMessage
               .alwaysUseFieldBuilders) {
         getBlahFieldBuilder();
       }
     }
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
@@ -341,35 +345,35 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
-    @Override
-    public Msg getDefaultInstanceForType() {
-      return Msg.getDefaultInstance();
+    @java.lang.Override
+    public org.springframework.protobuf.Msg getDefaultInstanceForType() {
+      return org.springframework.protobuf.Msg.getDefaultInstance();
     }
 
-    @Override
-    public Msg build() {
-      Msg result = buildPartial();
+    @java.lang.Override
+    public org.springframework.protobuf.Msg build() {
+      org.springframework.protobuf.Msg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public Msg buildPartial() {
-      Msg result = new Msg(this);
+    @java.lang.Override
+    public org.springframework.protobuf.Msg buildPartial() {
+      org.springframework.protobuf.Msg result = new org.springframework.protobuf.Msg(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(Msg result) {
+    private void buildPartial0(org.springframework.protobuf.Msg result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -385,50 +389,18 @@ private static final long serialVersionUID = 0L;
       result.bitField0_ |= to_bitField0_;
     }
 
-    @Override
-    public Builder clone() {
-      return super.clone();
-    }
-    @Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
-      return super.setField(field, value);
-    }
-    @Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return super.clearField(field);
-    }
-    @Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return super.clearOneof(oneof);
-    }
-    @Override
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
-      return super.setRepeatedField(field, index, value);
-    }
-    @Override
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
-      return super.addRepeatedField(field, value);
-    }
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Msg) {
-        return mergeFrom((Msg)other);
+      if (other instanceof org.springframework.protobuf.Msg) {
+        return mergeFrom((org.springframework.protobuf.Msg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Msg other) {
-      if (other == Msg.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.springframework.protobuf.Msg other) {
+      if (other == org.springframework.protobuf.Msg.getDefaultInstance()) return this;
       if (other.hasFoo()) {
         foo_ = other.foo_;
         bitField0_ |= 0x00000001;
@@ -442,18 +414,18 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       try {
         boolean done = false;
@@ -492,7 +464,7 @@ private static final long serialVersionUID = 0L;
     }
     private int bitField0_;
 
-    private Object foo_ = "";
+    private java.lang.Object foo_ = "";
     /**
      * <code>optional string foo = 1;</code>
      * @return Whether the foo field is set.
@@ -504,18 +476,18 @@ private static final long serialVersionUID = 0L;
      * <code>optional string foo = 1;</code>
      * @return The foo.
      */
-    public String getFoo() {
-      Object ref = foo_;
-      if (!(ref instanceof String)) {
+    public java.lang.String getFoo() {
+      java.lang.Object ref = foo_;
+      if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
+        java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
           foo_ = s;
         }
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
@@ -524,11 +496,11 @@ private static final long serialVersionUID = 0L;
      */
     public com.google.protobuf.ByteString
         getFooBytes() {
-      Object ref = foo_;
+      java.lang.Object ref = foo_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
-                (String) ref);
+                (java.lang.String) ref);
         foo_ = b;
         return b;
       } else {
@@ -541,7 +513,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setFoo(
-        String value) {
+        java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       foo_ = value;
       bitField0_ |= 0x00000001;
@@ -572,9 +544,9 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private SecondMsg blah_;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder> blahBuilder_;
+    private org.springframework.protobuf.SecondMsg blah_;
+    private com.google.protobuf.SingleFieldBuilder<
+        org.springframework.protobuf.SecondMsg, org.springframework.protobuf.SecondMsg.Builder, org.springframework.protobuf.SecondMsgOrBuilder> blahBuilder_;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      * @return Whether the blah field is set.
@@ -586,9 +558,9 @@ private static final long serialVersionUID = 0L;
      * <code>optional .SecondMsg blah = 2;</code>
      * @return The blah.
      */
-    public SecondMsg getBlah() {
+    public org.springframework.protobuf.SecondMsg getBlah() {
       if (blahBuilder_ == null) {
-        return blah_ == null ? SecondMsg.getDefaultInstance() : blah_;
+        return blah_ == null ? org.springframework.protobuf.SecondMsg.getDefaultInstance() : blah_;
       } else {
         return blahBuilder_.getMessage();
       }
@@ -596,7 +568,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder setBlah(SecondMsg value) {
+    public Builder setBlah(org.springframework.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -613,7 +585,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .SecondMsg blah = 2;</code>
      */
     public Builder setBlah(
-        SecondMsg.Builder builderForValue) {
+        org.springframework.protobuf.SecondMsg.Builder builderForValue) {
       if (blahBuilder_ == null) {
         blah_ = builderForValue.build();
       } else {
@@ -626,11 +598,11 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder mergeBlah(SecondMsg value) {
+    public Builder mergeBlah(org.springframework.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
         if (((bitField0_ & 0x00000002) != 0) &&
           blah_ != null &&
-          blah_ != SecondMsg.getDefaultInstance()) {
+          blah_ != org.springframework.protobuf.SecondMsg.getDefaultInstance()) {
           getBlahBuilder().mergeFrom(value);
         } else {
           blah_ = value;
@@ -660,7 +632,7 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsg.Builder getBlahBuilder() {
+    public org.springframework.protobuf.SecondMsg.Builder getBlahBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getBlahFieldBuilder().getBuilder();
@@ -668,23 +640,23 @@ private static final long serialVersionUID = 0L;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsgOrBuilder getBlahOrBuilder() {
+    public org.springframework.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
       if (blahBuilder_ != null) {
         return blahBuilder_.getMessageOrBuilder();
       } else {
         return blah_ == null ?
-            SecondMsg.getDefaultInstance() : blah_;
+            org.springframework.protobuf.SecondMsg.getDefaultInstance() : blah_;
       }
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder>
+    private com.google.protobuf.SingleFieldBuilder<
+        org.springframework.protobuf.SecondMsg, org.springframework.protobuf.SecondMsg.Builder, org.springframework.protobuf.SecondMsgOrBuilder> 
         getBlahFieldBuilder() {
       if (blahBuilder_ == null) {
-        blahBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder>(
+        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+            org.springframework.protobuf.SecondMsg, org.springframework.protobuf.SecondMsg.Builder, org.springframework.protobuf.SecondMsgOrBuilder>(
                 getBlah(),
                 getParentForChildren(),
                 isClean());
@@ -692,35 +664,23 @@ private static final long serialVersionUID = 0L;
       }
       return blahBuilder_;
     }
-    @Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFields(unknownFields);
-    }
-
-    @Override
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
 
     // @@protoc_insertion_point(builder_scope:Msg)
   }
 
   // @@protoc_insertion_point(class_scope:Msg)
-  private static final Msg DEFAULT_INSTANCE;
+  private static final org.springframework.protobuf.Msg DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new Msg();
+    DEFAULT_INSTANCE = new org.springframework.protobuf.Msg();
   }
 
-  public static Msg getDefaultInstance() {
+  public static org.springframework.protobuf.Msg getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  @Deprecated public static final com.google.protobuf.Parser<Msg>
+  private static final com.google.protobuf.Parser<Msg>
       PARSER = new com.google.protobuf.AbstractParser<Msg>() {
-    @Override
+    @java.lang.Override
     public Msg parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -744,13 +704,13 @@ private static final long serialVersionUID = 0L;
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser<Msg> getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public Msg getDefaultInstanceForType() {
+  @java.lang.Override
+  public org.springframework.protobuf.Msg getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

spring-web/src/test/java/org/springframework/protobuf/MsgOrBuilder.java

@@ -1,5 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
 // source: sample.proto
+// Protobuf Java Version: 4.27.0
 
 package org.springframework.protobuf;
 
@@ -16,7 +18,7 @@ public interface MsgOrBuilder extends
    * <code>optional string foo = 1;</code>
    * @return The foo.
    */
-  String getFoo();
+  java.lang.String getFoo();
   /**
    * <code>optional string foo = 1;</code>
    * @return The bytes for foo.
@@ -33,9 +35,9 @@ public interface MsgOrBuilder extends
    * <code>optional .SecondMsg blah = 2;</code>
    * @return The blah.
    */
-  SecondMsg getBlah();
+  org.springframework.protobuf.SecondMsg getBlah();
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  SecondMsgOrBuilder getBlahOrBuilder();
+  org.springframework.protobuf.SecondMsgOrBuilder getBlahOrBuilder();
 }

spring-web/src/test/java/org/springframework/protobuf/OuterSample.java

@@ -1,26 +1,21 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
 // source: sample.proto
+// Protobuf Java Version: 4.27.0
 
 package org.springframework.protobuf;
 
 public final class OuterSample {
   private OuterSample() {}
+  static {
+    com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 27,
+      /* patch= */ 0,
+      /* suffix= */ "",
+      OuterSample.class.getName());
+  }
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
@@ -33,12 +28,12 @@ public final class OuterSample {
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_Msg_descriptor;
   static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Msg_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_SecondMsg_descriptor;
   static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_SecondMsg_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
@@ -48,7 +43,7 @@ public final class OuterSample {
   private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    String[] descriptorData = {
+    java.lang.String[] descriptorData = {
       "\n\014sample.proto\",\n\003Msg\022\013\n\003foo\030\001 \001(\t\022\030\n\004bl" +
       "ah\030\002 \001(\0132\n.SecondMsg\"\031\n\tSecondMsg\022\014\n\004bla" +
       "h\030\001 \001(\005B-\n\034org.springframework.protobufB" +
@@ -61,15 +56,16 @@ public final class OuterSample {
     internal_static_Msg_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Msg_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_Msg_descriptor,
-        new String[] { "Foo", "Blah", });
+        new java.lang.String[] { "Foo", "Blah", });
     internal_static_SecondMsg_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_SecondMsg_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_SecondMsg_descriptor,
-        new String[] { "Blah", });
+        new java.lang.String[] { "Blah", });
+    descriptor.resolveAllFeaturesImmutable();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java

@@ -1,5 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
 // source: sample.proto
+// Protobuf Java Version: 4.27.0
 
 package org.springframework.protobuf;
 
@@ -7,35 +9,37 @@ package org.springframework.protobuf;
  * Protobuf type {@code SecondMsg}
  */
 public final class SecondMsg extends
-    com.google.protobuf.GeneratedMessageV3 implements
+    com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:SecondMsg)
     SecondMsgOrBuilder {
 private static final long serialVersionUID = 0L;
+  static {
+    com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
+      com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
+      /* major= */ 4,
+      /* minor= */ 27,
+      /* patch= */ 0,
+      /* suffix= */ "",
+      SecondMsg.class.getName());
+  }
   // Use SecondMsg.newBuilder() to construct.
-  private SecondMsg(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+  private SecondMsg(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
     super(builder);
   }
   private SecondMsg() {
   }
 
-  @Override
-  @SuppressWarnings({"unused"})
-  protected Object newInstance(
-      UnusedPrivateParameter unused) {
-    return new SecondMsg();
-  }
-
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_SecondMsg_descriptor;
+    return org.springframework.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
   }
 
-  @Override
-  protected FieldAccessorTable
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_SecondMsg_fieldAccessorTable
+    return org.springframework.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            SecondMsg.class, Builder.class);
+            org.springframework.protobuf.SecondMsg.class, org.springframework.protobuf.SecondMsg.Builder.class);
   }
 
   private int bitField0_;
@@ -45,7 +49,7 @@ private static final long serialVersionUID = 0L;
    * <code>optional int32 blah = 1;</code>
    * @return Whether the blah field is set.
    */
-  @Override
+  @java.lang.Override
   public boolean hasBlah() {
     return ((bitField0_ & 0x00000001) != 0);
   }
@@ -53,13 +57,13 @@ private static final long serialVersionUID = 0L;
    * <code>optional int32 blah = 1;</code>
    * @return The blah.
    */
-  @Override
+  @java.lang.Override
   public int getBlah() {
     return blah_;
   }
 
   private byte memoizedIsInitialized = -1;
-  @Override
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -69,7 +73,7 @@ private static final long serialVersionUID = 0L;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (((bitField0_ & 0x00000001) != 0)) {
@@ -78,7 +82,7 @@ private static final long serialVersionUID = 0L;
     getUnknownFields().writeTo(output);
   }
 
-  @Override
+  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -93,15 +97,15 @@ private static final long serialVersionUID = 0L;
     return size;
   }
 
-  @Override
-  public boolean equals(final Object obj) {
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof SecondMsg)) {
+    if (!(obj instanceof org.springframework.protobuf.SecondMsg)) {
       return super.equals(obj);
     }
-    SecondMsg other = (SecondMsg) obj;
+    org.springframework.protobuf.SecondMsg other = (org.springframework.protobuf.SecondMsg) obj;
 
     if (hasBlah() != other.hasBlah()) return false;
     if (hasBlah()) {
@@ -112,7 +116,7 @@ private static final long serialVersionUID = 0L;
     return true;
   }
 
-  @Override
+  @java.lang.Override
   public int hashCode() {
     if (memoizedHashCode != 0) {
       return memoizedHashCode;
@@ -128,95 +132,95 @@ private static final long serialVersionUID = 0L;
     return hash;
   }
 
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static SecondMsg parseFrom(byte[] data)
+  public static org.springframework.protobuf.SecondMsg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static SecondMsg parseFrom(java.io.InputStream input)
+  public static org.springframework.protobuf.SecondMsg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static SecondMsg parseDelimitedFrom(java.io.InputStream input)
+  public static org.springframework.protobuf.SecondMsg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseDelimitedWithIOException(PARSER, input);
   }
 
-  public static SecondMsg parseDelimitedFrom(
+  public static org.springframework.protobuf.SecondMsg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
+    return com.google.protobuf.GeneratedMessage
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @Override
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(SecondMsg prototype) {
+  public static Builder newBuilder(org.springframework.protobuf.SecondMsg prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @Override
+  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
   }
 
-  @Override
+  @java.lang.Override
   protected Builder newBuilderForType(
-      BuilderParent parent) {
+      com.google.protobuf.GeneratedMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
@@ -224,20 +228,20 @@ private static final long serialVersionUID = 0L;
    * Protobuf type {@code SecondMsg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
       // @@protoc_insertion_point(builder_implements:SecondMsg)
-      SecondMsgOrBuilder {
+      org.springframework.protobuf.SecondMsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
-    @Override
-    protected FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_SecondMsg_fieldAccessorTable
+      return org.springframework.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              SecondMsg.class, Builder.class);
+              org.springframework.protobuf.SecondMsg.class, org.springframework.protobuf.SecondMsg.Builder.class);
     }
 
     // Construct using org.springframework.protobuf.SecondMsg.newBuilder()
@@ -246,11 +250,11 @@ private static final long serialVersionUID = 0L;
     }
 
     private Builder(
-        BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       super(parent);
 
     }
-    @Override
+    @java.lang.Override
     public Builder clear() {
       super.clear();
       bitField0_ = 0;
@@ -258,35 +262,35 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
-    @Override
-    public SecondMsg getDefaultInstanceForType() {
-      return SecondMsg.getDefaultInstance();
+    @java.lang.Override
+    public org.springframework.protobuf.SecondMsg getDefaultInstanceForType() {
+      return org.springframework.protobuf.SecondMsg.getDefaultInstance();
     }
 
-    @Override
-    public SecondMsg build() {
-      SecondMsg result = buildPartial();
+    @java.lang.Override
+    public org.springframework.protobuf.SecondMsg build() {
+      org.springframework.protobuf.SecondMsg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
-    public SecondMsg buildPartial() {
-      SecondMsg result = new SecondMsg(this);
+    @java.lang.Override
+    public org.springframework.protobuf.SecondMsg buildPartial() {
+      org.springframework.protobuf.SecondMsg result = new org.springframework.protobuf.SecondMsg(this);
       if (bitField0_ != 0) { buildPartial0(result); }
       onBuilt();
       return result;
     }
 
-    private void buildPartial0(SecondMsg result) {
+    private void buildPartial0(org.springframework.protobuf.SecondMsg result) {
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -296,50 +300,18 @@ private static final long serialVersionUID = 0L;
       result.bitField0_ |= to_bitField0_;
     }
 
-    @Override
-    public Builder clone() {
-      return super.clone();
-    }
-    @Override
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
-      return super.setField(field, value);
-    }
-    @Override
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return super.clearField(field);
-    }
-    @Override
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return super.clearOneof(oneof);
-    }
-    @Override
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
-      return super.setRepeatedField(field, index, value);
-    }
-    @Override
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
-      return super.addRepeatedField(field, value);
-    }
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof SecondMsg) {
-        return mergeFrom((SecondMsg)other);
+      if (other instanceof org.springframework.protobuf.SecondMsg) {
+        return mergeFrom((org.springframework.protobuf.SecondMsg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(SecondMsg other) {
-      if (other == SecondMsg.getDefaultInstance()) return this;
+    public Builder mergeFrom(org.springframework.protobuf.SecondMsg other) {
+      if (other == org.springframework.protobuf.SecondMsg.getDefaultInstance()) return this;
       if (other.hasBlah()) {
         setBlah(other.getBlah());
       }
@@ -348,18 +320,18 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    @Override
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @Override
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       if (extensionRegistry == null) {
-        throw new NullPointerException();
+        throw new java.lang.NullPointerException();
       }
       try {
         boolean done = false;
@@ -396,7 +368,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional int32 blah = 1;</code>
      * @return Whether the blah field is set.
      */
-    @Override
+    @java.lang.Override
     public boolean hasBlah() {
       return ((bitField0_ & 0x00000001) != 0);
     }
@@ -404,7 +376,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional int32 blah = 1;</code>
      * @return The blah.
      */
-    @Override
+    @java.lang.Override
     public int getBlah() {
       return blah_;
     }
@@ -430,35 +402,23 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
-    @Override
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFields(unknownFields);
-    }
-
-    @Override
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
 
     // @@protoc_insertion_point(builder_scope:SecondMsg)
   }
 
   // @@protoc_insertion_point(class_scope:SecondMsg)
-  private static final SecondMsg DEFAULT_INSTANCE;
+  private static final org.springframework.protobuf.SecondMsg DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new SecondMsg();
+    DEFAULT_INSTANCE = new org.springframework.protobuf.SecondMsg();
   }
 
-  public static SecondMsg getDefaultInstance() {
+  public static org.springframework.protobuf.SecondMsg getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  @Deprecated public static final com.google.protobuf.Parser<SecondMsg>
+  private static final com.google.protobuf.Parser<SecondMsg>
       PARSER = new com.google.protobuf.AbstractParser<SecondMsg>() {
-    @Override
+    @java.lang.Override
     public SecondMsg parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -482,13 +442,13 @@ private static final long serialVersionUID = 0L;
     return PARSER;
   }
 
-  @Override
+  @java.lang.Override
   public com.google.protobuf.Parser<SecondMsg> getParserForType() {
     return PARSER;
   }
 
-  @Override
-  public SecondMsg getDefaultInstanceForType() {
+  @java.lang.Override
+  public org.springframework.protobuf.SecondMsg getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 

spring-web/src/test/java/org/springframework/protobuf/SecondMsgOrBuilder.java

@@ -1,5 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// NO CHECKED-IN PROTOBUF GENCODE
 // source: sample.proto
+// Protobuf Java Version: 4.27.0
 
 package org.springframework.protobuf;