Skip to content

Commit 2210064

Browse files
authored
Revert "chore: [common-protos] upgrading Protobuf to 23.1 and gRPC to 1.55.0 in code generation (#1705)" (#1713)
This reverts commit 64a2714.
1 parent 642969d commit 2210064

File tree

172 files changed

+5684
-3944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+5684
-3944
lines changed

java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml

-30
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
33
<differences>
4-
<difference>
5-
<differenceType>7002</differenceType>
6-
<className>com/google/**/*Builder</className>
7-
<method>* addRepeatedField(*)</method>
8-
</difference>
9-
<difference>
10-
<differenceType>7002</differenceType>
11-
<className>com/google/**/*Builder</className>
12-
<method>* clearField(*)</method>
13-
</difference>
14-
<difference>
15-
<differenceType>7002</differenceType>
16-
<className>com/google/**/*Builder</className>
17-
<method>* clearOneof(*)</method>
18-
</difference>
19-
<difference>
20-
<differenceType>7002</differenceType>
21-
<className>com/google/**/*Builder</className>
22-
<method>* clone()</method>
23-
</difference>
24-
<difference>
25-
<differenceType>7002</differenceType>
26-
<className>com/google/**/*Builder</className>
27-
<method>* setField(*)</method>
28-
</difference>
29-
<difference>
30-
<differenceType>7002</differenceType>
31-
<className>com/google/**/*Builder</className>
32-
<method>* setRepeatedField(*)</method>
33-
</difference>
344
<difference>
355
<differenceType>7012</differenceType>
366
<className>com/google/api/*OrBuilder</className>

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java

+38
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
4848
return new Advice();
4949
}
5050

51+
@java.lang.Override
52+
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
53+
return this.unknownFields;
54+
}
55+
5156
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
5257
return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
5358
}
@@ -347,6 +352,39 @@ private void buildPartial0(com.google.api.Advice result) {
347352
}
348353
}
349354

355+
@java.lang.Override
356+
public Builder clone() {
357+
return super.clone();
358+
}
359+
360+
@java.lang.Override
361+
public Builder setField(
362+
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
363+
return super.setField(field, value);
364+
}
365+
366+
@java.lang.Override
367+
public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
368+
return super.clearField(field);
369+
}
370+
371+
@java.lang.Override
372+
public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
373+
return super.clearOneof(oneof);
374+
}
375+
376+
@java.lang.Override
377+
public Builder setRepeatedField(
378+
com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
379+
return super.setRepeatedField(field, index, value);
380+
}
381+
382+
@java.lang.Override
383+
public Builder addRepeatedField(
384+
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
385+
return super.addRepeatedField(field, value);
386+
}
387+
350388
@java.lang.Override
351389
public Builder mergeFrom(com.google.protobuf.Message other) {
352390
if (other instanceof com.google.api.Advice) {

0 commit comments

Comments
 (0)