Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "chore: [common-protos] upgrading Protobuf to 23.1 and gRPC to 1.55.0 in code generation" #1713

Merged
merged 1 commit into from
May 25, 2023
Merged

Revert "chore: [common-protos] upgrading Protobuf to 23.1 and gRPC to 1.55.0 in code generation" #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions java-common-protos/proto-google-common-protos/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
38 changes: 38 additions & 0 deletions java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand Down
Loading