Revert "chore: [common-protos] upgrading Protobuf to 23.1 and gRPC to…

… 1.55.0 in code generation (#1705)" (#1713) This reverts commit 64a2714.
googleapis · May 25, 2023 · 2210064 · 2210064
1 parent 642969d
commit 2210064
Show file tree

Hide file tree

Showing 172 changed files with 5,684 additions and 3,944 deletions.
diff --git a/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml b/java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* addRepeatedField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clearField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clearOneof(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* clone()</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* setField(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7002</differenceType>
-    <className>com/google/**/*Builder</className>
-    <method>* setRepeatedField(*)</method>
-  </difference>
   <difference>
     <differenceType>7012</differenceType>
     <className>com/google/api/*OrBuilder</className>

diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
     return new Advice();
   }
 
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
     return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
   }
@@ -347,6 +352,39 @@ private void buildPartial0(com.google.api.Advice result) {
       }
     }
 
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.setField(field, value);
+    }
+
+    @java.lang.Override
+    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+
+    @java.lang.Override
+    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.api.Advice) {