Skip to content

Commit 9a5b36b

Browse files
ludochgae-java-bot
authored andcommitted
Don't use ExtensionRegistry.getGeneratedRegistry() when parsing protos in our code. Needed to ease the proto2 migration to newer version.
PiperOrigin-RevId: 751189880 Change-Id: I3e40bdceebc1e0589de3af32af0e0dbee1efd6ed
1 parent 0badbe4 commit 9a5b36b

8 files changed

Lines changed: 2 additions & 1155 deletions

File tree

lib/tools_api/src/main/protobuf/runtime_config.proto

Lines changed: 0 additions & 187 deletions
This file was deleted.

protobuf/label_options.proto

Lines changed: 0 additions & 27 deletions
This file was deleted.

protobuf/span_details.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ syntax = "proto2";
2222

2323
package cloud_trace;
2424

25-
import "label_options.proto";
2625
import "span_kind.proto";
2726

2827
option java_package = "com.google.apphosting.base.protos";

remoteapi/src/main/java/com/google/appengine/tools/remoteapi/TransactionBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public RemoteApiPb.TransactionRequest makeCommitRequest() {
151151
Message.Builder newKey = result.getDeletesBuilder().addKeyBuilder();
152152
boolean parsed = true;
153153
try {
154-
newKey.mergeFrom(entry.getKey(), ExtensionRegistry.getGeneratedRegistry());
154+
newKey.mergeFrom(entry.getKey(), ExtensionRegistry.getEmptyRegistry());
155155
} catch (InvalidProtocolBufferException e) {
156156
parsed = false;
157157
}
@@ -170,7 +170,7 @@ private static RemoteApiPb.TransactionRequest.Precondition makeEntityNotFoundPre
170170
OnestoreEntity.Reference.Builder ref = OnestoreEntity.Reference.newBuilder();
171171
boolean parsed = true;
172172
try {
173-
ref.mergeFrom(key, ExtensionRegistry.getGeneratedRegistry());
173+
ref.mergeFrom(key, ExtensionRegistry.getEmptyRegistry());
174174
} catch (InvalidProtocolBufferException e) {
175175
parsed = false;
176176
}

0 commit comments

Comments
 (0)