From 13fe87b31e1a13efdee67d9f51171e2d7b392e3f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 19:38:28 +0000 Subject: [PATCH] chore(bazel): update version of Protobuf to v3.20.1 (#655) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 444328399 Source-Link: https://github.com/googleapis/googleapis/commit/c7ca416c2856aad6a3f7092924e56b8cf0cb2534 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d61705453a62b3ecda78aa30c192840ebc5a8a90 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDYxNzA1NDUzYTYyYjNlY2RhNzhhYTMwYzE5Mjg0MGViYzVhOGE5MCJ9 chore: remove unused imports PiperOrigin-RevId: 440391736 Source-Link: https://github.com/googleapis/googleapis/commit/5d8422267cb40b035825dee8b6494cf2b9031613 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b474be544d6304cb20bc5f5b38ef6bc87243bc66 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjQ3NGJlNTQ0ZDYzMDRjYjIwYmM1ZjViMzhlZjZiYzg3MjQzYmM2NiJ9 feat: AuditConfig for IAM v1 PiperOrigin-RevId: 439356405 Source-Link: https://github.com/googleapis/googleapis/commit/afa2ba156bd5c83ad8168030ab801a8ca84ac819 Source-Link: https://github.com/googleapis/googleapis-gen/commit/3e40c17e1510c95fab58fc2143ccb61cceca5989 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2U0MGMxN2UxNTEwYzk1ZmFiNThmYzIxNDNjY2I2MWNjZWNhNTk4OSJ9 --- .../v1/RegistrationServiceClient.java | 2 + .../v1beta1/RegistrationServiceClient.java | 2 + .../v1/RegistrationServiceClientTest.java | 6 +++ .../RegistrationServiceClientTest.java | 6 +++ .../v1/CreateEndpointRequest.java | 2 + .../v1/CreateNamespaceRequest.java | 2 + .../v1/CreateServiceRequest.java | 2 + .../v1/DeleteEndpointRequest.java | 2 + .../v1/DeleteNamespaceRequest.java | 2 + .../v1/DeleteServiceRequest.java | 2 + .../cloud/servicedirectory/v1/Endpoint.java | 21 ++++++---- .../v1/EndpointOrBuilder.java | 7 +++- .../servicedirectory/v1/EndpointProto.java | 38 ++++++++--------- .../v1/GetEndpointRequest.java | 2 + .../v1/GetNamespaceRequest.java | 2 + .../v1/GetServiceRequest.java | 2 + .../v1/ListEndpointsRequest.java | 2 + .../v1/ListEndpointsResponse.java | 2 + .../v1/ListNamespacesRequest.java | 2 + .../v1/ListNamespacesResponse.java | 2 + .../v1/ListServicesRequest.java | 2 + .../v1/ListServicesResponse.java | 2 + .../cloud/servicedirectory/v1/Namespace.java | 21 ++++++---- .../v1/NamespaceOrBuilder.java | 7 +++- .../servicedirectory/v1/NamespaceProto.java | 33 +++++++-------- .../v1/ResolveServiceRequest.java | 2 + .../v1/ResolveServiceResponse.java | 2 + .../cloud/servicedirectory/v1/Service.java | 21 ++++++---- .../servicedirectory/v1/ServiceOrBuilder.java | 7 +++- .../servicedirectory/v1/ServiceProto.java | 41 +++++++++---------- .../v1/UpdateEndpointRequest.java | 2 + .../v1/UpdateNamespaceRequest.java | 2 + .../v1/UpdateServiceRequest.java | 2 + .../cloud/servicedirectory/v1/endpoint.proto | 1 - .../cloud/servicedirectory/v1/namespace.proto | 1 - .../cloud/servicedirectory/v1/service.proto | 1 - .../v1beta1/CreateEndpointRequest.java | 2 + .../v1beta1/CreateNamespaceRequest.java | 2 + .../v1beta1/CreateServiceRequest.java | 2 + .../v1beta1/DeleteEndpointRequest.java | 2 + .../v1beta1/DeleteNamespaceRequest.java | 2 + .../v1beta1/DeleteServiceRequest.java | 2 + .../servicedirectory/v1beta1/Endpoint.java | 21 ++++++---- .../v1beta1/EndpointOrBuilder.java | 7 +++- .../v1beta1/GetEndpointRequest.java | 2 + .../v1beta1/GetNamespaceRequest.java | 2 + .../v1beta1/GetServiceRequest.java | 2 + .../v1beta1/ListEndpointsRequest.java | 2 + .../v1beta1/ListEndpointsResponse.java | 2 + .../v1beta1/ListNamespacesRequest.java | 2 + .../v1beta1/ListNamespacesResponse.java | 2 + .../v1beta1/ListServicesRequest.java | 2 + .../v1beta1/ListServicesResponse.java | 2 + .../servicedirectory/v1beta1/Namespace.java | 21 ++++++---- .../v1beta1/NamespaceOrBuilder.java | 7 +++- .../v1beta1/ResolveServiceRequest.java | 2 + .../v1beta1/ResolveServiceResponse.java | 2 + .../servicedirectory/v1beta1/Service.java | 21 ++++++---- .../v1beta1/ServiceOrBuilder.java | 7 +++- .../v1beta1/UpdateEndpointRequest.java | 2 + .../v1beta1/UpdateNamespaceRequest.java | 2 + .../v1beta1/UpdateServiceRequest.java | 2 + 62 files changed, 256 insertions(+), 123 deletions(-) diff --git a/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClient.java b/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClient.java index 916c0a42..53f5b6d6 100644 --- a/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClient.java +++ b/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClient.java @@ -1814,6 +1814,7 @@ public final UnaryCallable getIamPolicyCallable() { * SetIamPolicyRequest.newBuilder() * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) * .setPolicy(Policy.newBuilder().build()) + * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); * Policy response = registrationServiceClient.setIamPolicy(request); * } @@ -1838,6 +1839,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) { * SetIamPolicyRequest.newBuilder() * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) * .setPolicy(Policy.newBuilder().build()) + * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); * ApiFuture future = * registrationServiceClient.setIamPolicyCallable().futureCall(request); diff --git a/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClient.java b/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClient.java index 06a5557c..91c9b5f2 100644 --- a/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClient.java +++ b/google-cloud-servicedirectory/src/main/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClient.java @@ -1815,6 +1815,7 @@ public final UnaryCallable getIamPolicyCallable() { * SetIamPolicyRequest.newBuilder() * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) * .setPolicy(Policy.newBuilder().build()) + * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); * Policy response = registrationServiceClient.setIamPolicy(request); * } @@ -1839,6 +1840,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) { * SetIamPolicyRequest.newBuilder() * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) * .setPolicy(Policy.newBuilder().build()) + * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); * ApiFuture future = * registrationServiceClient.setIamPolicyCallable().futureCall(request); diff --git a/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClientTest.java b/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClientTest.java index dc49984a..edc18dae 100644 --- a/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClientTest.java +++ b/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1/RegistrationServiceClientTest.java @@ -28,6 +28,7 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.iam.v1.AuditConfig; import com.google.iam.v1.Binding; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -1230,6 +1231,7 @@ public void getIamPolicyTest() throws Exception { Policy.newBuilder() .setVersion(351608024) .addAllBindings(new ArrayList()) + .addAllAuditConfigs(new ArrayList()) .setEtag(ByteString.EMPTY) .build(); mockRegistrationService.addResponse(expectedResponse); @@ -1279,6 +1281,7 @@ public void setIamPolicyTest() throws Exception { Policy.newBuilder() .setVersion(351608024) .addAllBindings(new ArrayList()) + .addAllAuditConfigs(new ArrayList()) .setEtag(ByteString.EMPTY) .build(); mockRegistrationService.addResponse(expectedResponse); @@ -1287,6 +1290,7 @@ public void setIamPolicyTest() throws Exception { SetIamPolicyRequest.newBuilder() .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) .setPolicy(Policy.newBuilder().build()) + .setUpdateMask(FieldMask.newBuilder().build()) .build(); Policy actualResponse = client.setIamPolicy(request); @@ -1298,6 +1302,7 @@ public void setIamPolicyTest() throws Exception { Assert.assertEquals(request.getResource(), actualRequest.getResource()); Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy()); + Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -1314,6 +1319,7 @@ public void setIamPolicyExceptionTest() throws Exception { SetIamPolicyRequest.newBuilder() .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) .setPolicy(Policy.newBuilder().build()) + .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); Assert.fail("No exception raised"); diff --git a/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClientTest.java b/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClientTest.java index b6e7c3f8..eaf7e9ad 100644 --- a/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClientTest.java +++ b/google-cloud-servicedirectory/src/test/java/com/google/cloud/servicedirectory/v1beta1/RegistrationServiceClientTest.java @@ -28,6 +28,7 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.iam.v1.AuditConfig; import com.google.iam.v1.Binding; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.GetPolicyOptions; @@ -1266,6 +1267,7 @@ public void getIamPolicyTest() throws Exception { Policy.newBuilder() .setVersion(351608024) .addAllBindings(new ArrayList()) + .addAllAuditConfigs(new ArrayList()) .setEtag(ByteString.EMPTY) .build(); mockRegistrationService.addResponse(expectedResponse); @@ -1315,6 +1317,7 @@ public void setIamPolicyTest() throws Exception { Policy.newBuilder() .setVersion(351608024) .addAllBindings(new ArrayList()) + .addAllAuditConfigs(new ArrayList()) .setEtag(ByteString.EMPTY) .build(); mockRegistrationService.addResponse(expectedResponse); @@ -1323,6 +1326,7 @@ public void setIamPolicyTest() throws Exception { SetIamPolicyRequest.newBuilder() .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) .setPolicy(Policy.newBuilder().build()) + .setUpdateMask(FieldMask.newBuilder().build()) .build(); Policy actualResponse = client.setIamPolicy(request); @@ -1334,6 +1338,7 @@ public void setIamPolicyTest() throws Exception { Assert.assertEquals(request.getResource(), actualRequest.getResource()); Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy()); + Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -1350,6 +1355,7 @@ public void setIamPolicyExceptionTest() throws Exception { SetIamPolicyRequest.newBuilder() .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) .setPolicy(Policy.newBuilder().build()) + .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); Assert.fail("No exception raised"); diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateEndpointRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateEndpointRequest.java index 2f3374c1..31d66f0c 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateEndpointRequest.java @@ -113,6 +113,8 @@ private CreateEndpointRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateNamespaceRequest.java index 92a8d9b8..3aa4ecfc 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateNamespaceRequest.java @@ -113,6 +113,8 @@ private CreateNamespaceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateServiceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateServiceRequest.java index 2d679463..7d757d5a 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/CreateServiceRequest.java @@ -113,6 +113,8 @@ private CreateServiceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteEndpointRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteEndpointRequest.java index f5f5b8b1..eaaa6f63 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteEndpointRequest.java @@ -89,6 +89,8 @@ private DeleteEndpointRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteNamespaceRequest.java index 83543779..33645123 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteNamespaceRequest.java @@ -89,6 +89,8 @@ private DeleteNamespaceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteServiceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteServiceRequest.java index 3985987b..112d0a5f 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/DeleteServiceRequest.java @@ -89,6 +89,8 @@ private DeleteServiceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Endpoint.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Endpoint.java index c28cc5cd..01814b6c 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Endpoint.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Endpoint.java @@ -119,6 +119,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 { @@ -343,7 +345,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); } @@ -419,7 +421,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; @@ -456,7 +458,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)) { @@ -1222,7 +1224,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); } @@ -1298,7 +1300,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; @@ -1335,7 +1337,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)) { @@ -1379,7 +1381,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; @@ -1420,11 +1422,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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointOrBuilder.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointOrBuilder.java index d66a9ca8..257e5006 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointOrBuilder.java @@ -224,7 +224,12 @@ public interface EndpointOrBuilder * map<string, string> annotations = 5 [(.google.api.field_behavior) = OPTIONAL]; * */ - 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); /** * * diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointProto.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointProto.java index 68410e1e..130a2a1b 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointProto.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/EndpointProto.java @@ -46,30 +46,29 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n/google/cloud/servicedirectory/v1/endpo" + "int.proto\022 google.cloud.servicedirectory" - + ".v1\032\034google/api/annotations.proto\032\037googl" - + "e/api/field_behavior.proto\032\031google/api/r" - + "esource.proto\"\352\002\n\010Endpoint\022\021\n\004name\030\001 \001(\t" - + "B\003\340A\005\022\024\n\007address\030\002 \001(\tB\003\340A\001\022\021\n\004port\030\003 \001(" - + "\005B\003\340A\001\022U\n\013annotations\030\005 \003(\0132;.google.clo" - + "ud.servicedirectory.v1.Endpoint.Annotati" - + "onsEntryB\003\340A\001\0322\n\020AnnotationsEntry\022\013\n\003key" - + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:\226\001\352A\222\001\n(servic" - + "edirectory.googleapis.com/Endpoint\022fproj" - + "ects/{project}/locations/{location}/name" - + "spaces/{namespace}/services/{service}/en" - + "dpoints/{endpoint}B\370\001\n$com.google.cloud." - + "servicedirectory.v1B\rEndpointProtoP\001ZPgo" - + "ogle.golang.org/genproto/googleapis/clou" - + "d/servicedirectory/v1;servicedirectory\370\001" - + "\001\252\002 Google.Cloud.ServiceDirectory.V1\312\002 G" - + "oogle\\Cloud\\ServiceDirectory\\V1\352\002#Google" - + "::Cloud::ServiceDirectory::V1b\006proto3" + + ".v1\032\037google/api/field_behavior.proto\032\031go" + + "ogle/api/resource.proto\"\352\002\n\010Endpoint\022\021\n\004" + + "name\030\001 \001(\tB\003\340A\005\022\024\n\007address\030\002 \001(\tB\003\340A\001\022\021\n" + + "\004port\030\003 \001(\005B\003\340A\001\022U\n\013annotations\030\005 \003(\0132;." + + "google.cloud.servicedirectory.v1.Endpoin" + + "t.AnnotationsEntryB\003\340A\001\0322\n\020AnnotationsEn" + + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:\226\001\352A" + + "\222\001\n(servicedirectory.googleapis.com/Endp" + + "oint\022fprojects/{project}/locations/{loca" + + "tion}/namespaces/{namespace}/services/{s" + + "ervice}/endpoints/{endpoint}B\370\001\n$com.goo" + + "gle.cloud.servicedirectory.v1B\rEndpointP" + + "rotoP\001ZPgoogle.golang.org/genproto/googl" + + "eapis/cloud/servicedirectory/v1;serviced" + + "irectory\370\001\001\252\002 Google.Cloud.ServiceDirect" + + "ory.V1\312\002 Google\\Cloud\\ServiceDirectory\\V" + + "1\352\002#Google::Cloud::ServiceDirectory::V1b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), }); @@ -97,7 +96,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ResourceProto.resource); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); } diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetEndpointRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetEndpointRequest.java index acdac5d0..b7610d02 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetEndpointRequest.java @@ -91,6 +91,8 @@ private GetEndpointRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetNamespaceRequest.java index e0efc272..8e6fd976 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetNamespaceRequest.java @@ -89,6 +89,8 @@ private GetNamespaceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetServiceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetServiceRequest.java index 414665cf..c4e4c7fe 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/GetServiceRequest.java @@ -91,6 +91,8 @@ private GetServiceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsRequest.java index bce153d9..23a5bb94 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsRequest.java @@ -118,6 +118,8 @@ private ListEndpointsRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsResponse.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsResponse.java index 9a099875..7a703c99 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsResponse.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListEndpointsResponse.java @@ -103,6 +103,8 @@ private ListEndpointsResponse( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesRequest.java index b742ddb3..62090a18 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesRequest.java @@ -118,6 +118,8 @@ private ListNamespacesRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesResponse.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesResponse.java index 1ef02647..d700559f 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesResponse.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListNamespacesResponse.java @@ -103,6 +103,8 @@ private ListNamespacesResponse( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesRequest.java index 8159b3ca..6839cc6d 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesRequest.java @@ -118,6 +118,8 @@ private ListServicesRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesResponse.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesResponse.java index e8cddc0e..496e444d 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesResponse.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ListServicesResponse.java @@ -102,6 +102,8 @@ private ListServicesResponse( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Namespace.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Namespace.java index 03c1f73b..e372791f 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Namespace.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Namespace.java @@ -104,6 +104,8 @@ private Namespace( } } 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 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); } @@ -267,7 +269,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; @@ -286,7 +288,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)) { @@ -807,7 +809,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); } @@ -847,7 +849,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; @@ -866,7 +868,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)) { @@ -892,7 +894,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; @@ -915,11 +917,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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceOrBuilder.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceOrBuilder.java index 8ced9286..cd7831b5 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceOrBuilder.java @@ -100,7 +100,12 @@ public interface NamespaceOrBuilder * * map<string, string> labels = 2 [(.google.api.field_behavior) = OPTIONAL]; */ - 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceProto.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceProto.java index 06c721a1..63fe62aa 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceProto.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/NamespaceProto.java @@ -46,28 +46,26 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n0google/cloud/servicedirectory/v1/names" + "pace.proto\022 google.cloud.servicedirector" - + "y.v1\032\034google/api/annotations.proto\032\037goog" - + "le/api/field_behavior.proto\032\031google/api/" - + "resource.proto\"\213\002\n\tNamespace\022\021\n\004name\030\001 \001" - + "(\tB\003\340A\005\022L\n\006labels\030\002 \003(\01327.google.cloud.s" - + "ervicedirectory.v1.Namespace.LabelsEntry" - + "B\003\340A\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" - + "ue\030\002 \001(\t:\0028\001:n\352Ak\n)servicedirectory.goog" - + "leapis.com/Namespace\022>projects/{project}" - + "/locations/{location}/namespaces/{namesp" - + "ace}B\371\001\n$com.google.cloud.servicedirecto" - + "ry.v1B\016NamespaceProtoP\001ZPgoogle.golang.o" - + "rg/genproto/googleapis/cloud/servicedire" - + "ctory/v1;servicedirectory\370\001\001\252\002 Google.Cl" - + "oud.ServiceDirectory.V1\312\002 Google\\Cloud\\S" - + "erviceDirectory\\V1\352\002#Google::Cloud::Serv" - + "iceDirectory::V1b\006proto3" + + "y.v1\032\037google/api/field_behavior.proto\032\031g" + + "oogle/api/resource.proto\"\213\002\n\tNamespace\022\021" + + "\n\004name\030\001 \001(\tB\003\340A\005\022L\n\006labels\030\002 \003(\01327.goog" + + "le.cloud.servicedirectory.v1.Namespace.L" + + "abelsEntryB\003\340A\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 " + + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:n\352Ak\n)servicedire" + + "ctory.googleapis.com/Namespace\022>projects" + + "/{project}/locations/{location}/namespac" + + "es/{namespace}B\371\001\n$com.google.cloud.serv" + + "icedirectory.v1B\016NamespaceProtoP\001ZPgoogl" + + "e.golang.org/genproto/googleapis/cloud/s" + + "ervicedirectory/v1;servicedirectory\370\001\001\252\002" + + " Google.Cloud.ServiceDirectory.V1\312\002 Goog" + + "le\\Cloud\\ServiceDirectory\\V1\352\002#Google::C" + + "loud::ServiceDirectory::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), }); @@ -95,7 +93,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ResourceProto.resource); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); } diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceRequest.java index 3f063429..6af2e452 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceRequest.java @@ -103,6 +103,8 @@ private ResolveServiceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceResponse.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceResponse.java index eb981371..857d9f2a 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceResponse.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ResolveServiceResponse.java @@ -96,6 +96,8 @@ private ResolveServiceResponse( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Service.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Service.java index 8be2482e..1f212db0 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Service.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/Service.java @@ -120,6 +120,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 { @@ -267,7 +269,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); } @@ -345,7 +347,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; @@ -383,7 +385,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)) { @@ -1071,7 +1073,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); } @@ -1149,7 +1151,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; @@ -1187,7 +1189,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)) { @@ -1232,7 +1234,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; @@ -1274,11 +1276,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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceOrBuilder.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceOrBuilder.java index 6e880306..32df7c25 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceOrBuilder.java @@ -176,7 +176,12 @@ public interface ServiceOrBuilder * map<string, string> annotations = 4 [(.google.api.field_behavior) = OPTIONAL]; * */ - 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); /** * * diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceProto.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceProto.java index dd565997..3cb3bdf8 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceProto.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/ServiceProto.java @@ -46,32 +46,30 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n.google/cloud/servicedirectory/v1/servi" + "ce.proto\022 google.cloud.servicedirectory." - + "v1\032\034google/api/annotations.proto\032\037google" - + "/api/field_behavior.proto\032\031google/api/re" - + "source.proto\032/google/cloud/servicedirect" - + "ory/v1/endpoint.proto\"\353\002\n\007Service\022\021\n\004nam" - + "e\030\001 \001(\tB\003\340A\005\022T\n\013annotations\030\004 \003(\0132:.goog" - + "le.cloud.servicedirectory.v1.Service.Ann" - + "otationsEntryB\003\340A\001\022B\n\tendpoints\030\003 \003(\0132*." - + "google.cloud.servicedirectory.v1.Endpoin" - + "tB\003\340A\003\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001(\t\022" - + "\r\n\005value\030\002 \001(\t:\0028\001:\177\352A|\n\'servicedirector" - + "y.googleapis.com/Service\022Qprojects/{proj" - + "ect}/locations/{location}/namespaces/{na" - + "mespace}/services/{service}B\367\001\n$com.goog" - + "le.cloud.servicedirectory.v1B\014ServicePro" - + "toP\001ZPgoogle.golang.org/genproto/googlea" - + "pis/cloud/servicedirectory/v1;servicedir" - + "ectory\370\001\001\252\002 Google.Cloud.ServiceDirector" - + "y.V1\312\002 Google\\Cloud\\ServiceDirectory\\V1\352" - + "\002#Google::Cloud::ServiceDirectory::V1b\006p" - + "roto3" + + "v1\032\037google/api/field_behavior.proto\032\031goo" + + "gle/api/resource.proto\032/google/cloud/ser" + + "vicedirectory/v1/endpoint.proto\"\353\002\n\007Serv" + + "ice\022\021\n\004name\030\001 \001(\tB\003\340A\005\022T\n\013annotations\030\004 " + + "\003(\0132:.google.cloud.servicedirectory.v1.S" + + "ervice.AnnotationsEntryB\003\340A\001\022B\n\tendpoint" + + "s\030\003 \003(\0132*.google.cloud.servicedirectory." + + "v1.EndpointB\003\340A\003\0322\n\020AnnotationsEntry\022\013\n\003" + + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:\177\352A|\n\'servi" + + "cedirectory.googleapis.com/Service\022Qproj" + + "ects/{project}/locations/{location}/name" + + "spaces/{namespace}/services/{service}B\367\001" + + "\n$com.google.cloud.servicedirectory.v1B\014" + + "ServiceProtoP\001ZPgoogle.golang.org/genpro" + + "to/googleapis/cloud/servicedirectory/v1;" + + "servicedirectory\370\001\001\252\002 Google.Cloud.Servi" + + "ceDirectory.V1\312\002 Google\\Cloud\\ServiceDir" + + "ectory\\V1\352\002#Google::Cloud::ServiceDirect" + + "ory::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), com.google.cloud.servicedirectory.v1.EndpointProto.getDescriptor(), @@ -98,7 +96,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ResourceProto.resource); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); com.google.cloud.servicedirectory.v1.EndpointProto.getDescriptor(); diff --git a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateEndpointRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateEndpointRequest.java index ba78fcfc..71a9aacc 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateEndpointRequest.java @@ -111,6 +111,8 @@ private UpdateEndpointRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateNamespaceRequest.java index 4c9b45c7..11ee1819 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateNamespaceRequest.java @@ -111,6 +111,8 @@ private UpdateNamespaceRequest( } } 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-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateServiceRequest.java b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateServiceRequest.java index ad3785d9..ddba71d3 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1/src/main/java/com/google/cloud/servicedirectory/v1/UpdateServiceRequest.java @@ -111,6 +111,8 @@ private UpdateServiceRequest( } } 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-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/endpoint.proto b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/endpoint.proto index de561fe0..5748f304 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/endpoint.proto +++ b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/endpoint.proto @@ -15,7 +15,6 @@ syntax = "proto3"; package google.cloud.servicedirectory.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; diff --git a/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/namespace.proto b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/namespace.proto index 8d8afad3..e4a3c1ea 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/namespace.proto +++ b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/namespace.proto @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.servicedirectory.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; diff --git a/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/service.proto b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/service.proto index c0eea5f7..803de1f5 100644 --- a/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/service.proto +++ b/proto-google-cloud-servicedirectory-v1/src/main/proto/google/cloud/servicedirectory/v1/service.proto @@ -16,7 +16,6 @@ syntax = "proto3"; package google.cloud.servicedirectory.v1; -import "google/api/annotations.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; import "google/cloud/servicedirectory/v1/endpoint.proto"; diff --git a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateEndpointRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateEndpointRequest.java index 817efe6e..19fd66f6 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateEndpointRequest.java @@ -113,6 +113,8 @@ private CreateEndpointRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateNamespaceRequest.java index 496b8fd8..02ae07ba 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateNamespaceRequest.java @@ -113,6 +113,8 @@ private CreateNamespaceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateServiceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateServiceRequest.java index 3ee775e2..1ebaaa4c 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/CreateServiceRequest.java @@ -113,6 +113,8 @@ private CreateServiceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteEndpointRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteEndpointRequest.java index 78223da8..acb584f9 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteEndpointRequest.java @@ -88,6 +88,8 @@ private DeleteEndpointRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteNamespaceRequest.java index fcd7fc47..f8f7cbc7 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteNamespaceRequest.java @@ -88,6 +88,8 @@ private DeleteNamespaceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteServiceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteServiceRequest.java index 5835a542..b5732fc0 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/DeleteServiceRequest.java @@ -88,6 +88,8 @@ private DeleteServiceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Endpoint.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Endpoint.java index be74532f..6267edb5 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Endpoint.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Endpoint.java @@ -157,6 +157,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 { @@ -378,7 +380,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); } @@ -454,7 +456,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; @@ -491,7 +493,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)) { @@ -1486,7 +1488,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); } @@ -1564,7 +1566,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; @@ -1602,7 +1604,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)) { @@ -1647,7 +1649,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; @@ -1689,11 +1691,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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/EndpointOrBuilder.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/EndpointOrBuilder.java index 5bf15fda..e5af398b 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/EndpointOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/EndpointOrBuilder.java @@ -222,7 +222,12 @@ public interface EndpointOrBuilder * * map<string, string> metadata = 4 [(.google.api.field_behavior) = OPTIONAL]; */ - 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetEndpointRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetEndpointRequest.java index 9d1aaea2..0c099d7c 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetEndpointRequest.java @@ -90,6 +90,8 @@ private GetEndpointRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetNamespaceRequest.java index b1fd844c..7788efb2 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetNamespaceRequest.java @@ -88,6 +88,8 @@ private GetNamespaceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetServiceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetServiceRequest.java index 8ac75afd..d1864d5a 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/GetServiceRequest.java @@ -90,6 +90,8 @@ private GetServiceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsRequest.java index 47980d27..6b4f3527 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsRequest.java @@ -117,6 +117,8 @@ private ListEndpointsRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsResponse.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsResponse.java index 262a428e..d398c4a5 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsResponse.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListEndpointsResponse.java @@ -103,6 +103,8 @@ private ListEndpointsResponse( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesRequest.java index 237fd19d..659eceaa 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesRequest.java @@ -117,6 +117,8 @@ private ListNamespacesRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesResponse.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesResponse.java index f1db6592..bf8b9ca7 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesResponse.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListNamespacesResponse.java @@ -103,6 +103,8 @@ private ListNamespacesResponse( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesRequest.java index e07ec041..f34bca01 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesRequest.java @@ -117,6 +117,8 @@ private ListServicesRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesResponse.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesResponse.java index e8367951..29ea7600 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesResponse.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ListServicesResponse.java @@ -103,6 +103,8 @@ private ListServicesResponse( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Namespace.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Namespace.java index 1b961939..8269f333 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Namespace.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Namespace.java @@ -134,6 +134,8 @@ private Namespace( } } 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 { @@ -258,7 +260,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); } @@ -297,7 +299,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; @@ -316,7 +318,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)) { @@ -993,7 +995,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); } @@ -1033,7 +1035,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; @@ -1052,7 +1054,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)) { @@ -1078,7 +1080,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; @@ -1101,11 +1103,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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/NamespaceOrBuilder.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/NamespaceOrBuilder.java index 05a496d9..8fab2cf6 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/NamespaceOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/NamespaceOrBuilder.java @@ -100,7 +100,12 @@ public interface NamespaceOrBuilder * * map<string, string> labels = 2 [(.google.api.field_behavior) = OPTIONAL]; */ - 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceRequest.java index dd261581..63991bde 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceRequest.java @@ -102,6 +102,8 @@ private ResolveServiceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceResponse.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceResponse.java index 60ac1440..7df9c65d 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceResponse.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ResolveServiceResponse.java @@ -96,6 +96,8 @@ private ResolveServiceResponse( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Service.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Service.java index ccff4611..af002d6c 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Service.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/Service.java @@ -151,6 +151,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 { @@ -296,7 +298,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); } @@ -372,7 +374,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; @@ -409,7 +411,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)) { @@ -1258,7 +1260,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); } @@ -1336,7 +1338,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; @@ -1374,7 +1376,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)) { @@ -1419,7 +1421,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; @@ -1461,11 +1463,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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ServiceOrBuilder.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ServiceOrBuilder.java index a85f97c0..52c8d181 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ServiceOrBuilder.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/ServiceOrBuilder.java @@ -172,7 +172,12 @@ public interface ServiceOrBuilder * * map<string, string> metadata = 2 [(.google.api.field_behavior) = OPTIONAL]; */ - 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateEndpointRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateEndpointRequest.java index e31d4df7..93c7fac2 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateEndpointRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateEndpointRequest.java @@ -111,6 +111,8 @@ private UpdateEndpointRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateNamespaceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateNamespaceRequest.java index 43378c68..e072a121 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateNamespaceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateNamespaceRequest.java @@ -111,6 +111,8 @@ private UpdateNamespaceRequest( } } 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-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateServiceRequest.java b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateServiceRequest.java index 18f8e5e4..511391d8 100644 --- a/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateServiceRequest.java +++ b/proto-google-cloud-servicedirectory-v1beta1/src/main/java/com/google/cloud/servicedirectory/v1beta1/UpdateServiceRequest.java @@ -111,6 +111,8 @@ private UpdateServiceRequest( } } 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 {