diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f60d7749..a79f0627 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 -# created: 2022-04-06T16:30:03.627422514Z + digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 +# created: 2022-05-19T15:12:45.278246753Z diff --git a/.github/release-please.yml b/.github/release-please.yml index f8a70319..e5028553 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -10,3 +10,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.6.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.8.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 70835c79..6f1ecd85 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -47,6 +47,21 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - OwlBot Post Processor + - pattern: 2.8.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor permissionRules: - team: yoshi-admins permission: admin diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 8475a37e..27402752 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -74,6 +74,11 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg new file mode 100644 index 00000000..a3f7fb9d --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a3db2dec..d92a2875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [2.9.0](https://github.com/googleapis/java-common-protos/compare/v2.8.3...v2.9.0) (2022-06-06) + + +### Features + +* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-common-protos/issues/1440)) ([#368](https://github.com/googleapis/java-common-protos/issues/368)) ([0b58c8c](https://github.com/googleapis/java-common-protos/commit/0b58c8c234513f82e7057ad7aa0c1d82b6bb9761)) +* next release from main branch is 2.9.0 ([#354](https://github.com/googleapis/java-common-protos/issues/354)) ([1858e4f](https://github.com/googleapis/java-common-protos/commit/1858e4f90299ab6ae2fa937cd9c033c238540336)) + + +### Dependencies + +* update dependency com.google.protobuf:protobuf-bom to v3.20.1 ([#360](https://github.com/googleapis/java-common-protos/issues/360)) ([83fc812](https://github.com/googleapis/java-common-protos/commit/83fc812f71ca8870d3875f6fab3cdc4a3d91f8df)) +* update dependency com.google.protobuf:protobuf-bom to v3.21.0 ([#369](https://github.com/googleapis/java-common-protos/issues/369)) ([b011a05](https://github.com/googleapis/java-common-protos/commit/b011a055c437395aac5fdf3fa32208f6dd958d69)) +* update dependency com.google.protobuf:protobuf-bom to v3.21.1 ([#371](https://github.com/googleapis/java-common-protos/issues/371)) ([5f5c43a](https://github.com/googleapis/java-common-protos/commit/5f5c43a1ebc96a862b5881545f676b297526dde6)) +* update dependency com.google.protobuf:protobuf-java to v3.20.1 ([#361](https://github.com/googleapis/java-common-protos/issues/361)) ([2423c08](https://github.com/googleapis/java-common-protos/commit/2423c08c1726ecfeba02edf19a9da4c8e4c9426f)) +* update dependency com.google.protobuf:protobuf-java to v3.21.0 ([#370](https://github.com/googleapis/java-common-protos/issues/370)) ([de8d5f1](https://github.com/googleapis/java-common-protos/commit/de8d5f1a6486b01b5145460391161e8882f18b68)) +* update dependency com.google.protobuf:protobuf-java to v3.21.1 ([#372](https://github.com/googleapis/java-common-protos/issues/372)) ([c9723c5](https://github.com/googleapis/java-common-protos/commit/c9723c5b6dd2ab386672b737ca26349c6a4e7731)) +* update dependency io.grpc:grpc-bom to v1.46.0 ([#362](https://github.com/googleapis/java-common-protos/issues/362)) ([8222c0f](https://github.com/googleapis/java-common-protos/commit/8222c0ff268d2bbdaa1f591f0b840f099f421c5e)) +* update dependency io.grpc:grpc-bom to v1.47.0 ([#373](https://github.com/googleapis/java-common-protos/issues/373)) ([71d07af](https://github.com/googleapis/java-common-protos/commit/71d07afa1ebb52d0cb95fac0529d343501a5c7a3)) +* update dependency io.grpc:grpc-protobuf to v1.46.0 ([#363](https://github.com/googleapis/java-common-protos/issues/363)) ([c03a2b7](https://github.com/googleapis/java-common-protos/commit/c03a2b77a3bb7e637f8cce961fa23322bc977a29)) +* update dependency io.grpc:grpc-protobuf to v1.47.0 ([#374](https://github.com/googleapis/java-common-protos/issues/374)) ([003fae8](https://github.com/googleapis/java-common-protos/commit/003fae815194859bae8724123925ab55774ba475)) +* update dependency io.grpc:grpc-stub to v1.46.0 ([#364](https://github.com/googleapis/java-common-protos/issues/364)) ([0bc45a5](https://github.com/googleapis/java-common-protos/commit/0bc45a5254a21cd5eb0582abf9fe2fc7a54d45c7)) +* update dependency io.grpc:grpc-stub to v1.47.0 ([#375](https://github.com/googleapis/java-common-protos/issues/375)) ([c27d218](https://github.com/googleapis/java-common-protos/commit/c27d218b4684ab378e631b3da4970f433929db68)) + ### [2.8.3](https://github.com/googleapis/java-common-protos/compare/v2.8.2...v2.8.3) (2022-04-12) diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle index 6bc7e67e..1149f875 100644 --- a/grpc-google-common-protos/build.gradle +++ b/grpc-google-common-protos/build.gradle @@ -18,8 +18,8 @@ repositories { } dependencies { - compile 'io.grpc:grpc-stub:1.45.1' - compile 'io.grpc:grpc-protobuf:1.45.1' + compile 'io.grpc:grpc-stub:1.47.0' + compile 'io.grpc:grpc-protobuf:1.47.0' compile project(':proto-google-common-protos') } diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml index 82870bc4..bbd84d1d 100644 --- a/grpc-google-common-protos/pom.xml +++ b/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.8.3 + 2.9.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.8.3 + 2.9.0 diff --git a/pom.xml b/pom.xml index 70d2c9f0..93dfbd25 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.8.3 + 2.9.0 Google Common Protos Parent https://github.com/googleapis/java-iam @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.3.2 + 1.4.0 @@ -63,9 +63,9 @@ UTF-8 github google-iam-parent - 3.19.4 + 3.21.1 4.13.2 - 1.45.1 + 1.47.0 31.0.1-android @@ -81,7 +81,7 @@ com.google.api.grpc grpc-google-common-protos - 2.8.3 + 2.9.0 io.grpc @@ -93,7 +93,7 @@ com.google.api.grpc proto-google-common-protos - 2.8.3 + 2.9.0 com.google.guava @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.2 + 3.3.0 @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 html diff --git a/proto-google-common-protos/build.gradle b/proto-google-common-protos/build.gradle index 0c3b69fe..6d01e551 100644 --- a/proto-google-common-protos/build.gradle +++ b/proto-google-common-protos/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - compile 'com.google.protobuf:protobuf-java:3.19.4' + compile 'com.google.protobuf:protobuf-java:3.21.1' } sourceSets { diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml index 8b17f026..5346a967 100644 --- a/proto-google-common-protos/pom.xml +++ b/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.8.3 + 2.9.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.8.3 + 2.9.0 diff --git a/proto-google-common-protos/src/main/java/com/google/api/Advice.java b/proto-google-common-protos/src/main/java/com/google/api/Advice.java index f6971ca3..96c1227c 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Advice.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Advice.java @@ -89,6 +89,8 @@ private Advice( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java b/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java index 053bf695..82d9c1f8 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java +++ b/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java @@ -134,6 +134,8 @@ private AuthProvider( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java b/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java index 9f7637bd..6c8e9433 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java +++ b/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java @@ -98,6 +98,8 @@ private AuthRequirement( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Authentication.java b/proto-google-common-protos/src/main/java/com/google/api/Authentication.java index 6fb27454..0cf0d156 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Authentication.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Authentication.java @@ -118,6 +118,8 @@ private Authentication( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java b/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java index 7c4d9499..1e5e4ee3 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java @@ -126,6 +126,8 @@ private AuthenticationRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Backend.java b/proto-google-common-protos/src/main/java/com/google/api/Backend.java index 7877728b..0bb926e7 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Backend.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Backend.java @@ -91,6 +91,8 @@ private Backend( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java b/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java index 78cb9c12..d8fbed9f 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java @@ -118,8 +118,8 @@ private BackendRule( } case 64: { - authenticationCase_ = 8; authentication_ = input.readBool(); + authenticationCase_ = 8; break; } case 74: @@ -140,6 +140,8 @@ private BackendRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -836,13 +838,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(address_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, address_); } - if (deadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(deadline_) != 0) { output.writeDouble(3, deadline_); } - if (minDeadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(minDeadline_) != 0) { output.writeDouble(4, minDeadline_); } - if (operationDeadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(operationDeadline_) != 0) { output.writeDouble(5, operationDeadline_); } if (pathTranslation_ @@ -873,13 +875,13 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(address_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, address_); } - if (deadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(deadline_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, deadline_); } - if (minDeadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(minDeadline_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(4, minDeadline_); } - if (operationDeadline_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(operationDeadline_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(5, operationDeadline_); } if (pathTranslation_ diff --git a/proto-google-common-protos/src/main/java/com/google/api/Billing.java b/proto-google-common-protos/src/main/java/com/google/api/Billing.java index f15b3324..d4a13217 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Billing.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Billing.java @@ -122,6 +122,8 @@ private Billing( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -315,6 +317,8 @@ private BillingDestination( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java b/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java index 1529cd7d..d66ae47c 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java @@ -127,6 +127,8 @@ private ConfigChange( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Context.java b/proto-google-common-protos/src/main/java/com/google/api/Context.java index cc643c69..2bff949c 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Context.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Context.java @@ -118,6 +118,8 @@ private Context( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java b/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java index 4f783a81..dfdcc8b5 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ContextRule.java @@ -134,6 +134,8 @@ private ContextRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Control.java b/proto-google-common-protos/src/main/java/com/google/api/Control.java index 56c807a7..98ca2241 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Control.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Control.java @@ -90,6 +90,8 @@ private Control( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java b/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java index 6bd34a47..5c0158d4 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java +++ b/proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java @@ -96,6 +96,8 @@ private CustomHttpPattern( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Distribution.java b/proto-google-common-protos/src/main/java/com/google/api/Distribution.java index bf71f1b0..ad6ecb81 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Distribution.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Distribution.java @@ -174,6 +174,8 @@ private Distribution( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -303,6 +305,8 @@ private Range( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -376,10 +380,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (min_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(min_) != 0) { output.writeDouble(1, min_); } - if (max_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(max_) != 0) { output.writeDouble(2, max_); } unknownFields.writeTo(output); @@ -391,10 +395,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (min_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(min_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, min_); } - if (max_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(max_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, max_); } size += unknownFields.getSerializedSize(); @@ -1098,6 +1102,8 @@ private BucketOptions( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -1247,6 +1253,8 @@ private Linear( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); @@ -1342,10 +1350,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (numFiniteBuckets_ != 0) { output.writeInt32(1, numFiniteBuckets_); } - if (width_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(width_) != 0) { output.writeDouble(2, width_); } - if (offset_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(offset_) != 0) { output.writeDouble(3, offset_); } unknownFields.writeTo(output); @@ -1360,10 +1368,10 @@ public int getSerializedSize() { if (numFiniteBuckets_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, numFiniteBuckets_); } - if (width_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(width_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, width_); } - if (offset_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(offset_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, offset_); } size += unknownFields.getSerializedSize(); @@ -2024,6 +2032,8 @@ private Exponential( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); @@ -2119,10 +2129,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (numFiniteBuckets_ != 0) { output.writeInt32(1, numFiniteBuckets_); } - if (growthFactor_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(growthFactor_) != 0) { output.writeDouble(2, growthFactor_); } - if (scale_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(scale_) != 0) { output.writeDouble(3, scale_); } unknownFields.writeTo(output); @@ -2137,10 +2147,10 @@ public int getSerializedSize() { if (numFiniteBuckets_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, numFiniteBuckets_); } - if (growthFactor_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(growthFactor_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, growthFactor_); } - if (scale_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(scale_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, scale_); } size += unknownFields.getSerializedSize(); @@ -2813,6 +2823,8 @@ private Explicit( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); @@ -4172,8 +4184,9 @@ public Builder mergeLinearBuckets(com.google.api.Distribution.BucketOptions.Line } else { if (optionsCase_ == 1) { linearBucketsBuilder_.mergeFrom(value); + } else { + linearBucketsBuilder_.setMessage(value); } - linearBucketsBuilder_.setMessage(value); } optionsCase_ = 1; return this; @@ -4384,8 +4397,9 @@ public Builder mergeExponentialBuckets( } else { if (optionsCase_ == 2) { exponentialBucketsBuilder_.mergeFrom(value); + } else { + exponentialBucketsBuilder_.setMessage(value); } - exponentialBucketsBuilder_.setMessage(value); } optionsCase_ = 2; return this; @@ -4597,8 +4611,9 @@ public Builder mergeExplicitBuckets( } else { if (optionsCase_ == 3) { explicitBucketsBuilder_.mergeFrom(value); + } else { + explicitBucketsBuilder_.setMessage(value); } - explicitBucketsBuilder_.setMessage(value); } optionsCase_ = 3; return this; @@ -4981,6 +4996,8 @@ private Exemplar( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -5185,7 +5202,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (value_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(value_) != 0) { output.writeDouble(1, value_); } if (timestamp_ != null) { @@ -5203,7 +5220,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (value_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(value_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, value_); } if (timestamp_ != null) { @@ -6666,10 +6683,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (count_ != 0L) { output.writeInt64(1, count_); } - if (mean_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(mean_) != 0) { output.writeDouble(2, mean_); } - if (sumOfSquaredDeviation_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(sumOfSquaredDeviation_) != 0) { output.writeDouble(3, sumOfSquaredDeviation_); } if (range_ != null) { @@ -6700,10 +6717,10 @@ public int getSerializedSize() { if (count_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, count_); } - if (mean_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(mean_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, mean_); } - if (sumOfSquaredDeviation_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(sumOfSquaredDeviation_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, sumOfSquaredDeviation_); } if (range_ != null) { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Documentation.java b/proto-google-common-protos/src/main/java/com/google/api/Documentation.java index 9e8f1564..3a3472de 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Documentation.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Documentation.java @@ -183,6 +183,8 @@ private Documentation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java b/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java index 4e2091e6..0d8ea9f9 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java @@ -104,6 +104,8 @@ private DocumentationRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java b/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java index 50832fdb..8098b595 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Endpoint.java @@ -126,6 +126,8 @@ private Endpoint( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -213,6 +215,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return A list containing the aliases. */ @java.lang.Deprecated @@ -232,6 +235,7 @@ public com.google.protobuf.ProtocolStringList getAliasesList() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return The count of aliases. */ @java.lang.Deprecated @@ -251,6 +255,7 @@ public int getAliasesCount() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the element to return. * @return The aliases at the given index. */ @@ -271,6 +276,7 @@ public java.lang.String getAliases(int index) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the value to return. * @return The bytes of the aliases at the given index. */ @@ -876,6 +882,7 @@ private void ensureAliasesIsMutable() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return A list containing the aliases. */ @java.lang.Deprecated @@ -895,6 +902,7 @@ public com.google.protobuf.ProtocolStringList getAliasesList() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return The count of aliases. */ @java.lang.Deprecated @@ -914,6 +922,7 @@ public int getAliasesCount() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the element to return. * @return The aliases at the given index. */ @@ -934,6 +943,7 @@ public java.lang.String getAliases(int index) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the value to return. * @return The bytes of the aliases at the given index. */ @@ -954,6 +964,7 @@ public com.google.protobuf.ByteString getAliasesBytes(int index) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index to set the value at. * @param value The aliases to set. * @return This builder for chaining. @@ -981,6 +992,7 @@ public Builder setAliases(int index, java.lang.String value) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param value The aliases to add. * @return This builder for chaining. */ @@ -1007,6 +1019,7 @@ public Builder addAliases(java.lang.String value) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param values The aliases to add. * @return This builder for chaining. */ @@ -1030,6 +1043,7 @@ public Builder addAllAliases(java.lang.Iterable values) { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return This builder for chaining. */ @java.lang.Deprecated @@ -1052,6 +1066,7 @@ public Builder clearAliases() { * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param value The bytes of the aliases to add. * @return This builder for chaining. */ diff --git a/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java index 8ca3e63a..45c0022e 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/api/EndpointOrBuilder.java @@ -61,6 +61,7 @@ public interface EndpointOrBuilder * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return A list containing the aliases. */ @java.lang.Deprecated @@ -78,6 +79,7 @@ public interface EndpointOrBuilder * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @return The count of aliases. */ @java.lang.Deprecated @@ -95,6 +97,7 @@ public interface EndpointOrBuilder * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the element to return. * @return The aliases at the given index. */ @@ -113,6 +116,7 @@ public interface EndpointOrBuilder * * repeated string aliases = 2 [deprecated = true]; * + * @deprecated google.api.Endpoint.aliases is deprecated. See google/api/endpoint.proto;l=51 * @param index The index of the value to return. * @return The bytes of the aliases at the given index. */ diff --git a/proto-google-common-protos/src/main/java/com/google/api/Http.java b/proto-google-common-protos/src/main/java/com/google/api/Http.java index f5335d19..44346f3e 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Http.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Http.java @@ -98,6 +98,8 @@ private Http( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java b/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java index 91b0371d..5ed516cb 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java +++ b/proto-google-common-protos/src/main/java/com/google/api/HttpBody.java @@ -135,6 +135,8 @@ private HttpBody( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java b/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java index 596483e8..822d0404 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/HttpRule.java @@ -387,6 +387,8 @@ private HttpRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -2834,8 +2836,9 @@ public Builder mergeCustom(com.google.api.CustomHttpPattern value) { } else { if (patternCase_ == 8) { customBuilder_.mergeFrom(value); + } else { + customBuilder_.setMessage(value); } - customBuilder_.setMessage(value); } patternCase_ = 8; return this; diff --git a/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java b/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java index 177d6dd9..ab1866fe 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java +++ b/proto-google-common-protos/src/main/java/com/google/api/JwtLocation.java @@ -102,6 +102,8 @@ private JwtLocation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java b/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java index 3302ec30..701cc46b 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java +++ b/proto-google-common-protos/src/main/java/com/google/api/LabelDescriptor.java @@ -104,6 +104,8 @@ private LabelDescriptor( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java b/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java index 9e14ec07..9ef4aaeb 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java +++ b/proto-google-common-protos/src/main/java/com/google/api/LogDescriptor.java @@ -122,6 +122,8 @@ private LogDescriptor( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Logging.java b/proto-google-common-protos/src/main/java/com/google/api/Logging.java index 1d812d16..f0db6f0e 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Logging.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Logging.java @@ -133,6 +133,8 @@ private Logging( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -337,6 +339,8 @@ private LoggingDestination( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Metric.java b/proto-google-common-protos/src/main/java/com/google/api/Metric.java index f5809ceb..5c1bffb5 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Metric.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Metric.java @@ -103,6 +103,8 @@ private Metric( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -222,7 +224,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -259,7 +261,7 @@ public java.util.Map getLabelsMap() { @java.lang.Override public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -277,7 +279,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -789,7 +791,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -827,7 +829,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -845,7 +847,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -870,7 +872,7 @@ public Builder clearLabels() { */ public Builder removeLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableLabels().getMutableMap().remove(key); return this; @@ -892,11 +894,12 @@ public java.util.Map getMutableLabels() { */ public Builder putLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableLabels().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java b/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java index dce25377..d881471b 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MetricDescriptor.java @@ -186,6 +186,8 @@ private MetricDescriptor( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -664,6 +666,8 @@ public interface MetricDescriptorMetadataOrBuilder * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is deprecated. + * See google/api/metric.proto;l=36 * @return The enum numeric value on the wire for launchStage. */ @java.lang.Deprecated @@ -677,6 +681,8 @@ public interface MetricDescriptorMetadataOrBuilder * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is deprecated. + * See google/api/metric.proto;l=36 * @return The launchStage. */ @java.lang.Deprecated @@ -867,6 +873,8 @@ private MetricDescriptorMetadata( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -901,6 +909,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is deprecated. + * See google/api/metric.proto;l=36 * @return The enum numeric value on the wire for launchStage. */ @java.lang.Override @@ -917,6 +927,8 @@ public int getLaunchStageValue() { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is deprecated. + * See google/api/metric.proto;l=36 * @return The launchStage. */ @java.lang.Override @@ -1426,6 +1438,8 @@ public Builder mergeFrom( * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is + * deprecated. See google/api/metric.proto;l=36 * @return The enum numeric value on the wire for launchStage. */ @java.lang.Override @@ -1442,6 +1456,8 @@ public int getLaunchStageValue() { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is + * deprecated. See google/api/metric.proto;l=36 * @param value The enum numeric value on the wire for launchStage to set. * @return This builder for chaining. */ @@ -1461,6 +1477,8 @@ public Builder setLaunchStageValue(int value) { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is + * deprecated. See google/api/metric.proto;l=36 * @return The launchStage. */ @java.lang.Override @@ -1479,6 +1497,8 @@ public com.google.api.LaunchStage getLaunchStage() { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is + * deprecated. See google/api/metric.proto;l=36 * @param value The launchStage to set. * @return This builder for chaining. */ @@ -1501,6 +1521,8 @@ public Builder setLaunchStage(com.google.api.LaunchStage value) { * * .google.api.LaunchStage launch_stage = 1 [deprecated = true]; * + * @deprecated google.api.MetricDescriptor.MetricDescriptorMetadata.launch_stage is + * deprecated. See google/api/metric.proto;l=36 * @return This builder for chaining. */ @java.lang.Deprecated diff --git a/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java index 0eec7a00..db9fe4b1 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MetricOrBuilder.java @@ -96,7 +96,12 @@ public interface MetricOrBuilder * * map<string, string> labels = 2; */ - java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * diff --git a/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java b/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java index e0ba2167..f31a6064 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MetricRule.java @@ -105,6 +105,8 @@ private MetricRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -228,7 +230,7 @@ public int getMetricCostsCount() { @java.lang.Override public boolean containsMetricCosts(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetricCosts().getMap().containsKey(key); } @@ -271,7 +273,7 @@ public java.util.Map getMetricCostsMap() { @java.lang.Override public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetricCosts().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -292,7 +294,7 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) { @java.lang.Override public long getMetricCostsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetricCosts().getMap(); if (!map.containsKey(key)) { @@ -810,7 +812,7 @@ public int getMetricCostsCount() { @java.lang.Override public boolean containsMetricCosts(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetricCosts().getMap().containsKey(key); } @@ -853,7 +855,7 @@ public java.util.Map getMetricCostsMap() { @java.lang.Override public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetricCosts().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -874,7 +876,7 @@ public long getMetricCostsOrDefault(java.lang.String key, long defaultValue) { @java.lang.Override public long getMetricCostsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetricCosts().getMap(); if (!map.containsKey(key)) { @@ -902,7 +904,7 @@ public Builder clearMetricCosts() { */ public Builder removeMetricCosts(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableMetricCosts().getMutableMap().remove(key); return this; @@ -927,7 +929,7 @@ public java.util.Map getMutableMetricCosts() { */ public Builder putMetricCosts(java.lang.String key, long value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableMetricCosts().getMutableMap().put(key, value); diff --git a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java index 99a05445..500e4f46 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResource.java @@ -113,6 +113,8 @@ private MonitoredResource( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -238,7 +240,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -277,7 +279,7 @@ public java.util.Map getLabelsMap() { @java.lang.Override public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -296,7 +298,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -828,7 +830,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -868,7 +870,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -887,7 +889,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -913,7 +915,7 @@ public Builder clearLabels() { */ public Builder removeLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableLabels().getMutableMap().remove(key); return this; @@ -936,11 +938,12 @@ public java.util.Map getMutableLabels() { */ public Builder putLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableLabels().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java index 244b3300..c9b32f4b 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java @@ -139,6 +139,8 @@ private MonitoredResourceDescriptor( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java index 750f8a84..89da786c 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadata.java @@ -115,6 +115,8 @@ private MonitoredResourceMetadata( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -256,7 +258,7 @@ public int getUserLabelsCount() { @java.lang.Override public boolean containsUserLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetUserLabels().getMap().containsKey(key); } @@ -292,7 +294,7 @@ public java.util.Map getUserLabelsMap() { public java.lang.String getUserLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetUserLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -309,7 +311,7 @@ public java.lang.String getUserLabelsOrDefault( @java.lang.Override public java.lang.String getUserLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetUserLabels().getMap(); if (!map.containsKey(key)) { @@ -989,7 +991,7 @@ public int getUserLabelsCount() { @java.lang.Override public boolean containsUserLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetUserLabels().getMap().containsKey(key); } @@ -1025,7 +1027,7 @@ public java.util.Map getUserLabelsMap() { public java.lang.String getUserLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetUserLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1042,7 +1044,7 @@ public java.lang.String getUserLabelsOrDefault( @java.lang.Override public java.lang.String getUserLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetUserLabels().getMap(); if (!map.containsKey(key)) { @@ -1066,7 +1068,7 @@ public Builder clearUserLabels() { */ public Builder removeUserLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableUserLabels().getMutableMap().remove(key); return this; @@ -1087,11 +1089,12 @@ public java.util.Map getMutableUserLabels() */ public Builder putUserLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableUserLabels().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java index 598f284e..ac5ffa22 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceMetadataOrBuilder.java @@ -124,7 +124,12 @@ public interface MonitoredResourceMetadataOrBuilder * * map<string, string> user_labels = 2; */ - java.lang.String getUserLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getUserLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * diff --git a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java index c7edc4ea..299f3669 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceOrBuilder.java @@ -102,7 +102,12 @@ public interface MonitoredResourceOrBuilder * * map<string, string> labels = 2; */ - java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * diff --git a/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java b/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java index 8bfbec12..e266a358 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Monitoring.java @@ -156,6 +156,8 @@ private Monitoring( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -352,6 +354,8 @@ private MonitoringDestination( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java b/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java index cbdb4775..2a7aa320 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java +++ b/proto-google-common-protos/src/main/java/com/google/api/OAuthRequirements.java @@ -101,6 +101,8 @@ private OAuthRequirements( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Page.java b/proto-google-common-protos/src/main/java/com/google/api/Page.java index 5bf6d6ba..dac2e471 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Page.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Page.java @@ -108,6 +108,8 @@ private Page( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java b/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java index 6cff210e..30012543 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ProjectProperties.java @@ -105,6 +105,8 @@ private ProjectProperties( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Property.java b/proto-google-common-protos/src/main/java/com/google/api/Property.java index ee84f9b8..20d6909f 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Property.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Property.java @@ -111,6 +111,8 @@ private Property( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Quota.java b/proto-google-common-protos/src/main/java/com/google/api/Quota.java index 9b1f2ae6..3cac35d7 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Quota.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Quota.java @@ -141,6 +141,8 @@ private Quota( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java b/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java index 49f17c7f..3aa12432 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java +++ b/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java @@ -159,6 +159,8 @@ private QuotaLimit( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -574,7 +576,7 @@ public int getValuesCount() { @java.lang.Override public boolean containsValues(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetValues().getMap().containsKey(key); } @@ -613,7 +615,7 @@ public java.util.Map getValuesMap() { @java.lang.Override public long getValuesOrDefault(java.lang.String key, long defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetValues().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -632,7 +634,7 @@ public long getValuesOrDefault(java.lang.String key, long defaultValue) { @java.lang.Override public long getValuesOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetValues().getMap(); if (!map.containsKey(key)) { @@ -2028,7 +2030,7 @@ public int getValuesCount() { @java.lang.Override public boolean containsValues(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetValues().getMap().containsKey(key); } @@ -2067,7 +2069,7 @@ public java.util.Map getValuesMap() { @java.lang.Override public long getValuesOrDefault(java.lang.String key, long defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetValues().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -2086,7 +2088,7 @@ public long getValuesOrDefault(java.lang.String key, long defaultValue) { @java.lang.Override public long getValuesOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetValues().getMap(); if (!map.containsKey(key)) { @@ -2112,7 +2114,7 @@ public Builder clearValues() { */ public Builder removeValues(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableValues().getMutableMap().remove(key); return this; @@ -2135,7 +2137,7 @@ public java.util.Map getMutableValues() { */ public Builder putValues(java.lang.String key, long value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableValues().getMutableMap().put(key, value); diff --git a/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java b/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java index adc7fdc9..85daf0ed 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ResourceDescriptor.java @@ -194,6 +194,8 @@ private ResourceDescriptor( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java b/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java index 41cd06e4..edb21101 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ResourceReference.java @@ -97,6 +97,8 @@ private ResourceReference( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java b/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java index 7cd305f1..437aaa48 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java +++ b/proto-google-common-protos/src/main/java/com/google/api/RoutingParameter.java @@ -96,6 +96,8 @@ private RoutingParameter( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java b/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java index 08e1e223..e72b312a 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/RoutingRule.java @@ -358,6 +358,8 @@ private RoutingRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Service.java b/proto-google-common-protos/src/main/java/com/google/api/Service.java index b188d834..c08fd324 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Service.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Service.java @@ -410,6 +410,8 @@ private Service( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -1845,6 +1847,7 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() { * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See google/api/service.proto;l=173 * @return Whether the configVersion field is set. */ @java.lang.Override @@ -1863,6 +1866,7 @@ public boolean hasConfigVersion() { * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See google/api/service.proto;l=173 * @return The configVersion. */ @java.lang.Override @@ -8544,6 +8548,8 @@ public com.google.api.SourceInfoOrBuilder getSourceInfoOrBuilder() { * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See + * google/api/service.proto;l=173 * @return Whether the configVersion field is set. */ @java.lang.Deprecated @@ -8561,6 +8567,8 @@ public boolean hasConfigVersion() { * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See + * google/api/service.proto;l=173 * @return The configVersion. */ @java.lang.Deprecated diff --git a/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java index 4f511a1c..3727e723 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/api/ServiceOrBuilder.java @@ -1049,6 +1049,7 @@ public interface ServiceOrBuilder * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See google/api/service.proto;l=173 * @return Whether the configVersion field is set. */ @java.lang.Deprecated @@ -1064,6 +1065,7 @@ public interface ServiceOrBuilder * * .google.protobuf.UInt32Value config_version = 20 [deprecated = true]; * + * @deprecated google.api.Service.config_version is deprecated. See google/api/service.proto;l=173 * @return The configVersion. */ @java.lang.Deprecated diff --git a/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java b/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java index 791694cf..48165993 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/api/SourceInfo.java @@ -92,6 +92,8 @@ private SourceInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java b/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java index db2e12f1..e93b7740 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java +++ b/proto-google-common-protos/src/main/java/com/google/api/SystemParameter.java @@ -106,6 +106,8 @@ private SystemParameter( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java b/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java index 4e75c2e7..2878a0b9 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/SystemParameterRule.java @@ -101,6 +101,8 @@ private SystemParameterRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java b/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java index d8b18d52..55d9ab9a 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java +++ b/proto-google-common-protos/src/main/java/com/google/api/SystemParameters.java @@ -97,6 +97,8 @@ private SystemParameters( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Usage.java b/proto-google-common-protos/src/main/java/com/google/api/Usage.java index 487859a4..7bb9cdff 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Usage.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Usage.java @@ -110,6 +110,8 @@ private Usage( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java b/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java index c0e63574..672608bc 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/UsageRule.java @@ -115,6 +115,8 @@ private UsageRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/Visibility.java b/proto-google-common-protos/src/main/java/com/google/api/Visibility.java index 9946e038..5b8d8547 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/Visibility.java +++ b/proto-google-common-protos/src/main/java/com/google/api/Visibility.java @@ -108,6 +108,8 @@ private Visibility( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java b/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java index 499f8a77..faf5c533 100644 --- a/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java +++ b/proto-google-common-protos/src/main/java/com/google/api/VisibilityRule.java @@ -97,6 +97,8 @@ private VisibilityRule( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java index b7d14656..1778c9cc 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLog.java @@ -256,6 +256,8 @@ private AuditLog( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -985,6 +987,8 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() { * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return Whether the serviceData field is set. */ @java.lang.Override @@ -1003,6 +1007,8 @@ public boolean hasServiceData() { * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return The serviceData. */ @java.lang.Override @@ -4130,6 +4136,8 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() { * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return Whether the serviceData field is set. */ @java.lang.Deprecated @@ -4147,6 +4155,8 @@ public boolean hasServiceData() { * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return The serviceData. */ @java.lang.Deprecated diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java index 29df867a..49410158 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuditLogOrBuilder.java @@ -534,6 +534,8 @@ public interface AuditLogOrBuilder * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return Whether the serviceData field is set. */ @java.lang.Deprecated @@ -549,6 +551,8 @@ public interface AuditLogOrBuilder * * .google.protobuf.Any service_data = 15 [deprecated = true]; * + * @deprecated google.cloud.audit.AuditLog.service_data is deprecated. See + * google/cloud/audit/audit_log.proto;l=104 * @return The serviceData. */ @java.lang.Deprecated diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java index d45e5d89..e05ee208 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthenticationInfo.java @@ -142,6 +142,8 @@ private AuthenticationInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java index 30058b2a..75e61a89 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/AuthorizationInfo.java @@ -117,6 +117,8 @@ private AuthorizationInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java index a483792d..63629154 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/RequestMetadata.java @@ -136,6 +136,8 @@ private RequestMetadata( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java index 12f6f3e4..890a0e2d 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/ResourceLocation.java @@ -103,6 +103,8 @@ private ResourceLocation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java b/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java index 9ac04c59..7f06cb0f 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/audit/ServiceAccountDelegationInfo.java @@ -136,6 +136,8 @@ private ServiceAccountDelegationInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -309,6 +311,8 @@ private FirstPartyPrincipal( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -1258,6 +1262,8 @@ private ThirdPartyPrincipal( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -2819,8 +2825,9 @@ public Builder mergeFirstPartyPrincipal( } else { if (authorityCase_ == 1) { firstPartyPrincipalBuilder_.mergeFrom(value); + } else { + firstPartyPrincipalBuilder_.setMessage(value); } - firstPartyPrincipalBuilder_.setMessage(value); } authorityCase_ = 1; return this; @@ -3063,8 +3070,9 @@ public Builder mergeThirdPartyPrincipal( } else { if (authorityCase_ == 2) { thirdPartyPrincipalBuilder_.mergeFrom(value); + } else { + thirdPartyPrincipalBuilder_.setMessage(value); } - thirdPartyPrincipalBuilder_.setMessage(value); } authorityCase_ = 2; return this; diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java b/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java index df03662e..5d17d965 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/location/GetLocationRequest.java @@ -88,6 +88,8 @@ private GetLocationRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java b/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java index 7fcb20d6..874990ea 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsRequest.java @@ -109,6 +109,8 @@ private ListLocationsRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java b/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java index 77ad1993..7a1918f5 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/location/ListLocationsResponse.java @@ -101,6 +101,8 @@ private ListLocationsResponse( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java b/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java index 0288131d..5cec1c86 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/location/Location.java @@ -132,6 +132,8 @@ private Location( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -355,7 +357,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -392,7 +394,7 @@ public java.util.Map getLabelsMap() { @java.lang.Override public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -410,7 +412,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -1251,7 +1253,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -1289,7 +1291,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1307,7 +1309,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -1332,7 +1334,7 @@ public Builder clearLabels() { */ public Builder removeLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableLabels().getMutableMap().remove(key); return this; @@ -1354,11 +1356,12 @@ public java.util.Map getMutableLabels() { */ public Builder putLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableLabels().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java index 98ab25de..e1fb6694 100644 --- a/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/cloud/location/LocationOrBuilder.java @@ -148,7 +148,12 @@ public interface LocationOrBuilder * * map<string, string> labels = 2; */ - java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * diff --git a/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java b/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java index 0e6e4739..9b970c43 100644 --- a/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java +++ b/proto-google-common-protos/src/main/java/com/google/geo/type/Viewport.java @@ -133,6 +133,8 @@ private Viewport( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java b/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java index d3bfba6d..af8326a9 100644 --- a/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequest.java @@ -188,6 +188,8 @@ private HttpRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java b/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java index a693f21e..8f1b0a53 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/CancelOperationRequest.java @@ -88,6 +88,8 @@ private CancelOperationRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java b/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java index 7a839881..e9ce8e35 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/DeleteOperationRequest.java @@ -88,6 +88,8 @@ private DeleteOperationRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java b/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java index 37348bbc..65a711c0 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/GetOperationRequest.java @@ -88,6 +88,8 @@ private GetOperationRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java b/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java index 3bb14c6a..89732bf9 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsRequest.java @@ -109,6 +109,8 @@ private ListOperationsRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java b/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java index 006acb31..0a1b7bcc 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/ListOperationsResponse.java @@ -100,6 +100,8 @@ private ListOperationsResponse( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java b/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java index 2d8d9d92..4ec5fddd 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/Operation.java @@ -136,6 +136,8 @@ private Operation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -1384,8 +1386,9 @@ public Builder mergeError(com.google.rpc.Status value) { } else { if (resultCase_ == 4) { errorBuilder_.mergeFrom(value); + } else { + errorBuilder_.setMessage(value); } - errorBuilder_.setMessage(value); } resultCase_ = 4; return this; @@ -1621,8 +1624,9 @@ public Builder mergeResponse(com.google.protobuf.Any value) { } else { if (resultCase_ == 5) { responseBuilder_.mergeFrom(value); + } else { + responseBuilder_.setMessage(value); } - responseBuilder_.setMessage(value); } resultCase_ = 5; return this; diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java b/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java index 4b4b80bb..69b53b54 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/OperationInfo.java @@ -104,6 +104,8 @@ private OperationInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java b/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java index 45f02503..eb0bffee 100644 --- a/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/longrunning/WaitOperationRequest.java @@ -103,6 +103,8 @@ private WaitOperationRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java b/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java index 68e9d0f8..f92a1991 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/BadRequest.java @@ -95,6 +95,8 @@ private BadRequest( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -255,6 +257,8 @@ private FieldViolation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java b/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java index 9f1ae8c1..16154375 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/DebugInfo.java @@ -100,6 +100,8 @@ private DebugInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java b/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java index d3d6f6a6..c316d307 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfo.java @@ -130,6 +130,8 @@ private ErrorInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -318,7 +320,7 @@ public int getMetadataCount() { @java.lang.Override public boolean containsMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetadata().getMap().containsKey(key); } @@ -366,7 +368,7 @@ public java.util.Map getMetadataMap() { public java.lang.String getMetadataOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -389,7 +391,7 @@ public java.lang.String getMetadataOrDefault( @java.lang.Override public java.lang.String getMetadataOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); if (!map.containsKey(key)) { @@ -1082,7 +1084,7 @@ public int getMetadataCount() { @java.lang.Override public boolean containsMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetMetadata().getMap().containsKey(key); } @@ -1130,7 +1132,7 @@ public java.util.Map getMetadataMap() { public java.lang.String getMetadataOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1153,7 +1155,7 @@ public java.lang.String getMetadataOrDefault( @java.lang.Override public java.lang.String getMetadataOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetMetadata().getMap(); if (!map.containsKey(key)) { @@ -1183,7 +1185,7 @@ public Builder clearMetadata() { */ public Builder removeMetadata(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableMetadata().getMutableMap().remove(key); return this; @@ -1210,11 +1212,12 @@ public java.util.Map getMutableMetadata() { */ public Builder putMetadata(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableMetadata().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java b/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java index d2a070da..17a27407 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/ErrorInfoOrBuilder.java @@ -155,7 +155,12 @@ public interface ErrorInfoOrBuilder * * map<string, string> metadata = 3; */ - java.lang.String getMetadataOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getMetadataOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/Help.java b/proto-google-common-protos/src/main/java/com/google/rpc/Help.java index c5ad9887..35b5561c 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/Help.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/Help.java @@ -94,6 +94,8 @@ private Help( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -250,6 +252,8 @@ private Link( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java b/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java index 4ef61533..feec6e7d 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/LocalizedMessage.java @@ -97,6 +97,8 @@ private LocalizedMessage( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java b/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java index bf6feeac..a50c581d 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/PreconditionFailure.java @@ -97,6 +97,8 @@ private PreconditionFailure( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -301,6 +303,8 @@ private Violation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java b/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java index cb105990..f7f96132 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/QuotaFailure.java @@ -101,6 +101,8 @@ private QuotaFailure( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -273,6 +275,8 @@ private Violation( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java b/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java index 6095880d..b0e1a7f7 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/RequestInfo.java @@ -97,6 +97,8 @@ private RequestInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java b/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java index 9016943c..3e06b989 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/ResourceInfo.java @@ -112,6 +112,8 @@ private ResourceInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java b/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java index 5bcc1f41..0dcc4a38 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/RetryInfo.java @@ -104,6 +104,8 @@ private RetryInfo( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/Status.java b/proto-google-common-protos/src/main/java/com/google/rpc/Status.java index 09f4b814..282cb3c4 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/Status.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/Status.java @@ -109,6 +109,8 @@ private Status( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java b/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java index 26ff2d99..963d26f7 100644 --- a/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java +++ b/proto-google-common-protos/src/main/java/com/google/rpc/context/AttributeContext.java @@ -216,6 +216,8 @@ private AttributeContext( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -327,7 +329,12 @@ public interface PeerOrBuilder * * map<string, string> labels = 6; */ - java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * @@ -507,6 +514,8 @@ private Peer( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -645,7 +654,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -681,7 +690,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -698,7 +707,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -1422,7 +1431,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -1458,7 +1467,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -1475,7 +1484,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -1499,7 +1508,7 @@ public Builder clearLabels() { */ public Builder removeLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableLabels().getMutableMap().remove(key); return this; @@ -1520,11 +1529,12 @@ public java.util.Map getMutableLabels() { */ public Builder putLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableLabels().getMutableMap().put(key, value); return this; } @@ -2039,6 +2049,8 @@ private Api( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -3569,6 +3581,8 @@ private Auth( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -5588,7 +5602,12 @@ public interface RequestOrBuilder * * map<string, string> headers = 3; */ - java.lang.String getHeadersOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getHeadersOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * @@ -6031,6 +6050,8 @@ private Request( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -6206,7 +6227,7 @@ public int getHeadersCount() { @java.lang.Override public boolean containsHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetHeaders().getMap().containsKey(key); } @@ -6246,7 +6267,7 @@ public java.util.Map getHeadersMap() { public java.lang.String getHeadersOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -6265,7 +6286,7 @@ public java.lang.String getHeadersOrDefault( @java.lang.Override public java.lang.String getHeadersOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); if (!map.containsKey(key)) { @@ -7510,7 +7531,7 @@ public int getHeadersCount() { @java.lang.Override public boolean containsHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetHeaders().getMap().containsKey(key); } @@ -7550,7 +7571,7 @@ public java.util.Map getHeadersMap() { public java.lang.String getHeadersOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -7569,7 +7590,7 @@ public java.lang.String getHeadersOrDefault( @java.lang.Override public java.lang.String getHeadersOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); if (!map.containsKey(key)) { @@ -7595,7 +7616,7 @@ public Builder clearHeaders() { */ public Builder removeHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableHeaders().getMutableMap().remove(key); return this; @@ -7618,11 +7639,12 @@ public java.util.Map getMutableHeaders() { */ public Builder putHeaders(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableHeaders().getMutableMap().put(key, value); return this; } @@ -8869,7 +8891,12 @@ public interface ResponseOrBuilder * * map<string, string> headers = 3; */ - java.lang.String getHeadersOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getHeadersOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * @@ -9083,6 +9110,8 @@ private Response( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -9192,7 +9221,7 @@ public int getHeadersCount() { @java.lang.Override public boolean containsHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetHeaders().getMap().containsKey(key); } @@ -9232,7 +9261,7 @@ public java.util.Map getHeadersMap() { public java.lang.String getHeadersOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -9251,7 +9280,7 @@ public java.lang.String getHeadersOrDefault( @java.lang.Override public java.lang.String getHeadersOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); if (!map.containsKey(key)) { @@ -9948,7 +9977,7 @@ public int getHeadersCount() { @java.lang.Override public boolean containsHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetHeaders().getMap().containsKey(key); } @@ -9988,7 +10017,7 @@ public java.util.Map getHeadersMap() { public java.lang.String getHeadersOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -10007,7 +10036,7 @@ public java.lang.String getHeadersOrDefault( @java.lang.Override public java.lang.String getHeadersOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetHeaders().getMap(); if (!map.containsKey(key)) { @@ -10033,7 +10062,7 @@ public Builder clearHeaders() { */ public Builder removeHeaders(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableHeaders().getMutableMap().remove(key); return this; @@ -10056,11 +10085,12 @@ public java.util.Map getMutableHeaders() { */ public Builder putHeaders(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableHeaders().getMutableMap().put(key, value); return this; } @@ -10683,7 +10713,12 @@ public interface ResourceOrBuilder * * map<string, string> labels = 4; */ - java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * @@ -10783,7 +10818,12 @@ public interface ResourceOrBuilder * * map<string, string> annotations = 6; */ - java.lang.String getAnnotationsOrDefault(java.lang.String key, java.lang.String defaultValue); + + /* nullable */ + java.lang.String getAnnotationsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue); /** * * @@ -11202,6 +11242,8 @@ private Resource( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -11449,7 +11491,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -11487,7 +11529,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -11505,7 +11547,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -11613,7 +11655,7 @@ public int getAnnotationsCount() { @java.lang.Override public boolean containsAnnotations(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetAnnotations().getMap().containsKey(key); } @@ -11655,7 +11697,7 @@ public java.util.Map getAnnotationsMap() { public java.lang.String getAnnotationsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetAnnotations().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -11675,7 +11717,7 @@ public java.lang.String getAnnotationsOrDefault( @java.lang.Override public java.lang.String getAnnotationsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetAnnotations().getMap(); if (!map.containsKey(key)) { @@ -12991,7 +13033,7 @@ public int getLabelsCount() { @java.lang.Override public boolean containsLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetLabels().getMap().containsKey(key); } @@ -13029,7 +13071,7 @@ public java.util.Map getLabelsMap() { public java.lang.String getLabelsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -13047,7 +13089,7 @@ public java.lang.String getLabelsOrDefault( @java.lang.Override public java.lang.String getLabelsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetLabels().getMap(); if (!map.containsKey(key)) { @@ -13072,7 +13114,7 @@ public Builder clearLabels() { */ public Builder removeLabels(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableLabels().getMutableMap().remove(key); return this; @@ -13094,11 +13136,12 @@ public java.util.Map getMutableLabels() { */ public Builder putLabels(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableLabels().getMutableMap().put(key, value); return this; } @@ -13286,7 +13329,7 @@ public int getAnnotationsCount() { @java.lang.Override public boolean containsAnnotations(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } return internalGetAnnotations().getMap().containsKey(key); } @@ -13328,7 +13371,7 @@ public java.util.Map getAnnotationsMap() { public java.lang.String getAnnotationsOrDefault( java.lang.String key, java.lang.String defaultValue) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetAnnotations().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; @@ -13348,7 +13391,7 @@ public java.lang.String getAnnotationsOrDefault( @java.lang.Override public java.lang.String getAnnotationsOrThrow(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } java.util.Map map = internalGetAnnotations().getMap(); if (!map.containsKey(key)) { @@ -13375,7 +13418,7 @@ public Builder clearAnnotations() { */ public Builder removeAnnotations(java.lang.String key) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } internalGetMutableAnnotations().getMutableMap().remove(key); return this; @@ -13399,11 +13442,12 @@ public java.util.Map getMutableAnnotations() */ public Builder putAnnotations(java.lang.String key, java.lang.String value) { if (key == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map key"); } if (value == null) { - throw new java.lang.NullPointerException(); + throw new NullPointerException("map value"); } + internalGetMutableAnnotations().getMutableMap().put(key, value); return this; } diff --git a/proto-google-common-protos/src/main/java/com/google/type/Color.java b/proto-google-common-protos/src/main/java/com/google/type/Color.java index 39aa16d7..ee1c523b 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Color.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Color.java @@ -215,6 +215,8 @@ private Color( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -373,13 +375,13 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (red_ != 0F) { + if (java.lang.Float.floatToRawIntBits(red_) != 0) { output.writeFloat(1, red_); } - if (green_ != 0F) { + if (java.lang.Float.floatToRawIntBits(green_) != 0) { output.writeFloat(2, green_); } - if (blue_ != 0F) { + if (java.lang.Float.floatToRawIntBits(blue_) != 0) { output.writeFloat(3, blue_); } if (alpha_ != null) { @@ -394,13 +396,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (red_ != 0F) { + if (java.lang.Float.floatToRawIntBits(red_) != 0) { size += com.google.protobuf.CodedOutputStream.computeFloatSize(1, red_); } - if (green_ != 0F) { + if (java.lang.Float.floatToRawIntBits(green_) != 0) { size += com.google.protobuf.CodedOutputStream.computeFloatSize(2, green_); } - if (blue_ != 0F) { + if (java.lang.Float.floatToRawIntBits(blue_) != 0) { size += com.google.protobuf.CodedOutputStream.computeFloatSize(3, blue_); } if (alpha_ != null) { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Date.java b/proto-google-common-protos/src/main/java/com/google/type/Date.java index f2748a89..a531e68f 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Date.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Date.java @@ -104,6 +104,8 @@ private Date( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/DateTime.java b/proto-google-common-protos/src/main/java/com/google/type/DateTime.java index e33ab876..d8d553d7 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/DateTime.java +++ b/proto-google-common-protos/src/main/java/com/google/type/DateTime.java @@ -160,6 +160,8 @@ private DateTime( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -1470,8 +1472,9 @@ public Builder mergeUtcOffset(com.google.protobuf.Duration value) { } else { if (timeOffsetCase_ == 8) { utcOffsetBuilder_.mergeFrom(value); + } else { + utcOffsetBuilder_.setMessage(value); } - utcOffsetBuilder_.setMessage(value); } timeOffsetCase_ = 8; return this; @@ -1682,8 +1685,9 @@ public Builder mergeTimeZone(com.google.type.TimeZone value) { } else { if (timeOffsetCase_ == 9) { timeZoneBuilder_.mergeFrom(value); + } else { + timeZoneBuilder_.setMessage(value); } - timeZoneBuilder_.setMessage(value); } timeOffsetCase_ = 9; return this; diff --git a/proto-google-common-protos/src/main/java/com/google/type/Decimal.java b/proto-google-common-protos/src/main/java/com/google/type/Decimal.java index c7f211ec..b3e680b3 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Decimal.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Decimal.java @@ -93,6 +93,8 @@ private Decimal( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Expr.java b/proto-google-common-protos/src/main/java/com/google/type/Expr.java index 8e5cf50f..0c50e407 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Expr.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Expr.java @@ -133,6 +133,8 @@ private Expr( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Fraction.java b/proto-google-common-protos/src/main/java/com/google/type/Fraction.java index 4fe59d53..0b2eddb9 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Fraction.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Fraction.java @@ -89,6 +89,8 @@ private Fraction( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Interval.java b/proto-google-common-protos/src/main/java/com/google/type/Interval.java index ac92e596..4b65656d 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Interval.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Interval.java @@ -113,6 +113,8 @@ private Interval( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/LatLng.java b/proto-google-common-protos/src/main/java/com/google/type/LatLng.java index 8e892637..d65efdee 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/LatLng.java +++ b/proto-google-common-protos/src/main/java/com/google/type/LatLng.java @@ -93,6 +93,8 @@ private LatLng( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -163,10 +165,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (latitude_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(latitude_) != 0) { output.writeDouble(1, latitude_); } - if (longitude_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(longitude_) != 0) { output.writeDouble(2, longitude_); } unknownFields.writeTo(output); @@ -178,10 +180,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (latitude_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(latitude_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, latitude_); } - if (longitude_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(longitude_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, longitude_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java b/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java index 428b83f5..e7495c4d 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java +++ b/proto-google-common-protos/src/main/java/com/google/type/LocalizedText.java @@ -96,6 +96,8 @@ private LocalizedText( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Money.java b/proto-google-common-protos/src/main/java/com/google/type/Money.java index 85d2649f..4ea759c9 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Money.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Money.java @@ -98,6 +98,8 @@ private Money( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java b/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java index b4462dba..aecf7924 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java +++ b/proto-google-common-protos/src/main/java/com/google/type/PhoneNumber.java @@ -129,6 +129,8 @@ private PhoneNumber( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -298,6 +300,8 @@ private ShortCode( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -2062,8 +2066,9 @@ public Builder mergeShortCode(com.google.type.PhoneNumber.ShortCode value) { } else { if (kindCase_ == 2) { shortCodeBuilder_.mergeFrom(value); + } else { + shortCodeBuilder_.setMessage(value); } - shortCodeBuilder_.setMessage(value); } kindCase_ = 2; return this; diff --git a/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java b/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java index 0a0ce4ad..77f42f94 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java +++ b/proto-google-common-protos/src/main/java/com/google/type/PostalAddress.java @@ -185,6 +185,8 @@ private PostalAddress( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java b/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java index 1eaf393f..5f0963e9 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java +++ b/proto-google-common-protos/src/main/java/com/google/type/Quaternion.java @@ -141,6 +141,8 @@ private Quaternion( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { @@ -247,16 +249,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (x_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(x_) != 0) { output.writeDouble(1, x_); } - if (y_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(y_) != 0) { output.writeDouble(2, y_); } - if (z_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(z_) != 0) { output.writeDouble(3, z_); } - if (w_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(w_) != 0) { output.writeDouble(4, w_); } unknownFields.writeTo(output); @@ -268,16 +270,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (x_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(x_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(1, x_); } - if (y_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(y_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(2, y_); } - if (z_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(z_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, z_); } - if (w_ != 0D) { + if (java.lang.Double.doubleToRawLongBits(w_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(4, w_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java b/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java index 1445701e..b9c26b0a 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java +++ b/proto-google-common-protos/src/main/java/com/google/type/TimeOfDay.java @@ -102,6 +102,8 @@ private TimeOfDay( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java b/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java index e62bcb6c..3d32c213 100644 --- a/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java +++ b/proto-google-common-protos/src/main/java/com/google/type/TimeZone.java @@ -97,6 +97,8 @@ private TimeZone( } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { diff --git a/versions.txt b/versions.txt index 35c6b9d5..355ce4cc 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Format: # module:released-version:current-version -proto-google-common-protos:2.8.3:2.8.3 -grpc-google-common-protos:2.8.3:2.8.3 +proto-google-common-protos:2.9.0:2.9.0 +grpc-google-common-protos:2.9.0:2.9.0 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy