Thanks to visit codestin.com
Credit goes to github.com

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

Commit 0536d1b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): update version of Protobuf to v3.20.1 (#219)
- [ ] 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 48c7256 commit 0536d1b

40 files changed

+158
-50
lines changed

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/CloudSqlConnectionProfile.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ private CloudSqlConnectionProfile(
121121
}
122122
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
123123
throw e.setUnfinishedMessage(this);
124+
} catch (com.google.protobuf.UninitializedMessageException e) {
125+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
124126
} catch (java.io.IOException e) {
125127
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
126128
} finally {

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/CloudSqlSettings.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ private CloudSqlSettings(
243243
}
244244
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
245245
throw e.setUnfinishedMessage(this);
246+
} catch (com.google.protobuf.UninitializedMessageException e) {
247+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
246248
} catch (java.io.IOException e) {
247249
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
248250
} finally {
@@ -970,7 +972,7 @@ public int getUserLabelsCount() {
970972
@java.lang.Override
971973
public boolean containsUserLabels(java.lang.String key) {
972974
if (key == null) {
973-
throw new java.lang.NullPointerException();
975+
throw new NullPointerException("map key");
974976
}
975977
return internalGetUserLabels().getMap().containsKey(key);
976978
}
@@ -1012,7 +1014,7 @@ public java.util.Map<java.lang.String, java.lang.String> getUserLabelsMap() {
10121014
public java.lang.String getUserLabelsOrDefault(
10131015
java.lang.String key, java.lang.String defaultValue) {
10141016
if (key == null) {
1015-
throw new java.lang.NullPointerException();
1017+
throw new NullPointerException("map key");
10161018
}
10171019
java.util.Map<java.lang.String, java.lang.String> map = internalGetUserLabels().getMap();
10181020
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1032,7 +1034,7 @@ public java.lang.String getUserLabelsOrDefault(
10321034
@java.lang.Override
10331035
public java.lang.String getUserLabelsOrThrow(java.lang.String key) {
10341036
if (key == null) {
1035-
throw new java.lang.NullPointerException();
1037+
throw new NullPointerException("map key");
10361038
}
10371039
java.util.Map<java.lang.String, java.lang.String> map = internalGetUserLabels().getMap();
10381040
if (!map.containsKey(key)) {
@@ -1357,7 +1359,7 @@ public int getDatabaseFlagsCount() {
13571359
@java.lang.Override
13581360
public boolean containsDatabaseFlags(java.lang.String key) {
13591361
if (key == null) {
1360-
throw new java.lang.NullPointerException();
1362+
throw new NullPointerException("map key");
13611363
}
13621364
return internalGetDatabaseFlags().getMap().containsKey(key);
13631365
}
@@ -1397,7 +1399,7 @@ public java.util.Map<java.lang.String, java.lang.String> getDatabaseFlagsMap() {
13971399
public java.lang.String getDatabaseFlagsOrDefault(
13981400
java.lang.String key, java.lang.String defaultValue) {
13991401
if (key == null) {
1400-
throw new java.lang.NullPointerException();
1402+
throw new NullPointerException("map key");
14011403
}
14021404
java.util.Map<java.lang.String, java.lang.String> map = internalGetDatabaseFlags().getMap();
14031405
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1416,7 +1418,7 @@ public java.lang.String getDatabaseFlagsOrDefault(
14161418
@java.lang.Override
14171419
public java.lang.String getDatabaseFlagsOrThrow(java.lang.String key) {
14181420
if (key == null) {
1419-
throw new java.lang.NullPointerException();
1421+
throw new NullPointerException("map key");
14201422
}
14211423
java.util.Map<java.lang.String, java.lang.String> map = internalGetDatabaseFlags().getMap();
14221424
if (!map.containsKey(key)) {
@@ -2517,7 +2519,7 @@ public int getUserLabelsCount() {
25172519
@java.lang.Override
25182520
public boolean containsUserLabels(java.lang.String key) {
25192521
if (key == null) {
2520-
throw new java.lang.NullPointerException();
2522+
throw new NullPointerException("map key");
25212523
}
25222524
return internalGetUserLabels().getMap().containsKey(key);
25232525
}
@@ -2559,7 +2561,7 @@ public java.util.Map<java.lang.String, java.lang.String> getUserLabelsMap() {
25592561
public java.lang.String getUserLabelsOrDefault(
25602562
java.lang.String key, java.lang.String defaultValue) {
25612563
if (key == null) {
2562-
throw new java.lang.NullPointerException();
2564+
throw new NullPointerException("map key");
25632565
}
25642566
java.util.Map<java.lang.String, java.lang.String> map = internalGetUserLabels().getMap();
25652567
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -2579,7 +2581,7 @@ public java.lang.String getUserLabelsOrDefault(
25792581
@java.lang.Override
25802582
public java.lang.String getUserLabelsOrThrow(java.lang.String key) {
25812583
if (key == null) {
2582-
throw new java.lang.NullPointerException();
2584+
throw new NullPointerException("map key");
25832585
}
25842586
java.util.Map<java.lang.String, java.lang.String> map = internalGetUserLabels().getMap();
25852587
if (!map.containsKey(key)) {
@@ -2606,7 +2608,7 @@ public Builder clearUserLabels() {
26062608
*/
26072609
public Builder removeUserLabels(java.lang.String key) {
26082610
if (key == null) {
2609-
throw new java.lang.NullPointerException();
2611+
throw new NullPointerException("map key");
26102612
}
26112613
internalGetMutableUserLabels().getMutableMap().remove(key);
26122614
return this;
@@ -2630,11 +2632,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableUserLabels()
26302632
*/
26312633
public Builder putUserLabels(java.lang.String key, java.lang.String value) {
26322634
if (key == null) {
2633-
throw new java.lang.NullPointerException();
2635+
throw new NullPointerException("map key");
26342636
}
26352637
if (value == null) {
2636-
throw new java.lang.NullPointerException();
2638+
throw new NullPointerException("map value");
26372639
}
2640+
26382641
internalGetMutableUserLabels().getMutableMap().put(key, value);
26392642
return this;
26402643
}
@@ -3572,7 +3575,7 @@ public int getDatabaseFlagsCount() {
35723575
@java.lang.Override
35733576
public boolean containsDatabaseFlags(java.lang.String key) {
35743577
if (key == null) {
3575-
throw new java.lang.NullPointerException();
3578+
throw new NullPointerException("map key");
35763579
}
35773580
return internalGetDatabaseFlags().getMap().containsKey(key);
35783581
}
@@ -3612,7 +3615,7 @@ public java.util.Map<java.lang.String, java.lang.String> getDatabaseFlagsMap() {
36123615
public java.lang.String getDatabaseFlagsOrDefault(
36133616
java.lang.String key, java.lang.String defaultValue) {
36143617
if (key == null) {
3615-
throw new java.lang.NullPointerException();
3618+
throw new NullPointerException("map key");
36163619
}
36173620
java.util.Map<java.lang.String, java.lang.String> map = internalGetDatabaseFlags().getMap();
36183621
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -3631,7 +3634,7 @@ public java.lang.String getDatabaseFlagsOrDefault(
36313634
@java.lang.Override
36323635
public java.lang.String getDatabaseFlagsOrThrow(java.lang.String key) {
36333636
if (key == null) {
3634-
throw new java.lang.NullPointerException();
3637+
throw new NullPointerException("map key");
36353638
}
36363639
java.util.Map<java.lang.String, java.lang.String> map = internalGetDatabaseFlags().getMap();
36373640
if (!map.containsKey(key)) {
@@ -3657,7 +3660,7 @@ public Builder clearDatabaseFlags() {
36573660
*/
36583661
public Builder removeDatabaseFlags(java.lang.String key) {
36593662
if (key == null) {
3660-
throw new java.lang.NullPointerException();
3663+
throw new NullPointerException("map key");
36613664
}
36623665
internalGetMutableDatabaseFlags().getMutableMap().remove(key);
36633666
return this;
@@ -3680,11 +3683,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableDatabaseFlags
36803683
*/
36813684
public Builder putDatabaseFlags(java.lang.String key, java.lang.String value) {
36823685
if (key == null) {
3683-
throw new java.lang.NullPointerException();
3686+
throw new NullPointerException("map key");
36843687
}
36853688
if (value == null) {
3686-
throw new java.lang.NullPointerException();
3689+
throw new NullPointerException("map value");
36873690
}
3691+
36883692
internalGetMutableDatabaseFlags().getMutableMap().put(key, value);
36893693
return this;
36903694
}

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/CloudSqlSettingsOrBuilder.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,12 @@ public interface CloudSqlSettingsOrBuilder
104104
*
105105
* <code>map&lt;string, string&gt; user_labels = 2;</code>
106106
*/
107-
java.lang.String getUserLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
107+
108+
/* nullable */
109+
java.lang.String getUserLabelsOrDefault(
110+
java.lang.String key,
111+
/* nullable */
112+
java.lang.String defaultValue);
108113
/**
109114
*
110115
*
@@ -367,7 +372,12 @@ public interface CloudSqlSettingsOrBuilder
367372
*
368373
* <code>map&lt;string, string&gt; database_flags = 8;</code>
369374
*/
370-
java.lang.String getDatabaseFlagsOrDefault(java.lang.String key, java.lang.String defaultValue);
375+
376+
/* nullable */
377+
java.lang.String getDatabaseFlagsOrDefault(
378+
java.lang.String key,
379+
/* nullable */
380+
java.lang.String defaultValue);
371381
/**
372382
*
373383
*

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ConnectionProfile.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ private ConnectionProfile(
230230
}
231231
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
232232
throw e.setUnfinishedMessage(this);
233+
} catch (com.google.protobuf.UninitializedMessageException e) {
234+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
233235
} catch (java.io.IOException e) {
234236
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
235237
} finally {
@@ -782,7 +784,7 @@ public int getLabelsCount() {
782784
@java.lang.Override
783785
public boolean containsLabels(java.lang.String key) {
784786
if (key == null) {
785-
throw new java.lang.NullPointerException();
787+
throw new NullPointerException("map key");
786788
}
787789
return internalGetLabels().getMap().containsKey(key);
788790
}
@@ -823,7 +825,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
823825
@java.lang.Override
824826
public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
825827
if (key == null) {
826-
throw new java.lang.NullPointerException();
828+
throw new NullPointerException("map key");
827829
}
828830
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
829831
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -843,7 +845,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
843845
@java.lang.Override
844846
public java.lang.String getLabelsOrThrow(java.lang.String key) {
845847
if (key == null) {
846-
throw new java.lang.NullPointerException();
848+
throw new NullPointerException("map key");
847849
}
848850
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
849851
if (!map.containsKey(key)) {
@@ -2376,7 +2378,7 @@ public int getLabelsCount() {
23762378
@java.lang.Override
23772379
public boolean containsLabels(java.lang.String key) {
23782380
if (key == null) {
2379-
throw new java.lang.NullPointerException();
2381+
throw new NullPointerException("map key");
23802382
}
23812383
return internalGetLabels().getMap().containsKey(key);
23822384
}
@@ -2418,7 +2420,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
24182420
public java.lang.String getLabelsOrDefault(
24192421
java.lang.String key, java.lang.String defaultValue) {
24202422
if (key == null) {
2421-
throw new java.lang.NullPointerException();
2423+
throw new NullPointerException("map key");
24222424
}
24232425
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
24242426
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -2438,7 +2440,7 @@ public java.lang.String getLabelsOrDefault(
24382440
@java.lang.Override
24392441
public java.lang.String getLabelsOrThrow(java.lang.String key) {
24402442
if (key == null) {
2441-
throw new java.lang.NullPointerException();
2443+
throw new NullPointerException("map key");
24422444
}
24432445
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
24442446
if (!map.containsKey(key)) {
@@ -2465,7 +2467,7 @@ public Builder clearLabels() {
24652467
*/
24662468
public Builder removeLabels(java.lang.String key) {
24672469
if (key == null) {
2468-
throw new java.lang.NullPointerException();
2470+
throw new NullPointerException("map key");
24692471
}
24702472
internalGetMutableLabels().getMutableMap().remove(key);
24712473
return this;
@@ -2489,11 +2491,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
24892491
*/
24902492
public Builder putLabels(java.lang.String key, java.lang.String value) {
24912493
if (key == null) {
2492-
throw new java.lang.NullPointerException();
2494+
throw new NullPointerException("map key");
24932495
}
24942496
if (value == null) {
2495-
throw new java.lang.NullPointerException();
2497+
throw new NullPointerException("map value");
24962498
}
2499+
24972500
internalGetMutableLabels().getMutableMap().put(key, value);
24982501
return this;
24992502
}
@@ -2826,8 +2829,9 @@ public Builder mergeMysql(com.google.cloud.clouddms.v1.MySqlConnectionProfile va
28262829
} else {
28272830
if (connectionProfileCase_ == 100) {
28282831
mysqlBuilder_.mergeFrom(value);
2832+
} else {
2833+
mysqlBuilder_.setMessage(value);
28292834
}
2830-
mysqlBuilder_.setMessage(value);
28312835
}
28322836
connectionProfileCase_ = 100;
28332837
return this;
@@ -3037,8 +3041,9 @@ public Builder mergePostgresql(com.google.cloud.clouddms.v1.PostgreSqlConnection
30373041
} else {
30383042
if (connectionProfileCase_ == 101) {
30393043
postgresqlBuilder_.mergeFrom(value);
3044+
} else {
3045+
postgresqlBuilder_.setMessage(value);
30403046
}
3041-
postgresqlBuilder_.setMessage(value);
30423047
}
30433048
connectionProfileCase_ = 101;
30443049
return this;
@@ -3249,8 +3254,9 @@ public Builder mergeCloudsql(com.google.cloud.clouddms.v1.CloudSqlConnectionProf
32493254
} else {
32503255
if (connectionProfileCase_ == 102) {
32513256
cloudsqlBuilder_.mergeFrom(value);
3257+
} else {
3258+
cloudsqlBuilder_.setMessage(value);
32523259
}
3253-
cloudsqlBuilder_.setMessage(value);
32543260
}
32553261
connectionProfileCase_ = 102;
32563262
return this;

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/ConnectionProfileOrBuilder.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,12 @@ public interface ConnectionProfileOrBuilder
192192
*
193193
* <code>map&lt;string, string&gt; labels = 4;</code>
194194
*/
195-
java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
195+
196+
/* nullable */
197+
java.lang.String getLabelsOrDefault(
198+
java.lang.String key,
199+
/* nullable */
200+
java.lang.String defaultValue);
196201
/**
197202
*
198203
*

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/CreateConnectionProfileRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ private CreateConnectionProfileRequest(
121121
}
122122
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
123123
throw e.setUnfinishedMessage(this);
124+
} catch (com.google.protobuf.UninitializedMessageException e) {
125+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
124126
} catch (java.io.IOException e) {
125127
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
126128
} finally {

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/CreateMigrationJobRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ private CreateMigrationJobRequest(
121121
}
122122
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
123123
throw e.setUnfinishedMessage(this);
124+
} catch (com.google.protobuf.UninitializedMessageException e) {
125+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
124126
} catch (java.io.IOException e) {
125127
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
126128
} finally {

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/DatabaseType.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ private DatabaseType(
9696
}
9797
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
9898
throw e.setUnfinishedMessage(this);
99+
} catch (com.google.protobuf.UninitializedMessageException e) {
100+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
99101
} catch (java.io.IOException e) {
100102
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
101103
} finally {

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/DeleteConnectionProfileRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ private DeleteConnectionProfileRequest(
102102
}
103103
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
104104
throw e.setUnfinishedMessage(this);
105+
} catch (com.google.protobuf.UninitializedMessageException e) {
106+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
105107
} catch (java.io.IOException e) {
106108
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
107109
} finally {

‎proto-google-cloud-dms-v1/src/main/java/com/google/cloud/clouddms/v1/DeleteMigrationJobRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ private DeleteMigrationJobRequest(
101101
}
102102
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
103103
throw e.setUnfinishedMessage(this);
104+
} catch (com.google.protobuf.UninitializedMessageException e) {
105+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
104106
} catch (java.io.IOException e) {
105107
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
106108
} finally {

0 commit comments

Comments
 (0)