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

framework-platform/framework-platform.gradle

@@ -31,7 +31,7 @@ dependencies {
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.10.1")
-		api("com.google.protobuf:protobuf-java-util:3.25.3")
+		api("com.google.protobuf:protobuf-java-util:4.27.1")
 		api("com.h2database:h2:2.2.224")
 		api("com.jayway.jsonpath:json-path:2.9.0")
 		api("com.rometools:rome:1.19.0")

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

@@ -1,147 +1,65 @@
-/*
- * Copyright 2002-2022 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.messaging.protobuf;
 
 /**
  * Protobuf type {@code Msg}
  */
-@SuppressWarnings("serial")
 public final class Msg extends
-    com.google.protobuf.GeneratedMessage
+    com.google.protobuf.GeneratedMessage implements
-    implements MsgOrBuilder {
+    // @@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.GeneratedMessage.Builder<?> builder) {
     super(builder);
-    this.unknownFields = builder.getUnknownFields();
   }
-  private Msg(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+  private Msg() {
-
+    foo_ = "";
-  private static final Msg defaultInstance;
-  public static Msg getDefaultInstance() {
-    return defaultInstance;
   }
 
-  public Msg getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private final com.google.protobuf.UnknownFieldSet unknownFields;
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Msg(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    initFields();
-    @SuppressWarnings("unused")
-	int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            bitField0_ |= 0x00000001;
-            foo_ = input.readBytes();
-            break;
-          }
-          case 18: {
-            SecondMsg.Builder subBuilder = null;
-            if (((bitField0_ & 0x00000002) == 0x00000002)) {
-              subBuilder = blah_.toBuilder();
-            }
-            blah_ = input.readMessage(SecondMsg.PARSER, extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(blah_);
-              blah_ = subBuilder.buildPartial();
-            }
-            bitField0_ |= 0x00000002;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e.getMessage()).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_Msg_descriptor;
+    return org.springframework.messaging.protobuf.OuterSample.internal_static_Msg_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_Msg_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            Msg.class, Msg.Builder.class);
-  }
-
-  public static com.google.protobuf.Parser<Msg> PARSER =
-      new com.google.protobuf.AbstractParser<Msg>() {
-    public Msg parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Msg(input, extensionRegistry);
-    }
-  };
-
   @java.lang.Override
-  public com.google.protobuf.Parser<Msg> getParserForType() {
+  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-    return PARSER;
+      internalGetFieldAccessorTable() {
+    return org.springframework.messaging.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.springframework.messaging.protobuf.Msg.class, org.springframework.messaging.protobuf.Msg.Builder.class);
   }
 
   private int bitField0_;
-  // optional string foo = 1;
   public static final int FOO_FIELD_NUMBER = 1;
-  private java.lang.Object foo_;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object foo_ = "";
   /**
    * <code>optional string foo = 1;</code>
+   * @return Whether the foo field is set.
    */
+  @java.lang.Override
   public boolean hasFoo() {
-    return ((bitField0_ & 0x00000001) == 0x00000001);
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>optional string foo = 1;</code>
+   * @return The foo.
    */
+  @java.lang.Override
   public java.lang.String getFoo() {
     java.lang.Object ref = foo_;
     if (ref instanceof java.lang.String) {
@@ -158,7 +76,9 @@ public  final class Msg extends
   }
   /**
    * <code>optional string foo = 1;</code>
+   * @return The bytes for foo.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString
       getFooBytes() {
     java.lang.Object ref = foo_;
@@ -173,138 +93,202 @@ public  final class Msg extends
     }
   }
 
-  // optional .SecondMsg blah = 2;
   public static final int BLAH_FIELD_NUMBER = 2;
-  private SecondMsg blah_;
+  private org.springframework.messaging.protobuf.SecondMsg blah_;
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return Whether the blah field is set.
    */
+  @java.lang.Override
   public boolean hasBlah() {
-    return ((bitField0_ & 0x00000002) == 0x00000002);
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   * <code>optional .SecondMsg blah = 2;</code>
+   * @return The blah.
+   */
+  @java.lang.Override
+  public org.springframework.messaging.protobuf.SecondMsg getBlah() {
+    return blah_ == null ? org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance() : blah_;
   }
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  public SecondMsg getBlah() {
+  @java.lang.Override
-    return blah_;
+  public org.springframework.messaging.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
-  }
+    return blah_ == null ? org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance() : blah_;
-  /**
-   * <code>optional .SecondMsg blah = 2;</code>
-   */
-  public SecondMsgOrBuilder getBlahOrBuilder() {
-    return blah_;
   }
 
-  private void initFields() {
-    foo_ = "";
-    blah_ = SecondMsg.getDefaultInstance();
-  }
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
-    if (isInitialized != -1) return isInitialized == 1;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
 
     memoizedIsInitialized = 1;
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    getSerializedSize();
+    if (((bitField0_ & 0x00000001) != 0)) {
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+      com.google.protobuf.GeneratedMessage.writeString(output, 1, foo_);
-      output.writeBytes(1, getFooBytes());
     }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
-      output.writeMessage(2, blah_);
+      output.writeMessage(2, getBlah());
     }
     getUnknownFields().writeTo(output);
   }
 
-  private int memoizedSerializedSize = -1;
+  @java.lang.Override
   public int getSerializedSize() {
-    int size = memoizedSerializedSize;
+    int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
+      size += com.google.protobuf.GeneratedMessage.computeStringSize(1, foo_);
-        .computeBytesSize(1, getFooBytes());
     }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, blah_);
+        .computeMessageSize(2, getBlah());
     }
     size += getUnknownFields().getSerializedSize();
-    memoizedSerializedSize = size;
+    memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
-  protected java.lang.Object writeReplace()
+  public boolean equals(final java.lang.Object obj) {
-      throws java.io.ObjectStreamException {
+    if (obj == this) {
-    return super.writeReplace();
+     return true;
+    }
+    if (!(obj instanceof org.springframework.messaging.protobuf.Msg)) {
+      return super.equals(obj);
+    }
+    org.springframework.messaging.protobuf.Msg other = (org.springframework.messaging.protobuf.Msg) obj;
+
+    if (hasFoo() != other.hasFoo()) return false;
+    if (hasFoo()) {
+      if (!getFoo()
+          .equals(other.getFoo())) return false;
+    }
+    if (hasBlah() != other.hasBlah()) return false;
+    if (hasBlah()) {
+      if (!getBlah()
+          .equals(other.getBlah())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
   }
 
-  public static Msg parseFrom(
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasFoo()) {
+      hash = (37 * hash) + FOO_FIELD_NUMBER;
+      hash = (53 * hash) + getFoo().hashCode();
+    }
+    if (hasBlah()) {
+      hash = (37 * hash) + BLAH_FIELD_NUMBER;
+      hash = (53 * hash) + getBlah().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.springframework.messaging.protobuf.Msg parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.springframework.messaging.protobuf.Msg parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.springframework.messaging.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.messaging.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.messaging.protobuf.Msg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static Msg parseFrom(
+  public static org.springframework.messaging.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.messaging.protobuf.Msg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.messaging.protobuf.Msg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static Msg parseDelimitedFrom(java.io.InputStream input)
+
+  public static org.springframework.messaging.protobuf.Msg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input);
   }
-  public static Msg parseDelimitedFrom(
+
+  public static org.springframework.messaging.protobuf.Msg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static Msg parseFrom(
+  public static org.springframework.messaging.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.messaging.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static Builder newBuilder() { return Builder.create(); }
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder(Msg prototype) {
+  public static Builder newBuilder() {
-    return newBuilder().mergeFrom(prototype);
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.springframework.messaging.protobuf.Msg prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
-  public Builder toBuilder() { return newBuilder(this); }
 
   @java.lang.Override
   protected Builder newBuilderForType(
@@ -316,18 +300,20 @@ public  final class Msg extends
    * Protobuf type {@code Msg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessage.Builder<Builder>
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-     implements MsgOrBuilder {
+      // @@protoc_insertion_point(builder_implements:Msg)
+      org.springframework.messaging.protobuf.MsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_Msg_fieldAccessorTable
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              Msg.class, Msg.Builder.class);
+              org.springframework.messaging.protobuf.Msg.class, org.springframework.messaging.protobuf.Msg.Builder.class);
     }
 
     // Construct using org.springframework.messaging.protobuf.Msg.newBuilder()
@@ -341,132 +327,164 @@ public  final class Msg extends
       maybeForceBuilderInitialization();
     }
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessage
+              .alwaysUseFieldBuilders) {
         getBlahFieldBuilder();
       }
     }
-    private static Builder create() {
+    @java.lang.Override
-      return new Builder();
-    }
-
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       foo_ = "";
-      bitField0_ = (bitField0_ & ~0x00000001);
+      blah_ = null;
-      if (blahBuilder_ == null) {
+      if (blahBuilder_ != null) {
-        blah_ = SecondMsg.getDefaultInstance();
+        blahBuilder_.dispose();
-      } else {
+        blahBuilder_ = null;
-        blahBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
-    public Builder clone() {
+    @java.lang.Override
-      return create().mergeFrom(buildPartial());
-    }
-
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
-    public Msg getDefaultInstanceForType() {
+    @java.lang.Override
-      return Msg.getDefaultInstance();
+    public org.springframework.messaging.protobuf.Msg getDefaultInstanceForType() {
+      return org.springframework.messaging.protobuf.Msg.getDefaultInstance();
     }
 
-    public Msg build() {
+    @java.lang.Override
-      Msg result = buildPartial();
+    public org.springframework.messaging.protobuf.Msg build() {
+      org.springframework.messaging.protobuf.Msg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public Msg buildPartial() {
+    @java.lang.Override
-      Msg result = new Msg(this);
+    public org.springframework.messaging.protobuf.Msg buildPartial() {
-      int from_bitField0_ = bitField0_;
+      org.springframework.messaging.protobuf.Msg result = new org.springframework.messaging.protobuf.Msg(this);
-      int to_bitField0_ = 0;
+      if (bitField0_ != 0) { buildPartial0(result); }
-      if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-        to_bitField0_ |= 0x00000001;
-      }
-      result.foo_ = foo_;
-      if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-        to_bitField0_ |= 0x00000002;
-      }
-      if (blahBuilder_ == null) {
-        result.blah_ = blah_;
-      } else {
-        result.blah_ = blahBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(org.springframework.messaging.protobuf.Msg result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.foo_ = foo_;
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.blah_ = blahBuilder_ == null
+            ? blah_
+            : blahBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Msg) {
+      if (other instanceof org.springframework.messaging.protobuf.Msg) {
-        return mergeFrom((Msg)other);
+        return mergeFrom((org.springframework.messaging.protobuf.Msg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Msg other) {
+    public Builder mergeFrom(org.springframework.messaging.protobuf.Msg other) {
-      if (other == Msg.getDefaultInstance()) return this;
+      if (other == org.springframework.messaging.protobuf.Msg.getDefaultInstance()) return this;
       if (other.hasFoo()) {
-        bitField0_ |= 0x00000001;
         foo_ = other.foo_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasBlah()) {
         mergeBlah(other.getBlah());
       }
       this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Msg parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              foo_ = input.readBytes();
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 10
+            case 18: {
+              input.readMessage(
+                  getBlahFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000002;
+              break;
+            } // case 18
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Msg) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
-        throw e;
       } finally {
-        if (parsedMessage != null) {
+        onChanged();
-          mergeFrom(parsedMessage);
+      } // finally
-        }
-      }
       return this;
     }
     private int bitField0_;
 
-    // optional string foo = 1;
     private java.lang.Object foo_ = "";
     /**
      * <code>optional string foo = 1;</code>
+     * @return Whether the foo field is set.
      */
     public boolean hasFoo() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return The foo.
      */
     public java.lang.String getFoo() {
       java.lang.Object ref = foo_;
       if (!(ref instanceof java.lang.String)) {
-        java.lang.String s = ((com.google.protobuf.ByteString) ref)
+        com.google.protobuf.ByteString bs =
-            .toStringUtf8();
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           foo_ = s;
+        }
         return s;
       } else {
         return (java.lang.String) ref;
@@ -474,6 +492,7 @@ public  final class Msg extends
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return The bytes for foo.
      */
     public com.google.protobuf.ByteString
         getFooBytes() {
@@ -490,57 +509,58 @@ public  final class Msg extends
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @param value The foo to set.
+     * @return This builder for chaining.
      */
     public Builder setFoo(
         java.lang.String value) {
-      if (value == null) {
+      if (value == null) { throw new NullPointerException(); }
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
       foo_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearFoo() {
-      bitField0_ = (bitField0_ & ~0x00000001);
       foo_ = getDefaultInstance().getFoo();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @param value The bytes for foo to set.
+     * @return This builder for chaining.
      */
     public Builder setFooBytes(
         com.google.protobuf.ByteString value) {
-      if (value == null) {
+      if (value == null) { throw new NullPointerException(); }
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
       foo_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    // optional .SecondMsg blah = 2;
+    private org.springframework.messaging.protobuf.SecondMsg blah_;
-    private SecondMsg blah_ = SecondMsg.getDefaultInstance();
     private com.google.protobuf.SingleFieldBuilder<
-			SecondMsg, SecondMsg.Builder,
+        org.springframework.messaging.protobuf.SecondMsg, org.springframework.messaging.protobuf.SecondMsg.Builder, org.springframework.messaging.protobuf.SecondMsgOrBuilder> blahBuilder_;
-			SecondMsgOrBuilder> blahBuilder_;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
+     * @return Whether the blah field is set.
      */
     public boolean hasBlah() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
+     * @return The blah.
      */
-    public SecondMsg getBlah() {
+    public org.springframework.messaging.protobuf.SecondMsg getBlah() {
       if (blahBuilder_ == null) {
-        return blah_;
+        return blah_ == null ? org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance() : blah_;
       } else {
         return blahBuilder_.getMessage();
       }
@@ -548,69 +568,71 @@ public  final class Msg extends
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder setBlah(SecondMsg value) {
+    public Builder setBlah(org.springframework.messaging.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
         }
         blah_ = value;
-        onChanged();
       } else {
         blahBuilder_.setMessage(value);
       }
       bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     public Builder setBlah(
-        SecondMsg.Builder builderForValue) {
+        org.springframework.messaging.protobuf.SecondMsg.Builder builderForValue) {
       if (blahBuilder_ == null) {
         blah_ = builderForValue.build();
-        onChanged();
       } else {
         blahBuilder_.setMessage(builderForValue.build());
       }
       bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder mergeBlah(SecondMsg value) {
+    public Builder mergeBlah(org.springframework.messaging.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002) &&
+        if (((bitField0_ & 0x00000002) != 0) &&
-            blah_ != SecondMsg.getDefaultInstance()) {
+          blah_ != null &&
-          blah_ =
+          blah_ != org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance()) {
-            SecondMsg.newBuilder(blah_).mergeFrom(value).buildPartial();
+          getBlahBuilder().mergeFrom(value);
         } else {
           blah_ = value;
         }
-        onChanged();
       } else {
         blahBuilder_.mergeFrom(value);
       }
+      if (blah_ != null) {
         bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     public Builder clearBlah() {
-      if (blahBuilder_ == null) {
-        blah_ = SecondMsg.getDefaultInstance();
-        onChanged();
-      } else {
-        blahBuilder_.clear();
-      }
       bitField0_ = (bitField0_ & ~0x00000002);
+      blah_ = null;
+      if (blahBuilder_ != null) {
+        blahBuilder_.dispose();
+        blahBuilder_ = null;
+      }
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsg.Builder getBlahBuilder() {
+    public org.springframework.messaging.protobuf.SecondMsg.Builder getBlahBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getBlahFieldBuilder().getBuilder();
@@ -618,23 +640,24 @@ public  final class Msg extends
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsgOrBuilder getBlahOrBuilder() {
+    public org.springframework.messaging.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
       if (blahBuilder_ != null) {
         return blahBuilder_.getMessageOrBuilder();
       } else {
-        return blah_;
+        return blah_ == null ?
+            org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance() : blah_;
       }
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilder<
-			SecondMsg, SecondMsg.Builder,
+        org.springframework.messaging.protobuf.SecondMsg, org.springframework.messaging.protobuf.SecondMsg.Builder, org.springframework.messaging.protobuf.SecondMsgOrBuilder> 
-			SecondMsgOrBuilder>
         getBlahFieldBuilder() {
       if (blahBuilder_ == null) {
-        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<>(
+        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-				blah_,
+            org.springframework.messaging.protobuf.SecondMsg, org.springframework.messaging.protobuf.SecondMsg.Builder, org.springframework.messaging.protobuf.SecondMsgOrBuilder>(
+                getBlah(),
                 getParentForChildren(),
                 isClean());
         blah_ = null;
@@ -645,11 +668,51 @@ public  final class Msg extends
     // @@protoc_insertion_point(builder_scope:Msg)
   }
 
-  static {
-    defaultInstance = new Msg(true);
-    defaultInstance.initFields();
-  }
-
   // @@protoc_insertion_point(class_scope:Msg)
+  private static final org.springframework.messaging.protobuf.Msg DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.springframework.messaging.protobuf.Msg();
+  }
+
+  public static org.springframework.messaging.protobuf.Msg getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Msg>
+      PARSER = new com.google.protobuf.AbstractParser<Msg>() {
+    @java.lang.Override
+    public Msg parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser<Msg> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Msg> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.springframework.messaging.protobuf.Msg getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
 }
 

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

@@ -1,37 +1,43 @@
 // 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.messaging.protobuf;
 
-public interface MsgOrBuilder
+public interface MsgOrBuilder extends
-    extends com.google.protobuf.MessageOrBuilder {
+    // @@protoc_insertion_point(interface_extends:Msg)
+    com.google.protobuf.MessageOrBuilder {
 
-  // optional string foo = 1;
   /**
    * <code>optional string foo = 1;</code>
+   * @return Whether the foo field is set.
    */
   boolean hasFoo();
   /**
    * <code>optional string foo = 1;</code>
+   * @return The foo.
    */
   java.lang.String getFoo();
   /**
    * <code>optional string foo = 1;</code>
+   * @return The bytes for foo.
    */
   com.google.protobuf.ByteString
       getFooBytes();
 
-  // optional .SecondMsg blah = 2;
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return Whether the blah field is set.
    */
   boolean hasBlah();
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return The blah.
    */
-  SecondMsg getBlah();
+  org.springframework.messaging.protobuf.SecondMsg getBlah();
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  SecondMsgOrBuilder getBlahOrBuilder();
+  org.springframework.messaging.protobuf.SecondMsgOrBuilder getBlahOrBuilder();
 }

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

@@ -1,38 +1,38 @@
-/*
- * 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.messaging.protobuf;
 
-@SuppressWarnings("deprecation")
+public final class OuterSample {
-public 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) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  static com.google.protobuf.Descriptors.Descriptor
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_Msg_descriptor;
-  static
+  static final 
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Msg_fieldAccessorTable;
-  static com.google.protobuf.Descriptors.Descriptor
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_SecondMsg_descriptor;
-  static
+  static final 
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_SecondMsg_fieldAccessorTable;
 
@@ -46,14 +46,13 @@ public class OuterSample {
     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" +
+      "h\030\001 \001(\005B7\n&org.springframework.messaging" +
-      "\013OuterSampleP\001"
+      ".protobufB\013OuterSampleP\001"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+      .internalBuildGeneratedFileFrom(descriptorData,
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
-            com.google.protobuf.Descriptors.FileDescriptor root) {
+        });
-          descriptor = root;
     internal_static_Msg_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Msg_fieldAccessorTable = new
@@ -66,13 +65,7 @@ public class OuterSample {
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_SecondMsg_descriptor,
         new java.lang.String[] { "Blah", });
-          return null;
+    descriptor.resolveAllFeaturesImmutable();
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -1,224 +1,222 @@
 // 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.messaging.protobuf;
 
 /**
  * Protobuf type {@code SecondMsg}
  */
-@SuppressWarnings("serial")
 public final class SecondMsg extends
-    com.google.protobuf.GeneratedMessage
+    com.google.protobuf.GeneratedMessage implements
-    implements SecondMsgOrBuilder {
+    // @@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.GeneratedMessage.Builder<?> builder) {
     super(builder);
-    this.unknownFields = builder.getUnknownFields();
   }
-  private SecondMsg(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+  private SecondMsg() {
-
-  private static final SecondMsg defaultInstance;
-  public static SecondMsg getDefaultInstance() {
-    return defaultInstance;
   }
 
-  public SecondMsg getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private final com.google.protobuf.UnknownFieldSet unknownFields;
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-    return this.unknownFields;
-  }
-  private SecondMsg(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    initFields();
-    @SuppressWarnings("unused")
-	int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            bitField0_ |= 0x00000001;
-            blah_ = input.readInt32();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e.getMessage()).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_SecondMsg_descriptor;
+    return org.springframework.messaging.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
   }
 
-  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_SecondMsg_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            SecondMsg.class, SecondMsg.Builder.class);
-  }
-
-  public static com.google.protobuf.Parser<SecondMsg> PARSER =
-      new com.google.protobuf.AbstractParser<SecondMsg>() {
-    public SecondMsg parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SecondMsg(input, extensionRegistry);
-    }
-  };
-
   @java.lang.Override
-  public com.google.protobuf.Parser<SecondMsg> getParserForType() {
+  protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-    return PARSER;
+      internalGetFieldAccessorTable() {
+    return org.springframework.messaging.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.springframework.messaging.protobuf.SecondMsg.class, org.springframework.messaging.protobuf.SecondMsg.Builder.class);
   }
 
   private int bitField0_;
-  // optional int32 blah = 1;
   public static final int BLAH_FIELD_NUMBER = 1;
-  private int blah_;
+  private int blah_ = 0;
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return Whether the blah field is set.
    */
+  @java.lang.Override
   public boolean hasBlah() {
-    return ((bitField0_ & 0x00000001) == 0x00000001);
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return The blah.
    */
+  @java.lang.Override
   public int getBlah() {
     return blah_;
   }
 
-  private void initFields() {
-    blah_ = 0;
-  }
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
-    if (isInitialized != -1) return isInitialized == 1;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
 
     memoizedIsInitialized = 1;
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    getSerializedSize();
+    if (((bitField0_ & 0x00000001) != 0)) {
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
       output.writeInt32(1, blah_);
     }
     getUnknownFields().writeTo(output);
   }
 
-  private int memoizedSerializedSize = -1;
+  @java.lang.Override
   public int getSerializedSize() {
-    int size = memoizedSerializedSize;
+    int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, blah_);
     }
     size += getUnknownFields().getSerializedSize();
-    memoizedSerializedSize = size;
+    memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
-  protected java.lang.Object writeReplace()
+  public boolean equals(final java.lang.Object obj) {
-      throws java.io.ObjectStreamException {
+    if (obj == this) {
-    return super.writeReplace();
+     return true;
+    }
+    if (!(obj instanceof org.springframework.messaging.protobuf.SecondMsg)) {
+      return super.equals(obj);
+    }
+    org.springframework.messaging.protobuf.SecondMsg other = (org.springframework.messaging.protobuf.SecondMsg) obj;
+
+    if (hasBlah() != other.hasBlah()) return false;
+    if (hasBlah()) {
+      if (getBlah()
+          != other.getBlah()) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
   }
 
-  public static SecondMsg parseFrom(
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasBlah()) {
+      hash = (37 * hash) + BLAH_FIELD_NUMBER;
+      hash = (53 * hash) + getBlah();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.springframework.messaging.protobuf.SecondMsg parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.springframework.messaging.protobuf.SecondMsg parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.springframework.messaging.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.messaging.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.messaging.protobuf.SecondMsg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.messaging.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.messaging.protobuf.SecondMsg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.messaging.protobuf.SecondMsg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static SecondMsg parseDelimitedFrom(java.io.InputStream input)
+
+  public static org.springframework.messaging.protobuf.SecondMsg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input);
   }
-  public static SecondMsg parseDelimitedFrom(
+
+  public static org.springframework.messaging.protobuf.SecondMsg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.messaging.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.messaging.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static Builder newBuilder() { return Builder.create(); }
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder(SecondMsg prototype) {
+  public static Builder newBuilder() {
-    return newBuilder().mergeFrom(prototype);
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.springframework.messaging.protobuf.SecondMsg prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
-  public Builder toBuilder() { return newBuilder(this); }
 
   @java.lang.Override
   protected Builder newBuilderForType(
@@ -230,145 +228,173 @@ public  final class SecondMsg extends
    * Protobuf type {@code SecondMsg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessage.Builder<Builder>
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-     implements SecondMsgOrBuilder {
+      // @@protoc_insertion_point(builder_implements:SecondMsg)
+      org.springframework.messaging.protobuf.SecondMsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_SecondMsg_fieldAccessorTable
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              SecondMsg.class, SecondMsg.Builder.class);
+              org.springframework.messaging.protobuf.SecondMsg.class, org.springframework.messaging.protobuf.SecondMsg.Builder.class);
     }
 
     // Construct using org.springframework.messaging.protobuf.SecondMsg.newBuilder()
     private Builder() {
-      maybeForceBuilderInitialization();
+
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-      }
-    }
-    private static Builder create() {
-      return new Builder();
-    }
 
+    }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       blah_ = 0;
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
-    public Builder clone() {
+    @java.lang.Override
-      return create().mergeFrom(buildPartial());
-    }
-
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.messaging.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
-    public SecondMsg getDefaultInstanceForType() {
+    @java.lang.Override
-      return SecondMsg.getDefaultInstance();
+    public org.springframework.messaging.protobuf.SecondMsg getDefaultInstanceForType() {
+      return org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance();
     }
 
-    public SecondMsg build() {
+    @java.lang.Override
-      SecondMsg result = buildPartial();
+    public org.springframework.messaging.protobuf.SecondMsg build() {
+      org.springframework.messaging.protobuf.SecondMsg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public SecondMsg buildPartial() {
+    @java.lang.Override
-      SecondMsg result = new SecondMsg(this);
+    public org.springframework.messaging.protobuf.SecondMsg buildPartial() {
-      int from_bitField0_ = bitField0_;
+      org.springframework.messaging.protobuf.SecondMsg result = new org.springframework.messaging.protobuf.SecondMsg(this);
-      int to_bitField0_ = 0;
+      if (bitField0_ != 0) { buildPartial0(result); }
-      if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-        to_bitField0_ |= 0x00000001;
-      }
-      result.blah_ = blah_;
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(org.springframework.messaging.protobuf.SecondMsg result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.blah_ = blah_;
+        to_bitField0_ |= 0x00000001;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof SecondMsg) {
+      if (other instanceof org.springframework.messaging.protobuf.SecondMsg) {
-        return mergeFrom((SecondMsg)other);
+        return mergeFrom((org.springframework.messaging.protobuf.SecondMsg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(SecondMsg other) {
+    public Builder mergeFrom(org.springframework.messaging.protobuf.SecondMsg other) {
-      if (other == SecondMsg.getDefaultInstance()) return this;
+      if (other == org.springframework.messaging.protobuf.SecondMsg.getDefaultInstance()) return this;
       if (other.hasBlah()) {
         setBlah(other.getBlah());
       }
       this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      SecondMsg parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              blah_ = input.readInt32();
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 8
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (SecondMsg) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
-        throw e;
       } finally {
-        if (parsedMessage != null) {
+        onChanged();
-          mergeFrom(parsedMessage);
+      } // finally
-        }
-      }
       return this;
     }
     private int bitField0_;
 
-    // optional int32 blah = 1;
     private int blah_ ;
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return Whether the blah field is set.
      */
+    @java.lang.Override
     public boolean hasBlah() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return The blah.
      */
+    @java.lang.Override
     public int getBlah() {
       return blah_;
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @param value The blah to set.
+     * @return This builder for chaining.
      */
     public Builder setBlah(int value) {
-      bitField0_ |= 0x00000001;
+
       blah_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearBlah() {
       bitField0_ = (bitField0_ & ~0x00000001);
@@ -380,11 +406,51 @@ public  final class SecondMsg extends
     // @@protoc_insertion_point(builder_scope:SecondMsg)
   }
 
-  static {
-    defaultInstance = new SecondMsg(true);
-    defaultInstance.initFields();
-  }
-
   // @@protoc_insertion_point(class_scope:SecondMsg)
+  private static final org.springframework.messaging.protobuf.SecondMsg DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.springframework.messaging.protobuf.SecondMsg();
+  }
+
+  public static org.springframework.messaging.protobuf.SecondMsg getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<SecondMsg>
+      PARSER = new com.google.protobuf.AbstractParser<SecondMsg>() {
+    @java.lang.Override
+    public SecondMsg parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser<SecondMsg> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<SecondMsg> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.springframework.messaging.protobuf.SecondMsg getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
 }
 

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

@@ -1,18 +1,22 @@
 // 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.messaging.protobuf;
 
-public interface SecondMsgOrBuilder
+public interface SecondMsgOrBuilder extends
-    extends com.google.protobuf.MessageOrBuilder {
+    // @@protoc_insertion_point(interface_extends:SecondMsg)
+    com.google.protobuf.MessageOrBuilder {
 
-  // optional int32 blah = 1;
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return Whether the blah field is set.
    */
   boolean hasBlah();
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return The blah.
    */
   int getBlah();
 }

spring-messaging/src/test/proto/sample.proto

@@ -1,4 +1,4 @@
-option java_package = "org.springframework.protobuf.messaging";
+option java_package = "org.springframework.messaging.protobuf";
 option java_outer_classname = "OuterSample";
 option java_multiple_files = true;
 

spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java

@@ -203,7 +203,6 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
 				(this.protobufFormatSupport != null && this.protobufFormatSupport.supportsWriteOnly(mediaType)));
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	protected void writeInternal(Message message, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
@@ -226,7 +225,7 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
 		}
 		else if (TEXT_PLAIN.isCompatibleWith(contentType)) {
 			OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
-			TextFormat.print(message, outputStreamWriter);  // deprecated on Protobuf 3.9
+			TextFormat.printer().print(message, outputStreamWriter);
 			outputStreamWriter.flush();
 			outputMessage.getBody().flush();
 		}

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
+  @java.lang.Override
-  protected FieldAccessorTable
+  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
+  @java.lang.Override
-  public String getFoo() {
+  public java.lang.String getFoo() {
-    Object ref = foo_;
+    java.lang.Object ref = foo_;
-    if (ref instanceof String) {
+    if (ref instanceof java.lang.String) {
-      return (String) ref;
+      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_;
+    java.lang.Object ref = foo_;
-    if (ref instanceof String) {
+    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
+  @java.lang.Override
-  public SecondMsg getBlah() {
+  public org.springframework.protobuf.SecondMsg getBlah() {
-    return blah_ == null ? SecondMsg.getDefaultInstance() : blah_;
+    return blah_ == null ? org.springframework.protobuf.SecondMsg.getDefaultInstance() : blah_;
   }
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  @Override
+  @java.lang.Override
-  public SecondMsgOrBuilder getBlahOrBuilder() {
+  public org.springframework.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
-    return blah_ == null ? SecondMsg.getDefaultInstance() : blah_;
+    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
+  @java.lang.Override
-  public boolean equals(final Object obj) {
+  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
+    @java.lang.Override
-    protected FieldAccessorTable
+    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
+    @java.lang.Override
-    public Msg getDefaultInstanceForType() {
+    public org.springframework.protobuf.Msg getDefaultInstanceForType() {
-      return Msg.getDefaultInstance();
+      return org.springframework.protobuf.Msg.getDefaultInstance();
     }
 
-    @Override
+    @java.lang.Override
-    public Msg build() {
+    public org.springframework.protobuf.Msg build() {
-      Msg result = buildPartial();
+      org.springframework.protobuf.Msg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
+    @java.lang.Override
-    public Msg buildPartial() {
+    public org.springframework.protobuf.Msg buildPartial() {
-      Msg result = new Msg(this);
+      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
+    @java.lang.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
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Msg) {
+      if (other instanceof org.springframework.protobuf.Msg) {
-        return mergeFrom((Msg)other);
+        return mergeFrom((org.springframework.protobuf.Msg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Msg other) {
+    public Builder mergeFrom(org.springframework.protobuf.Msg other) {
-      if (other == Msg.getDefaultInstance()) return this;
+      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() {
+    public java.lang.String getFoo() {
-      Object ref = foo_;
+      java.lang.Object ref = foo_;
-      if (!(ref instanceof String)) {
+      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 org.springframework.protobuf.SecondMsg blah_;
-    private com.google.protobuf.SingleFieldBuilderV3<
+    private com.google.protobuf.SingleFieldBuilder<
-        SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder> blahBuilder_;
+        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<
+    private com.google.protobuf.SingleFieldBuilder<
-        SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder>
+        org.springframework.protobuf.SecondMsg, org.springframework.protobuf.SecondMsg.Builder, org.springframework.protobuf.SecondMsgOrBuilder> 
         getBlahFieldBuilder() {
       if (blahBuilder_ == null) {
-        blahBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-            SecondMsg, SecondMsg.Builder, SecondMsgOrBuilder>(
+            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
+  @java.lang.Override
-  public Msg getDefaultInstanceForType() {
+  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
+  @java.lang.Override
-  protected FieldAccessorTable
+  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
+  @java.lang.Override
-  public boolean equals(final Object obj) {
+  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
+    @java.lang.Override
-    protected FieldAccessorTable
+    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
+    @java.lang.Override
-    public SecondMsg getDefaultInstanceForType() {
+    public org.springframework.protobuf.SecondMsg getDefaultInstanceForType() {
-      return SecondMsg.getDefaultInstance();
+      return org.springframework.protobuf.SecondMsg.getDefaultInstance();
     }
 
-    @Override
+    @java.lang.Override
-    public SecondMsg build() {
+    public org.springframework.protobuf.SecondMsg build() {
-      SecondMsg result = buildPartial();
+      org.springframework.protobuf.SecondMsg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    @Override
+    @java.lang.Override
-    public SecondMsg buildPartial() {
+    public org.springframework.protobuf.SecondMsg buildPartial() {
-      SecondMsg result = new SecondMsg(this);
+      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
+    @java.lang.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
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof SecondMsg) {
+      if (other instanceof org.springframework.protobuf.SecondMsg) {
-        return mergeFrom((SecondMsg)other);
+        return mergeFrom((org.springframework.protobuf.SecondMsg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(SecondMsg other) {
+    public Builder mergeFrom(org.springframework.protobuf.SecondMsg other) {
-      if (other == SecondMsg.getDefaultInstance()) return this;
+      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
+  @java.lang.Override
-  public SecondMsg getDefaultInstanceForType() {
+  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;
 

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

@@ -1,155 +1,73 @@
-/*
- * Copyright 2002-2022 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.web.reactive.protobuf;
 
 /**
  * Protobuf type {@code Msg}
  */
-@SuppressWarnings("serial")
 public final class Msg extends
-    com.google.protobuf.GeneratedMessage
+    com.google.protobuf.GeneratedMessage implements
-    implements MsgOrBuilder {
+    // @@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.GeneratedMessage.Builder<?> builder) {
     super(builder);
-    this.unknownFields = builder.getUnknownFields();
   }
-  private Msg(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+  private Msg() {
-
+    foo_ = "";
-  private static final Msg defaultInstance;
-  public static Msg getDefaultInstance() {
-    return defaultInstance;
   }
 
-  public Msg getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private final com.google.protobuf.UnknownFieldSet unknownFields;
-  @Override
-  public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Msg(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    initFields();
-    @SuppressWarnings("unused")
-	int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            bitField0_ |= 0x00000001;
-            foo_ = input.readBytes();
-            break;
-          }
-          case 18: {
-            SecondMsg.Builder subBuilder = null;
-            if (((bitField0_ & 0x00000002) == 0x00000002)) {
-              subBuilder = blah_.toBuilder();
-            }
-            blah_ = input.readMessage(SecondMsg.PARSER, extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(blah_);
-              blah_ = subBuilder.buildPartial();
-            }
-            bitField0_ |= 0x00000002;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e.getMessage()).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_Msg_descriptor;
+    return org.springframework.web.reactive.protobuf.OuterSample.internal_static_Msg_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_Msg_fieldAccessorTable
+    return org.springframework.web.reactive.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            Msg.class, Msg.Builder.class);
+            org.springframework.web.reactive.protobuf.Msg.class, org.springframework.web.reactive.protobuf.Msg.Builder.class);
-  }
-
-  public static com.google.protobuf.Parser<Msg> PARSER =
-      new com.google.protobuf.AbstractParser<Msg>() {
-    public Msg parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Msg(input, extensionRegistry);
-    }
-  };
-
-  @Override
-  public com.google.protobuf.Parser<Msg> getParserForType() {
-    return PARSER;
   }
 
   private int bitField0_;
-  // optional string foo = 1;
   public static final int FOO_FIELD_NUMBER = 1;
-  private Object foo_;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object foo_ = "";
   /**
    * <code>optional string foo = 1;</code>
+   * @return Whether the foo field is set.
    */
+  @java.lang.Override
   public boolean hasFoo() {
-    return ((bitField0_ & 0x00000001) == 0x00000001);
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>optional string foo = 1;</code>
+   * @return The foo.
    */
-  public String getFoo() {
+  @java.lang.Override
-    Object ref = foo_;
+  public java.lang.String getFoo() {
-    if (ref instanceof String) {
+    java.lang.Object ref = foo_;
-      return (String) ref;
+    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;
       }
@@ -158,14 +76,16 @@ public  final class Msg extends
   }
   /**
    * <code>optional string foo = 1;</code>
+   * @return The bytes for foo.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString
       getFooBytes() {
-    Object ref = foo_;
+    java.lang.Object ref = foo_;
-    if (ref instanceof String) {
+    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 {
@@ -173,140 +93,204 @@ public  final class Msg extends
     }
   }
 
-  // optional .SecondMsg blah = 2;
   public static final int BLAH_FIELD_NUMBER = 2;
-  private SecondMsg blah_;
+  private org.springframework.web.reactive.protobuf.SecondMsg blah_;
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return Whether the blah field is set.
    */
+  @java.lang.Override
   public boolean hasBlah() {
-    return ((bitField0_ & 0x00000002) == 0x00000002);
+    return ((bitField0_ & 0x00000002) != 0);
+  }
+  /**
+   * <code>optional .SecondMsg blah = 2;</code>
+   * @return The blah.
+   */
+  @java.lang.Override
+  public org.springframework.web.reactive.protobuf.SecondMsg getBlah() {
+    return blah_ == null ? org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance() : blah_;
   }
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  public SecondMsg getBlah() {
+  @java.lang.Override
-    return blah_;
+  public org.springframework.web.reactive.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
-  }
+    return blah_ == null ? org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance() : blah_;
-  /**
-   * <code>optional .SecondMsg blah = 2;</code>
-   */
-  public SecondMsgOrBuilder getBlahOrBuilder() {
-    return blah_;
   }
 
-  private void initFields() {
-    foo_ = "";
-    blah_ = SecondMsg.getDefaultInstance();
-  }
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
-    if (isInitialized != -1) return isInitialized == 1;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
 
     memoizedIsInitialized = 1;
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    getSerializedSize();
+    if (((bitField0_ & 0x00000001) != 0)) {
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+      com.google.protobuf.GeneratedMessage.writeString(output, 1, foo_);
-      output.writeBytes(1, getFooBytes());
     }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
-      output.writeMessage(2, blah_);
+      output.writeMessage(2, getBlah());
     }
     getUnknownFields().writeTo(output);
   }
 
-  private int memoizedSerializedSize = -1;
+  @java.lang.Override
   public int getSerializedSize() {
-    int size = memoizedSerializedSize;
+    int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
+      size += com.google.protobuf.GeneratedMessage.computeStringSize(1, foo_);
-        .computeBytesSize(1, getFooBytes());
     }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, blah_);
+        .computeMessageSize(2, getBlah());
     }
     size += getUnknownFields().getSerializedSize();
-    memoizedSerializedSize = size;
+    memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
+  @java.lang.Override
-  @Override
+  public boolean equals(final java.lang.Object obj) {
-  protected Object writeReplace()
+    if (obj == this) {
-      throws java.io.ObjectStreamException {
+     return true;
-    return super.writeReplace();
+    }
+    if (!(obj instanceof org.springframework.web.reactive.protobuf.Msg)) {
+      return super.equals(obj);
+    }
+    org.springframework.web.reactive.protobuf.Msg other = (org.springframework.web.reactive.protobuf.Msg) obj;
+
+    if (hasFoo() != other.hasFoo()) return false;
+    if (hasFoo()) {
+      if (!getFoo()
+          .equals(other.getFoo())) return false;
+    }
+    if (hasBlah() != other.hasBlah()) return false;
+    if (hasBlah()) {
+      if (!getBlah()
+          .equals(other.getBlah())) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
   }
 
-  public static Msg parseFrom(
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasFoo()) {
+      hash = (37 * hash) + FOO_FIELD_NUMBER;
+      hash = (53 * hash) + getFoo().hashCode();
+    }
+    if (hasBlah()) {
+      hash = (37 * hash) + BLAH_FIELD_NUMBER;
+      hash = (53 * hash) + getBlah().hashCode();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.springframework.web.reactive.protobuf.Msg parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.springframework.web.reactive.protobuf.Msg parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.springframework.web.reactive.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.web.reactive.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.web.reactive.protobuf.Msg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static Msg parseFrom(
+  public static org.springframework.web.reactive.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.web.reactive.protobuf.Msg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.web.reactive.protobuf.Msg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static Msg parseDelimitedFrom(java.io.InputStream input)
+
+  public static org.springframework.web.reactive.protobuf.Msg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input);
   }
-  public static Msg parseDelimitedFrom(
+
+  public static org.springframework.web.reactive.protobuf.Msg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static Msg parseFrom(
+  public static org.springframework.web.reactive.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static Msg parseFrom(
+  public static org.springframework.web.reactive.protobuf.Msg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static Builder newBuilder() { return Builder.create(); }
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder(Msg prototype) {
+  public static Builder newBuilder() {
-    return newBuilder().mergeFrom(prototype);
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.springframework.web.reactive.protobuf.Msg prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
-  public Builder toBuilder() { return newBuilder(this); }
 
-  @Override
+  @java.lang.Override
   protected Builder newBuilderForType(
       com.google.protobuf.GeneratedMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
@@ -316,21 +300,23 @@ public  final class Msg extends
    * Protobuf type {@code Msg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessage.Builder<Builder>
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-     implements MsgOrBuilder {
+      // @@protoc_insertion_point(builder_implements:Msg)
+      org.springframework.web.reactive.protobuf.MsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_Msg_fieldAccessorTable
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_Msg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              Msg.class, Msg.Builder.class);
+              org.springframework.web.reactive.protobuf.Msg.class, org.springframework.web.reactive.protobuf.Msg.Builder.class);
     }
 
-    // Construct using org.springframework.protobuf.Msg.newBuilder()
+    // Construct using org.springframework.web.reactive.protobuf.Msg.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -341,147 +327,180 @@ public  final class Msg extends
       maybeForceBuilderInitialization();
     }
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessage
+              .alwaysUseFieldBuilders) {
         getBlahFieldBuilder();
       }
     }
-    private static Builder create() {
+    @java.lang.Override
-      return new Builder();
-    }
-
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       foo_ = "";
-      bitField0_ = (bitField0_ & ~0x00000001);
+      blah_ = null;
-      if (blahBuilder_ == null) {
+      if (blahBuilder_ != null) {
-        blah_ = SecondMsg.getDefaultInstance();
+        blahBuilder_.dispose();
-      } else {
+        blahBuilder_ = null;
-        blahBuilder_.clear();
       }
-      bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
 
-    public Builder clone() {
+    @java.lang.Override
-      return create().mergeFrom(buildPartial());
-    }
-
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_Msg_descriptor;
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_Msg_descriptor;
     }
 
-    public Msg getDefaultInstanceForType() {
+    @java.lang.Override
-      return Msg.getDefaultInstance();
+    public org.springframework.web.reactive.protobuf.Msg getDefaultInstanceForType() {
+      return org.springframework.web.reactive.protobuf.Msg.getDefaultInstance();
     }
 
-    public Msg build() {
+    @java.lang.Override
-      Msg result = buildPartial();
+    public org.springframework.web.reactive.protobuf.Msg build() {
+      org.springframework.web.reactive.protobuf.Msg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public Msg buildPartial() {
+    @java.lang.Override
-      Msg result = new Msg(this);
+    public org.springframework.web.reactive.protobuf.Msg buildPartial() {
-      int from_bitField0_ = bitField0_;
+      org.springframework.web.reactive.protobuf.Msg result = new org.springframework.web.reactive.protobuf.Msg(this);
-      int to_bitField0_ = 0;
+      if (bitField0_ != 0) { buildPartial0(result); }
-      if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-        to_bitField0_ |= 0x00000001;
-      }
-      result.foo_ = foo_;
-      if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-        to_bitField0_ |= 0x00000002;
-      }
-      if (blahBuilder_ == null) {
-        result.blah_ = blah_;
-      } else {
-        result.blah_ = blahBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(org.springframework.web.reactive.protobuf.Msg result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.foo_ = foo_;
+        to_bitField0_ |= 0x00000001;
+      }
+      if (((from_bitField0_ & 0x00000002) != 0)) {
+        result.blah_ = blahBuilder_ == null
+            ? blah_
+            : blahBuilder_.build();
+        to_bitField0_ |= 0x00000002;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof Msg) {
+      if (other instanceof org.springframework.web.reactive.protobuf.Msg) {
-        return mergeFrom((Msg)other);
+        return mergeFrom((org.springframework.web.reactive.protobuf.Msg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(Msg other) {
+    public Builder mergeFrom(org.springframework.web.reactive.protobuf.Msg other) {
-      if (other == Msg.getDefaultInstance()) return this;
+      if (other == org.springframework.web.reactive.protobuf.Msg.getDefaultInstance()) return this;
       if (other.hasFoo()) {
-        bitField0_ |= 0x00000001;
         foo_ = other.foo_;
+        bitField0_ |= 0x00000001;
         onChanged();
       }
       if (other.hasBlah()) {
         mergeBlah(other.getBlah());
       }
       this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      Msg parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              foo_ = input.readBytes();
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 10
+            case 18: {
+              input.readMessage(
+                  getBlahFieldBuilder().getBuilder(),
+                  extensionRegistry);
+              bitField0_ |= 0x00000002;
+              break;
+            } // case 18
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (Msg) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
-        throw e;
       } finally {
-        if (parsedMessage != null) {
+        onChanged();
-          mergeFrom(parsedMessage);
+      } // finally
-        }
-      }
       return this;
     }
     private int bitField0_;
 
-    // optional string foo = 1;
+    private java.lang.Object foo_ = "";
-    private Object foo_ = "";
     /**
      * <code>optional string foo = 1;</code>
+     * @return Whether the foo field is set.
      */
     public boolean hasFoo() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return The foo.
      */
-    public String getFoo() {
+    public java.lang.String getFoo() {
-      Object ref = foo_;
+      java.lang.Object ref = foo_;
-      if (!(ref instanceof String)) {
+      if (!(ref instanceof java.lang.String)) {
-        String s = ((com.google.protobuf.ByteString) ref)
+        com.google.protobuf.ByteString bs =
-            .toStringUtf8();
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
           foo_ = s;
+        }
         return s;
       } else {
-        return (String) ref;
+        return (java.lang.String) ref;
       }
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return The bytes for foo.
      */
     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 {
@@ -490,57 +509,58 @@ public  final class Msg extends
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @param value The foo to set.
+     * @return This builder for chaining.
      */
     public Builder setFoo(
-        String value) {
+        java.lang.String value) {
-      if (value == null) {
+      if (value == null) { throw new NullPointerException(); }
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
       foo_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearFoo() {
-      bitField0_ = (bitField0_ & ~0x00000001);
       foo_ = getDefaultInstance().getFoo();
+      bitField0_ = (bitField0_ & ~0x00000001);
       onChanged();
       return this;
     }
     /**
      * <code>optional string foo = 1;</code>
+     * @param value The bytes for foo to set.
+     * @return This builder for chaining.
      */
     public Builder setFooBytes(
         com.google.protobuf.ByteString value) {
-      if (value == null) {
+      if (value == null) { throw new NullPointerException(); }
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
       foo_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
 
-    // optional .SecondMsg blah = 2;
+    private org.springframework.web.reactive.protobuf.SecondMsg blah_;
-    private SecondMsg blah_ = SecondMsg.getDefaultInstance();
     private com.google.protobuf.SingleFieldBuilder<
-			SecondMsg, SecondMsg.Builder,
+        org.springframework.web.reactive.protobuf.SecondMsg, org.springframework.web.reactive.protobuf.SecondMsg.Builder, org.springframework.web.reactive.protobuf.SecondMsgOrBuilder> blahBuilder_;
-			SecondMsgOrBuilder> blahBuilder_;
     /**
      * <code>optional .SecondMsg blah = 2;</code>
+     * @return Whether the blah field is set.
      */
     public boolean hasBlah() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
+     * @return The blah.
      */
-    public SecondMsg getBlah() {
+    public org.springframework.web.reactive.protobuf.SecondMsg getBlah() {
       if (blahBuilder_ == null) {
-        return blah_;
+        return blah_ == null ? org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance() : blah_;
       } else {
         return blahBuilder_.getMessage();
       }
@@ -548,69 +568,71 @@ public  final class Msg extends
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder setBlah(SecondMsg value) {
+    public Builder setBlah(org.springframework.web.reactive.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
         }
         blah_ = value;
-        onChanged();
       } else {
         blahBuilder_.setMessage(value);
       }
       bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     public Builder setBlah(
-        SecondMsg.Builder builderForValue) {
+        org.springframework.web.reactive.protobuf.SecondMsg.Builder builderForValue) {
       if (blahBuilder_ == null) {
         blah_ = builderForValue.build();
-        onChanged();
       } else {
         blahBuilder_.setMessage(builderForValue.build());
       }
       bitField0_ |= 0x00000002;
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public Builder mergeBlah(SecondMsg value) {
+    public Builder mergeBlah(org.springframework.web.reactive.protobuf.SecondMsg value) {
       if (blahBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002) &&
+        if (((bitField0_ & 0x00000002) != 0) &&
-            blah_ != SecondMsg.getDefaultInstance()) {
+          blah_ != null &&
-          blah_ =
+          blah_ != org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance()) {
-            SecondMsg.newBuilder(blah_).mergeFrom(value).buildPartial();
+          getBlahBuilder().mergeFrom(value);
         } else {
           blah_ = value;
         }
-        onChanged();
       } else {
         blahBuilder_.mergeFrom(value);
       }
+      if (blah_ != null) {
         bitField0_ |= 0x00000002;
+        onChanged();
+      }
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     public Builder clearBlah() {
-      if (blahBuilder_ == null) {
-        blah_ = SecondMsg.getDefaultInstance();
-        onChanged();
-      } else {
-        blahBuilder_.clear();
-      }
       bitField0_ = (bitField0_ & ~0x00000002);
+      blah_ = null;
+      if (blahBuilder_ != null) {
+        blahBuilder_.dispose();
+        blahBuilder_ = null;
+      }
+      onChanged();
       return this;
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsg.Builder getBlahBuilder() {
+    public org.springframework.web.reactive.protobuf.SecondMsg.Builder getBlahBuilder() {
       bitField0_ |= 0x00000002;
       onChanged();
       return getBlahFieldBuilder().getBuilder();
@@ -618,23 +640,24 @@ public  final class Msg extends
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
-    public SecondMsgOrBuilder getBlahOrBuilder() {
+    public org.springframework.web.reactive.protobuf.SecondMsgOrBuilder getBlahOrBuilder() {
       if (blahBuilder_ != null) {
         return blahBuilder_.getMessageOrBuilder();
       } else {
-        return blah_;
+        return blah_ == null ?
+            org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance() : blah_;
       }
     }
     /**
      * <code>optional .SecondMsg blah = 2;</code>
      */
     private com.google.protobuf.SingleFieldBuilder<
-			SecondMsg, SecondMsg.Builder,
+        org.springframework.web.reactive.protobuf.SecondMsg, org.springframework.web.reactive.protobuf.SecondMsg.Builder, org.springframework.web.reactive.protobuf.SecondMsgOrBuilder> 
-			SecondMsgOrBuilder>
         getBlahFieldBuilder() {
       if (blahBuilder_ == null) {
-        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<>(
+        blahBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-				blah_,
+            org.springframework.web.reactive.protobuf.SecondMsg, org.springframework.web.reactive.protobuf.SecondMsg.Builder, org.springframework.web.reactive.protobuf.SecondMsgOrBuilder>(
+                getBlah(),
                 getParentForChildren(),
                 isClean());
         blah_ = null;
@@ -645,11 +668,51 @@ public  final class Msg extends
     // @@protoc_insertion_point(builder_scope:Msg)
   }
 
-  static {
-    defaultInstance = new Msg(true);
-    defaultInstance.initFields();
-  }
-
   // @@protoc_insertion_point(class_scope:Msg)
+  private static final org.springframework.web.reactive.protobuf.Msg DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.springframework.web.reactive.protobuf.Msg();
+  }
+
+  public static org.springframework.web.reactive.protobuf.Msg getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<Msg>
+      PARSER = new com.google.protobuf.AbstractParser<Msg>() {
+    @java.lang.Override
+    public Msg parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser<Msg> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<Msg> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.springframework.web.reactive.protobuf.Msg getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
 }
 

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

@@ -1,37 +1,43 @@
 // 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.web.reactive.protobuf;
 
-public interface MsgOrBuilder
+public interface MsgOrBuilder extends
-    extends com.google.protobuf.MessageOrBuilder {
+    // @@protoc_insertion_point(interface_extends:Msg)
+    com.google.protobuf.MessageOrBuilder {
 
-  // optional string foo = 1;
   /**
    * <code>optional string foo = 1;</code>
+   * @return Whether the foo field is set.
    */
   boolean hasFoo();
   /**
    * <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.
    */
   com.google.protobuf.ByteString
       getFooBytes();
 
-  // optional .SecondMsg blah = 2;
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return Whether the blah field is set.
    */
   boolean hasBlah();
   /**
    * <code>optional .SecondMsg blah = 2;</code>
+   * @return The blah.
    */
-  SecondMsg getBlah();
+  org.springframework.web.reactive.protobuf.SecondMsg getBlah();
   /**
    * <code>optional .SecondMsg blah = 2;</code>
    */
-  SecondMsgOrBuilder getBlahOrBuilder();
+  org.springframework.web.reactive.protobuf.SecondMsgOrBuilder getBlahOrBuilder();
 }

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

@@ -1,38 +1,38 @@
-/*
- * 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.web.reactive.protobuf;
 
-@SuppressWarnings("deprecation")
+public final class OuterSample {
-public 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) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  static com.google.protobuf.Descriptors.Descriptor
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_Msg_descriptor;
-  static
+  static final 
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_Msg_fieldAccessorTable;
-  static com.google.protobuf.Descriptors.Descriptor
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_SecondMsg_descriptor;
-  static
+  static final 
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_SecondMsg_fieldAccessorTable;
 
@@ -43,36 +43,29 @@ public 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" +
+      "h\030\001 \001(\005B:\n)org.springframework.web.react" +
-      "\013OuterSampleP\001"
+      "ive.protobufB\013OuterSampleP\001"
     };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+      .internalBuildGeneratedFileFrom(descriptorData,
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
-            com.google.protobuf.Descriptors.FileDescriptor root) {
+        });
-          descriptor = root;
     internal_static_Msg_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Msg_fieldAccessorTable = new
       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.GeneratedMessage.FieldAccessorTable(
         internal_static_SecondMsg_descriptor,
-              new String[] { "Blah", });
+        new java.lang.String[] { "Blah", });
-          return null;
+    descriptor.resolveAllFeaturesImmutable();
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -1,226 +1,224 @@
 // 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.web.reactive.protobuf;
 
 /**
  * Protobuf type {@code SecondMsg}
  */
-@SuppressWarnings("serial")
 public final class SecondMsg extends
-    com.google.protobuf.GeneratedMessage
+    com.google.protobuf.GeneratedMessage implements
-    implements SecondMsgOrBuilder {
+    // @@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.GeneratedMessage.Builder<?> builder) {
     super(builder);
-    this.unknownFields = builder.getUnknownFields();
   }
-  private SecondMsg(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+  private SecondMsg() {
-
-  private static final SecondMsg defaultInstance;
-  public static SecondMsg getDefaultInstance() {
-    return defaultInstance;
   }
 
-  public SecondMsg getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private final com.google.protobuf.UnknownFieldSet unknownFields;
-  @Override
-  public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-    return this.unknownFields;
-  }
-  private SecondMsg(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    initFields();
-    @SuppressWarnings("unused")
-	int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            bitField0_ |= 0x00000001;
-            blah_ = input.readInt32();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e.getMessage()).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return OuterSample.internal_static_SecondMsg_descriptor;
+    return org.springframework.web.reactive.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
   }
 
+  @java.lang.Override
   protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return OuterSample.internal_static_SecondMsg_fieldAccessorTable
+    return org.springframework.web.reactive.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            SecondMsg.class, SecondMsg.Builder.class);
+            org.springframework.web.reactive.protobuf.SecondMsg.class, org.springframework.web.reactive.protobuf.SecondMsg.Builder.class);
-  }
-
-  public static com.google.protobuf.Parser<SecondMsg> PARSER =
-      new com.google.protobuf.AbstractParser<SecondMsg>() {
-    public SecondMsg parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SecondMsg(input, extensionRegistry);
-    }
-  };
-
-  @Override
-  public com.google.protobuf.Parser<SecondMsg> getParserForType() {
-    return PARSER;
   }
 
   private int bitField0_;
-  // optional int32 blah = 1;
   public static final int BLAH_FIELD_NUMBER = 1;
-  private int blah_;
+  private int blah_ = 0;
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return Whether the blah field is set.
    */
+  @java.lang.Override
   public boolean hasBlah() {
-    return ((bitField0_ & 0x00000001) == 0x00000001);
+    return ((bitField0_ & 0x00000001) != 0);
   }
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return The blah.
    */
+  @java.lang.Override
   public int getBlah() {
     return blah_;
   }
 
-  private void initFields() {
-    blah_ = 0;
-  }
   private byte memoizedIsInitialized = -1;
+  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
-    if (isInitialized != -1) return isInitialized == 1;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
 
     memoizedIsInitialized = 1;
     return true;
   }
 
+  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    getSerializedSize();
+    if (((bitField0_ & 0x00000001) != 0)) {
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
       output.writeInt32(1, blah_);
     }
     getUnknownFields().writeTo(output);
   }
 
-  private int memoizedSerializedSize = -1;
+  @java.lang.Override
   public int getSerializedSize() {
-    int size = memoizedSerializedSize;
+    int size = memoizedSize;
     if (size != -1) return size;
 
     size = 0;
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
+    if (((bitField0_ & 0x00000001) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, blah_);
     }
     size += getUnknownFields().getSerializedSize();
-    memoizedSerializedSize = size;
+    memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
+  @java.lang.Override
-  @Override
+  public boolean equals(final java.lang.Object obj) {
-  protected Object writeReplace()
+    if (obj == this) {
-      throws java.io.ObjectStreamException {
+     return true;
-    return super.writeReplace();
+    }
+    if (!(obj instanceof org.springframework.web.reactive.protobuf.SecondMsg)) {
+      return super.equals(obj);
+    }
+    org.springframework.web.reactive.protobuf.SecondMsg other = (org.springframework.web.reactive.protobuf.SecondMsg) obj;
+
+    if (hasBlah() != other.hasBlah()) return false;
+    if (hasBlah()) {
+      if (getBlah()
+          != other.getBlah()) return false;
+    }
+    if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+    return true;
   }
 
-  public static SecondMsg parseFrom(
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasBlah()) {
+      hash = (37 * hash) + BLAH_FIELD_NUMBER;
+      hash = (53 * hash) + getBlah();
+    }
+    hash = (29 * hash) + getUnknownFields().hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.springframework.web.reactive.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.web.reactive.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.web.reactive.protobuf.SecondMsg parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.web.reactive.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.web.reactive.protobuf.SecondMsg parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static SecondMsg parseDelimitedFrom(java.io.InputStream input)
+
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input);
   }
-  public static SecondMsg parseDelimitedFrom(
+
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return PARSER.parseFrom(input);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input);
   }
-  public static SecondMsg parseFrom(
+  public static org.springframework.web.reactive.protobuf.SecondMsg parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessage
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  public static Builder newBuilder() { return Builder.create(); }
+  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder(SecondMsg prototype) {
+  public static Builder newBuilder() {
-    return newBuilder().mergeFrom(prototype);
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.springframework.web.reactive.protobuf.SecondMsg prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
-  public Builder toBuilder() { return newBuilder(this); }
 
-  @Override
+  @java.lang.Override
   protected Builder newBuilderForType(
       com.google.protobuf.GeneratedMessage.BuilderParent parent) {
     Builder builder = new Builder(parent);
@@ -230,145 +228,173 @@ public  final class SecondMsg extends
    * Protobuf type {@code SecondMsg}
    */
   public static final class Builder extends
-      com.google.protobuf.GeneratedMessage.Builder<Builder>
+      com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-     implements SecondMsgOrBuilder {
+      // @@protoc_insertion_point(builder_implements:SecondMsg)
+      org.springframework.web.reactive.protobuf.SecondMsgOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
+    @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return OuterSample.internal_static_SecondMsg_fieldAccessorTable
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_SecondMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              SecondMsg.class, SecondMsg.Builder.class);
+              org.springframework.web.reactive.protobuf.SecondMsg.class, org.springframework.web.reactive.protobuf.SecondMsg.Builder.class);
     }
 
-    // Construct using org.springframework.protobuf.SecondMsg.newBuilder()
+    // Construct using org.springframework.web.reactive.protobuf.SecondMsg.newBuilder()
     private Builder() {
-      maybeForceBuilderInitialization();
+
     }
 
     private Builder(
         com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-      }
-    }
-    private static Builder create() {
-      return new Builder();
-    }
 
+    }
+    @java.lang.Override
     public Builder clear() {
       super.clear();
+      bitField0_ = 0;
       blah_ = 0;
-      bitField0_ = (bitField0_ & ~0x00000001);
       return this;
     }
 
-    public Builder clone() {
+    @java.lang.Override
-      return create().mergeFrom(buildPartial());
-    }
-
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return OuterSample.internal_static_SecondMsg_descriptor;
+      return org.springframework.web.reactive.protobuf.OuterSample.internal_static_SecondMsg_descriptor;
     }
 
-    public SecondMsg getDefaultInstanceForType() {
+    @java.lang.Override
-      return SecondMsg.getDefaultInstance();
+    public org.springframework.web.reactive.protobuf.SecondMsg getDefaultInstanceForType() {
+      return org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance();
     }
 
-    public SecondMsg build() {
+    @java.lang.Override
-      SecondMsg result = buildPartial();
+    public org.springframework.web.reactive.protobuf.SecondMsg build() {
+      org.springframework.web.reactive.protobuf.SecondMsg result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public SecondMsg buildPartial() {
+    @java.lang.Override
-      SecondMsg result = new SecondMsg(this);
+    public org.springframework.web.reactive.protobuf.SecondMsg buildPartial() {
-      int from_bitField0_ = bitField0_;
+      org.springframework.web.reactive.protobuf.SecondMsg result = new org.springframework.web.reactive.protobuf.SecondMsg(this);
-      int to_bitField0_ = 0;
+      if (bitField0_ != 0) { buildPartial0(result); }
-      if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-        to_bitField0_ |= 0x00000001;
-      }
-      result.blah_ = blah_;
-      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
+    private void buildPartial0(org.springframework.web.reactive.protobuf.SecondMsg result) {
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.blah_ = blah_;
+        to_bitField0_ |= 0x00000001;
+      }
+      result.bitField0_ |= to_bitField0_;
+    }
+
+    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof SecondMsg) {
+      if (other instanceof org.springframework.web.reactive.protobuf.SecondMsg) {
-        return mergeFrom((SecondMsg)other);
+        return mergeFrom((org.springframework.web.reactive.protobuf.SecondMsg)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(SecondMsg other) {
+    public Builder mergeFrom(org.springframework.web.reactive.protobuf.SecondMsg other) {
-      if (other == SecondMsg.getDefaultInstance()) return this;
+      if (other == org.springframework.web.reactive.protobuf.SecondMsg.getDefaultInstance()) return this;
       if (other.hasBlah()) {
         setBlah(other.getBlah());
       }
       this.mergeUnknownFields(other.getUnknownFields());
+      onChanged();
       return this;
     }
 
+    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      SecondMsg parsedMessage = null;
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              blah_ = input.readInt32();
+              bitField0_ |= 0x00000001;
+              break;
+            } // case 8
+            default: {
+              if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+                done = true; // was an endgroup tag
+              }
+              break;
+            } // default:
+          } // switch (tag)
+        } // while (!done)
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (SecondMsg) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
-        throw e;
       } finally {
-        if (parsedMessage != null) {
+        onChanged();
-          mergeFrom(parsedMessage);
+      } // finally
-        }
-      }
       return this;
     }
     private int bitField0_;
 
-    // optional int32 blah = 1;
     private int blah_ ;
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return Whether the blah field is set.
      */
+    @java.lang.Override
     public boolean hasBlah() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return The blah.
      */
+    @java.lang.Override
     public int getBlah() {
       return blah_;
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @param value The blah to set.
+     * @return This builder for chaining.
      */
     public Builder setBlah(int value) {
-      bitField0_ |= 0x00000001;
+
       blah_ = value;
+      bitField0_ |= 0x00000001;
       onChanged();
       return this;
     }
     /**
      * <code>optional int32 blah = 1;</code>
+     * @return This builder for chaining.
      */
     public Builder clearBlah() {
       bitField0_ = (bitField0_ & ~0x00000001);
@@ -380,11 +406,51 @@ public  final class SecondMsg extends
     // @@protoc_insertion_point(builder_scope:SecondMsg)
   }
 
-  static {
-    defaultInstance = new SecondMsg(true);
-    defaultInstance.initFields();
-  }
-
   // @@protoc_insertion_point(class_scope:SecondMsg)
+  private static final org.springframework.web.reactive.protobuf.SecondMsg DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.springframework.web.reactive.protobuf.SecondMsg();
+  }
+
+  public static org.springframework.web.reactive.protobuf.SecondMsg getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<SecondMsg>
+      PARSER = new com.google.protobuf.AbstractParser<SecondMsg>() {
+    @java.lang.Override
+    public SecondMsg parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      Builder builder = newBuilder();
+      try {
+        builder.mergeFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(builder.buildPartial());
+      } catch (com.google.protobuf.UninitializedMessageException e) {
+        throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(e)
+            .setUnfinishedMessage(builder.buildPartial());
+      }
+      return builder.buildPartial();
+    }
+  };
+
+  public static com.google.protobuf.Parser<SecondMsg> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<SecondMsg> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.springframework.web.reactive.protobuf.SecondMsg getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
 }
 

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

@@ -1,18 +1,22 @@
 // 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.web.reactive.protobuf;
 
-public interface SecondMsgOrBuilder
+public interface SecondMsgOrBuilder extends
-    extends com.google.protobuf.MessageOrBuilder {
+    // @@protoc_insertion_point(interface_extends:SecondMsg)
+    com.google.protobuf.MessageOrBuilder {
 
-  // optional int32 blah = 1;
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return Whether the blah field is set.
    */
   boolean hasBlah();
   /**
    * <code>optional int32 blah = 1;</code>
+   * @return The blah.
    */
   int getBlah();
 }