Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 7e57066

Browse files
chore(bazel): update version of Protobuf to v3.20.1 (#338)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 444328399 Source-Link: googleapis/googleapis@c7ca416 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d61705453a62b3ecda78aa30c192840ebc5a8a90 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDYxNzA1NDUzYTYyYjNlY2RhNzhhYTMwYzE5Mjg0MGViYzVhOGE5MCJ9
1 parent 1930b68 commit 7e57066

28 files changed

+152
-48
lines changed

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/AdBreak.java

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ private AdBreak(
9494
}
9595
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9696
throw e.setUnfinishedMessage(this);
97+
} catch (com.google.protobuf.UninitializedMessageException e) {
98+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9799
} catch (java.io.IOException e) {
98100
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
99101
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/AudioStream.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ private AudioStream(
130130
}
131131
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
132132
throw e.setUnfinishedMessage(this);
133+
} catch (com.google.protobuf.UninitializedMessageException e) {
134+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
133135
} catch (java.io.IOException e) {
134136
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
135137
} finally {
@@ -367,6 +369,8 @@ private AudioMapping(
367369
}
368370
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
369371
throw e.setUnfinishedMessage(this);
372+
} catch (com.google.protobuf.UninitializedMessageException e) {
373+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
370374
} catch (java.io.IOException e) {
371375
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
372376
} finally {
@@ -592,7 +596,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
592596
if (outputChannel_ != 0) {
593597
output.writeInt32(5, outputChannel_);
594598
}
595-
if (gainDb_ != 0D) {
599+
if (java.lang.Double.doubleToRawLongBits(gainDb_) != 0) {
596600
output.writeDouble(6, gainDb_);
597601
}
598602
unknownFields.writeTo(output);
@@ -619,7 +623,7 @@ public int getSerializedSize() {
619623
if (outputChannel_ != 0) {
620624
size += com.google.protobuf.CodedOutputStream.computeInt32Size(5, outputChannel_);
621625
}
622-
if (gainDb_ != 0D) {
626+
if (java.lang.Double.doubleToRawLongBits(gainDb_) != 0) {
623627
size += com.google.protobuf.CodedOutputStream.computeDoubleSize(6, gainDb_);
624628
}
625629
size += unknownFields.getSerializedSize();

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/CreateJobRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ private CreateJobRequest(
104104
}
105105
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
106106
throw e.setUnfinishedMessage(this);
107+
} catch (com.google.protobuf.UninitializedMessageException e) {
108+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
107109
} catch (java.io.IOException e) {
108110
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
109111
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/CreateJobTemplateRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ private CreateJobTemplateRequest(
112112
}
113113
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
114114
throw e.setUnfinishedMessage(this);
115+
} catch (com.google.protobuf.UninitializedMessageException e) {
116+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
115117
} catch (java.io.IOException e) {
116118
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
117119
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/DeleteJobRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ private DeleteJobRequest(
9393
}
9494
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9595
throw e.setUnfinishedMessage(this);
96+
} catch (com.google.protobuf.UninitializedMessageException e) {
97+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9698
} catch (java.io.IOException e) {
9799
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
98100
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/DeleteJobTemplateRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ private DeleteJobTemplateRequest(
9393
}
9494
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9595
throw e.setUnfinishedMessage(this);
96+
} catch (com.google.protobuf.UninitializedMessageException e) {
97+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9698
} catch (java.io.IOException e) {
9799
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
98100
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/EditAtom.java

+2
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ private EditAtom(
130130
}
131131
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
132132
throw e.setUnfinishedMessage(this);
133+
} catch (com.google.protobuf.UninitializedMessageException e) {
134+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
133135
} catch (java.io.IOException e) {
134136
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
135137
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/ElementaryStream.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ private ElementaryStream(
147147
}
148148
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
149149
throw e.setUnfinishedMessage(this);
150+
} catch (com.google.protobuf.UninitializedMessageException e) {
151+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
150152
} catch (java.io.IOException e) {
151153
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
152154
} finally {
@@ -1075,8 +1077,9 @@ public Builder mergeVideoStream(com.google.cloud.video.transcoder.v1.VideoStream
10751077
} else {
10761078
if (elementaryStreamCase_ == 1) {
10771079
videoStreamBuilder_.mergeFrom(value);
1080+
} else {
1081+
videoStreamBuilder_.setMessage(value);
10781082
}
1079-
videoStreamBuilder_.setMessage(value);
10801083
}
10811084
elementaryStreamCase_ = 1;
10821085
return this;
@@ -1285,8 +1288,9 @@ public Builder mergeAudioStream(com.google.cloud.video.transcoder.v1.AudioStream
12851288
} else {
12861289
if (elementaryStreamCase_ == 2) {
12871290
audioStreamBuilder_.mergeFrom(value);
1291+
} else {
1292+
audioStreamBuilder_.setMessage(value);
12881293
}
1289-
audioStreamBuilder_.setMessage(value);
12901294
}
12911295
elementaryStreamCase_ = 2;
12921296
return this;
@@ -1495,8 +1499,9 @@ public Builder mergeTextStream(com.google.cloud.video.transcoder.v1.TextStream v
14951499
} else {
14961500
if (elementaryStreamCase_ == 3) {
14971501
textStreamBuilder_.mergeFrom(value);
1502+
} else {
1503+
textStreamBuilder_.setMessage(value);
14981504
}
1499-
textStreamBuilder_.setMessage(value);
15001505
}
15011506
elementaryStreamCase_ = 3;
15021507
return this;

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/GetJobRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ private GetJobRequest(
8888
}
8989
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9090
throw e.setUnfinishedMessage(this);
91+
} catch (com.google.protobuf.UninitializedMessageException e) {
92+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9193
} catch (java.io.IOException e) {
9294
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
9395
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/GetJobTemplateRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ private GetJobTemplateRequest(
8888
}
8989
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9090
throw e.setUnfinishedMessage(this);
91+
} catch (com.google.protobuf.UninitializedMessageException e) {
92+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9193
} catch (java.io.IOException e) {
9294
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
9395
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/Input.java

+2
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ private Input(
113113
}
114114
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
115115
throw e.setUnfinishedMessage(this);
116+
} catch (com.google.protobuf.UninitializedMessageException e) {
117+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
116118
} catch (java.io.IOException e) {
117119
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
118120
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/Job.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ private Job(
200200
}
201201
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
202202
throw e.setUnfinishedMessage(this);
203+
} catch (com.google.protobuf.UninitializedMessageException e) {
204+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
203205
} catch (java.io.IOException e) {
204206
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
205207
} finally {
@@ -2227,8 +2229,9 @@ public Builder mergeConfig(com.google.cloud.video.transcoder.v1.JobConfig value)
22272229
} else {
22282230
if (jobConfigCase_ == 5) {
22292231
configBuilder_.mergeFrom(value);
2232+
} else {
2233+
configBuilder_.setMessage(value);
22302234
}
2231-
configBuilder_.setMessage(value);
22322235
}
22332236
jobConfigCase_ = 5;
22342237
return this;

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/JobConfig.java

+2
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ private JobConfig(
218218
}
219219
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
220220
throw e.setUnfinishedMessage(this);
221+
} catch (com.google.protobuf.UninitializedMessageException e) {
222+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
221223
} catch (java.io.IOException e) {
222224
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
223225
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/JobTemplate.java

+2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ private JobTemplate(
104104
}
105105
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
106106
throw e.setUnfinishedMessage(this);
107+
} catch (com.google.protobuf.UninitializedMessageException e) {
108+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
107109
} catch (java.io.IOException e) {
108110
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
109111
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/ListJobTemplatesRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ private ListJobTemplatesRequest(
117117
}
118118
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
119119
throw e.setUnfinishedMessage(this);
120+
} catch (com.google.protobuf.UninitializedMessageException e) {
121+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
120122
} catch (java.io.IOException e) {
121123
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
122124
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/ListJobTemplatesResponse.java

+2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ private ListJobTemplatesResponse(
114114
}
115115
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
116116
throw e.setUnfinishedMessage(this);
117+
} catch (com.google.protobuf.UninitializedMessageException e) {
118+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
117119
} catch (java.io.IOException e) {
118120
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
119121
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/ListJobsRequest.java

+2
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ private ListJobsRequest(
118118
}
119119
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
120120
throw e.setUnfinishedMessage(this);
121+
} catch (com.google.protobuf.UninitializedMessageException e) {
122+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
121123
} catch (java.io.IOException e) {
122124
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
123125
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/ListJobsResponse.java

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ private ListJobsResponse(
112112
}
113113
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
114114
throw e.setUnfinishedMessage(this);
115+
} catch (com.google.protobuf.UninitializedMessageException e) {
116+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
115117
} catch (java.io.IOException e) {
116118
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
117119
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/Manifest.java

+2
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ private Manifest(
108108
}
109109
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
110110
throw e.setUnfinishedMessage(this);
111+
} catch (com.google.protobuf.UninitializedMessageException e) {
112+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
111113
} catch (java.io.IOException e) {
112114
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
113115
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/MuxStream.java

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ private MuxStream(
133133
}
134134
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
135135
throw e.setUnfinishedMessage(this);
136+
} catch (com.google.protobuf.UninitializedMessageException e) {
137+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
136138
} catch (java.io.IOException e) {
137139
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
138140
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/Output.java

+2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ private Output(
8888
}
8989
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9090
throw e.setUnfinishedMessage(this);
91+
} catch (com.google.protobuf.UninitializedMessageException e) {
92+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
9193
} catch (java.io.IOException e) {
9294
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
9395
} finally {

proto-google-cloud-video-transcoder-v1/src/main/java/com/google/cloud/video/transcoder/v1/Overlay.java

+26-9
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ private Overlay(
113113
}
114114
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
115115
throw e.setUnfinishedMessage(this);
116+
} catch (com.google.protobuf.UninitializedMessageException e) {
117+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
116118
} catch (java.io.IOException e) {
117119
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
118120
} finally {
@@ -398,6 +400,8 @@ private NormalizedCoordinate(
398400
}
399401
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
400402
throw e.setUnfinishedMessage(this);
403+
} catch (com.google.protobuf.UninitializedMessageException e) {
404+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
401405
} catch (java.io.IOException e) {
402406
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
403407
} finally {
@@ -471,10 +475,10 @@ public final boolean isInitialized() {
471475

472476
@java.lang.Override
473477
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
474-
if (x_ != 0D) {
478+
if (java.lang.Double.doubleToRawLongBits(x_) != 0) {
475479
output.writeDouble(1, x_);
476480
}
477-
if (y_ != 0D) {
481+
if (java.lang.Double.doubleToRawLongBits(y_) != 0) {
478482
output.writeDouble(2, y_);
479483
}
480484
unknownFields.writeTo(output);
@@ -486,10 +490,10 @@ public int getSerializedSize() {
486490
if (size != -1) return size;
487491

488492
size = 0;
489-
if (x_ != 0D) {
493+
if (java.lang.Double.doubleToRawLongBits(x_) != 0) {
490494
size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, x_);
491495
}
492-
if (y_ != 0D) {
496+
if (java.lang.Double.doubleToRawLongBits(y_) != 0) {
493497
size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, y_);
494498
}
495499
size += unknownFields.getSerializedSize();
@@ -1151,6 +1155,8 @@ private Image(
11511155
}
11521156
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
11531157
throw e.setUnfinishedMessage(this);
1158+
} catch (com.google.protobuf.UninitializedMessageException e) {
1159+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
11541160
} catch (java.io.IOException e) {
11551161
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
11561162
} finally {
@@ -1322,7 +1328,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
13221328
if (resolution_ != null) {
13231329
output.writeMessage(2, getResolution());
13241330
}
1325-
if (alpha_ != 0D) {
1331+
if (java.lang.Double.doubleToRawLongBits(alpha_) != 0) {
13261332
output.writeDouble(3, alpha_);
13271333
}
13281334
unknownFields.writeTo(output);
@@ -1340,7 +1346,7 @@ public int getSerializedSize() {
13401346
if (resolution_ != null) {
13411347
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getResolution());
13421348
}
1343-
if (alpha_ != 0D) {
1349+
if (java.lang.Double.doubleToRawLongBits(alpha_) != 0) {
13441350
size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, alpha_);
13451351
}
13461352
size += unknownFields.getSerializedSize();
@@ -2291,6 +2297,8 @@ private AnimationStatic(
22912297
}
22922298
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
22932299
throw e.setUnfinishedMessage(this);
2300+
} catch (com.google.protobuf.UninitializedMessageException e) {
2301+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
22942302
} catch (java.io.IOException e) {
22952303
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
22962304
} finally {
@@ -3530,6 +3538,8 @@ private AnimationFade(
35303538
}
35313539
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
35323540
throw e.setUnfinishedMessage(this);
3541+
} catch (com.google.protobuf.UninitializedMessageException e) {
3542+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
35333543
} catch (java.io.IOException e) {
35343544
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
35353545
} finally {
@@ -5049,6 +5059,8 @@ private AnimationEnd(
50495059
}
50505060
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
50515061
throw e.setUnfinishedMessage(this);
5062+
} catch (com.google.protobuf.UninitializedMessageException e) {
5063+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
50525064
} catch (java.io.IOException e) {
50535065
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
50545066
} finally {
@@ -5933,6 +5945,8 @@ private Animation(
59335945
}
59345946
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
59355947
throw e.setUnfinishedMessage(this);
5948+
} catch (com.google.protobuf.UninitializedMessageException e) {
5949+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
59365950
} catch (java.io.IOException e) {
59375951
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
59385952
} finally {
@@ -6707,8 +6721,9 @@ public Builder mergeAnimationStatic(
67076721
} else {
67086722
if (animationTypeCase_ == 1) {
67096723
animationStaticBuilder_.mergeFrom(value);
6724+
} else {
6725+
animationStaticBuilder_.setMessage(value);
67106726
}
6711-
animationStaticBuilder_.setMessage(value);
67126727
}
67136728
animationTypeCase_ = 1;
67146729
return this;
@@ -6927,8 +6942,9 @@ public Builder mergeAnimationFade(
69276942
} else {
69286943
if (animationTypeCase_ == 2) {
69296944
animationFadeBuilder_.mergeFrom(value);
6945+
} else {
6946+
animationFadeBuilder_.setMessage(value);
69306947
}
6931-
animationFadeBuilder_.setMessage(value);
69326948
}
69336949
animationTypeCase_ = 2;
69346950
return this;
@@ -7143,8 +7159,9 @@ public Builder mergeAnimationEnd(
71437159
} else {
71447160
if (animationTypeCase_ == 3) {
71457161
animationEndBuilder_.mergeFrom(value);
7162+
} else {
7163+
animationEndBuilder_.setMessage(value);
71467164
}
7147-
animationEndBuilder_.setMessage(value);
71487165
}
71497166
animationTypeCase_ = 3;
71507167
return this;

0 commit comments

Comments
 (0)