diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java index b88f9e0a4fc9..10df4594ebf1 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java @@ -23,7 +23,6 @@ private AcceleratorConfig(com.google.protobuf.GeneratedMessageV3.Builder buil } private AcceleratorConfig() { - acceleratorCount_ = 0L; acceleratorType_ = ""; } @@ -65,7 +64,7 @@ private AcceleratorConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -208,11 +207,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.AcceleratorConfig other = (com.google.container.v1.AcceleratorConfig) obj; - boolean result = true; - result = result && (getAcceleratorCount() == other.getAcceleratorCount()); - result = result && getAcceleratorType().equals(other.getAcceleratorType()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getAcceleratorCount() != other.getAcceleratorCount()) return false; + if (!getAcceleratorType().equals(other.getAcceleratorType())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -410,35 +408,35 @@ public com.google.container.v1.AcceleratorConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -634,7 +632,7 @@ public Builder setAcceleratorTypeBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java index b589fbc342a2..9c2633988bee 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java @@ -115,7 +115,7 @@ private AddonsConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -391,25 +391,24 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.AddonsConfig other = (com.google.container.v1.AddonsConfig) obj; - boolean result = true; - result = result && (hasHttpLoadBalancing() == other.hasHttpLoadBalancing()); + if (hasHttpLoadBalancing() != other.hasHttpLoadBalancing()) return false; if (hasHttpLoadBalancing()) { - result = result && getHttpLoadBalancing().equals(other.getHttpLoadBalancing()); + if (!getHttpLoadBalancing().equals(other.getHttpLoadBalancing())) return false; } - result = result && (hasHorizontalPodAutoscaling() == other.hasHorizontalPodAutoscaling()); + if (hasHorizontalPodAutoscaling() != other.hasHorizontalPodAutoscaling()) return false; if (hasHorizontalPodAutoscaling()) { - result = result && getHorizontalPodAutoscaling().equals(other.getHorizontalPodAutoscaling()); + if (!getHorizontalPodAutoscaling().equals(other.getHorizontalPodAutoscaling())) return false; } - result = result && (hasKubernetesDashboard() == other.hasKubernetesDashboard()); + if (hasKubernetesDashboard() != other.hasKubernetesDashboard()) return false; if (hasKubernetesDashboard()) { - result = result && getKubernetesDashboard().equals(other.getKubernetesDashboard()); + if (!getKubernetesDashboard().equals(other.getKubernetesDashboard())) return false; } - result = result && (hasNetworkPolicyConfig() == other.hasNetworkPolicyConfig()); + if (hasNetworkPolicyConfig() != other.hasNetworkPolicyConfig()) return false; if (hasNetworkPolicyConfig()) { - result = result && getNetworkPolicyConfig().equals(other.getNetworkPolicyConfig()); + if (!getNetworkPolicyConfig().equals(other.getNetworkPolicyConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -656,35 +655,35 @@ public com.google.container.v1.AddonsConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -740,7 +739,7 @@ public Builder mergeFrom( return this; } - private com.google.container.v1.HttpLoadBalancing httpLoadBalancing_ = null; + private com.google.container.v1.HttpLoadBalancing httpLoadBalancing_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.HttpLoadBalancing, com.google.container.v1.HttpLoadBalancing.Builder, @@ -931,7 +930,7 @@ public com.google.container.v1.HttpLoadBalancingOrBuilder getHttpLoadBalancingOr return httpLoadBalancingBuilder_; } - private com.google.container.v1.HorizontalPodAutoscaling horizontalPodAutoscaling_ = null; + private com.google.container.v1.HorizontalPodAutoscaling horizontalPodAutoscaling_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.HorizontalPodAutoscaling, com.google.container.v1.HorizontalPodAutoscaling.Builder, @@ -1135,7 +1134,7 @@ public Builder clearHorizontalPodAutoscaling() { return horizontalPodAutoscalingBuilder_; } - private com.google.container.v1.KubernetesDashboard kubernetesDashboard_ = null; + private com.google.container.v1.KubernetesDashboard kubernetesDashboard_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.KubernetesDashboard, com.google.container.v1.KubernetesDashboard.Builder, @@ -1317,7 +1316,7 @@ public com.google.container.v1.KubernetesDashboardOrBuilder getKubernetesDashboa return kubernetesDashboardBuilder_; } - private com.google.container.v1.NetworkPolicyConfig networkPolicyConfig_ = null; + private com.google.container.v1.NetworkPolicyConfig networkPolicyConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NetworkPolicyConfig, com.google.container.v1.NetworkPolicyConfig.Builder, @@ -1519,7 +1518,7 @@ public com.google.container.v1.NetworkPolicyConfigOrBuilder getNetworkPolicyConf @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java index 64887a4cb217..76b291eac4eb 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java @@ -68,7 +68,7 @@ private AutoUpgradeOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,11 +243,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.AutoUpgradeOptions other = (com.google.container.v1.AutoUpgradeOptions) obj; - boolean result = true; - result = result && getAutoUpgradeStartTime().equals(other.getAutoUpgradeStartTime()); - result = result && getDescription().equals(other.getDescription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAutoUpgradeStartTime().equals(other.getAutoUpgradeStartTime())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.container.v1.AutoUpgradeOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -731,7 +730,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java index ec905c6ae025..18de66e472db 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java @@ -83,7 +83,7 @@ private CancelOperationRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -368,13 +368,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.CancelOperationRequest other = (com.google.container.v1.CancelOperationRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getOperationId().equals(other.getOperationId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getOperationId().equals(other.getOperationId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -582,35 +581,35 @@ public com.google.container.v1.CancelOperationRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1093,7 +1092,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java index 7515fda26541..3677a587d170 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java @@ -22,9 +22,7 @@ private ClientCertificateConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Cluster() { name_ = ""; description_ = ""; - initialNodeCount_ = 0; loggingService_ = ""; monitoringService_ = ""; network_ = ""; @@ -33,7 +32,6 @@ private Cluster() { subnetwork_ = ""; nodePools_ = java.util.Collections.emptyList(); locations_ = com.google.protobuf.LazyStringArrayList.EMPTY; - enableKubernetesAlpha_ = false; labelFingerprint_ = ""; selfLink_ = ""; zone_ = ""; @@ -44,10 +42,8 @@ private Cluster() { createTime_ = ""; status_ = 0; statusMessage_ = ""; - nodeIpv4CidrSize_ = 0; servicesIpv4Cidr_ = ""; instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY; - currentNodeCount_ = 0; expireTime_ = ""; location_ = ""; } @@ -179,7 +175,7 @@ private Cluster( } case 98: { - if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) { + if (!((mutable_bitField0_ & 0x00000800) != 0)) { nodePools_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000800; } @@ -190,7 +186,7 @@ private Cluster( case 106: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (!((mutable_bitField0_ & 0x00001000) != 0)) { locations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00001000; } @@ -204,7 +200,7 @@ private Cluster( } case 122: { - if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (!((mutable_bitField0_ & 0x00004000) != 0)) { resourceLabels_ = com.google.protobuf.MapField.newMapField( ResourceLabelsDefaultEntryHolder.defaultEntry); @@ -416,7 +412,7 @@ private Cluster( case 890: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField1_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField1_ & 0x00000004) != 0)) { instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField1_ |= 0x00000004; } @@ -444,7 +440,7 @@ private Cluster( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -456,13 +452,13 @@ private Cluster( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000800) == 0x00000800)) { + if (((mutable_bitField0_ & 0x00000800) != 0)) { nodePools_ = java.util.Collections.unmodifiableList(nodePools_); } - if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (((mutable_bitField0_ & 0x00001000) != 0)) { locations_ = locations_.getUnmodifiableView(); } - if (((mutable_bitField1_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField1_ & 0x00000004) != 0)) { instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -2782,82 +2778,78 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.Cluster other = (com.google.container.v1.Cluster) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDescription().equals(other.getDescription()); - result = result && (getInitialNodeCount() == other.getInitialNodeCount()); - result = result && (hasNodeConfig() == other.hasNodeConfig()); + if (!getName().equals(other.getName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (getInitialNodeCount() != other.getInitialNodeCount()) return false; + if (hasNodeConfig() != other.hasNodeConfig()) return false; if (hasNodeConfig()) { - result = result && getNodeConfig().equals(other.getNodeConfig()); + if (!getNodeConfig().equals(other.getNodeConfig())) return false; } - result = result && (hasMasterAuth() == other.hasMasterAuth()); + if (hasMasterAuth() != other.hasMasterAuth()) return false; if (hasMasterAuth()) { - result = result && getMasterAuth().equals(other.getMasterAuth()); + if (!getMasterAuth().equals(other.getMasterAuth())) return false; } - result = result && getLoggingService().equals(other.getLoggingService()); - result = result && getMonitoringService().equals(other.getMonitoringService()); - result = result && getNetwork().equals(other.getNetwork()); - result = result && getClusterIpv4Cidr().equals(other.getClusterIpv4Cidr()); - result = result && (hasAddonsConfig() == other.hasAddonsConfig()); + if (!getLoggingService().equals(other.getLoggingService())) return false; + if (!getMonitoringService().equals(other.getMonitoringService())) return false; + if (!getNetwork().equals(other.getNetwork())) return false; + if (!getClusterIpv4Cidr().equals(other.getClusterIpv4Cidr())) return false; + if (hasAddonsConfig() != other.hasAddonsConfig()) return false; if (hasAddonsConfig()) { - result = result && getAddonsConfig().equals(other.getAddonsConfig()); - } - result = result && getSubnetwork().equals(other.getSubnetwork()); - result = result && getNodePoolsList().equals(other.getNodePoolsList()); - result = result && getLocationsList().equals(other.getLocationsList()); - result = result && (getEnableKubernetesAlpha() == other.getEnableKubernetesAlpha()); - result = result && internalGetResourceLabels().equals(other.internalGetResourceLabels()); - result = result && getLabelFingerprint().equals(other.getLabelFingerprint()); - result = result && (hasLegacyAbac() == other.hasLegacyAbac()); + if (!getAddonsConfig().equals(other.getAddonsConfig())) return false; + } + if (!getSubnetwork().equals(other.getSubnetwork())) return false; + if (!getNodePoolsList().equals(other.getNodePoolsList())) return false; + if (!getLocationsList().equals(other.getLocationsList())) return false; + if (getEnableKubernetesAlpha() != other.getEnableKubernetesAlpha()) return false; + if (!internalGetResourceLabels().equals(other.internalGetResourceLabels())) return false; + if (!getLabelFingerprint().equals(other.getLabelFingerprint())) return false; + if (hasLegacyAbac() != other.hasLegacyAbac()) return false; if (hasLegacyAbac()) { - result = result && getLegacyAbac().equals(other.getLegacyAbac()); + if (!getLegacyAbac().equals(other.getLegacyAbac())) return false; } - result = result && (hasNetworkPolicy() == other.hasNetworkPolicy()); + if (hasNetworkPolicy() != other.hasNetworkPolicy()) return false; if (hasNetworkPolicy()) { - result = result && getNetworkPolicy().equals(other.getNetworkPolicy()); + if (!getNetworkPolicy().equals(other.getNetworkPolicy())) return false; } - result = result && (hasIpAllocationPolicy() == other.hasIpAllocationPolicy()); + if (hasIpAllocationPolicy() != other.hasIpAllocationPolicy()) return false; if (hasIpAllocationPolicy()) { - result = result && getIpAllocationPolicy().equals(other.getIpAllocationPolicy()); + if (!getIpAllocationPolicy().equals(other.getIpAllocationPolicy())) return false; } - result = - result - && (hasMasterAuthorizedNetworksConfig() == other.hasMasterAuthorizedNetworksConfig()); + if (hasMasterAuthorizedNetworksConfig() != other.hasMasterAuthorizedNetworksConfig()) + return false; if (hasMasterAuthorizedNetworksConfig()) { - result = - result - && getMasterAuthorizedNetworksConfig() - .equals(other.getMasterAuthorizedNetworksConfig()); + if (!getMasterAuthorizedNetworksConfig().equals(other.getMasterAuthorizedNetworksConfig())) + return false; } - result = result && (hasMaintenancePolicy() == other.hasMaintenancePolicy()); + if (hasMaintenancePolicy() != other.hasMaintenancePolicy()) return false; if (hasMaintenancePolicy()) { - result = result && getMaintenancePolicy().equals(other.getMaintenancePolicy()); + if (!getMaintenancePolicy().equals(other.getMaintenancePolicy())) return false; } - result = result && (hasNetworkConfig() == other.hasNetworkConfig()); + if (hasNetworkConfig() != other.hasNetworkConfig()) return false; if (hasNetworkConfig()) { - result = result && getNetworkConfig().equals(other.getNetworkConfig()); + if (!getNetworkConfig().equals(other.getNetworkConfig())) return false; } - result = result && (hasPrivateClusterConfig() == other.hasPrivateClusterConfig()); + if (hasPrivateClusterConfig() != other.hasPrivateClusterConfig()) return false; if (hasPrivateClusterConfig()) { - result = result && getPrivateClusterConfig().equals(other.getPrivateClusterConfig()); - } - result = result && getSelfLink().equals(other.getSelfLink()); - result = result && getZone().equals(other.getZone()); - result = result && getEndpoint().equals(other.getEndpoint()); - result = result && getInitialClusterVersion().equals(other.getInitialClusterVersion()); - result = result && getCurrentMasterVersion().equals(other.getCurrentMasterVersion()); - result = result && getCurrentNodeVersion().equals(other.getCurrentNodeVersion()); - result = result && getCreateTime().equals(other.getCreateTime()); - result = result && status_ == other.status_; - result = result && getStatusMessage().equals(other.getStatusMessage()); - result = result && (getNodeIpv4CidrSize() == other.getNodeIpv4CidrSize()); - result = result && getServicesIpv4Cidr().equals(other.getServicesIpv4Cidr()); - result = result && getInstanceGroupUrlsList().equals(other.getInstanceGroupUrlsList()); - result = result && (getCurrentNodeCount() == other.getCurrentNodeCount()); - result = result && getExpireTime().equals(other.getExpireTime()); - result = result && getLocation().equals(other.getLocation()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPrivateClusterConfig().equals(other.getPrivateClusterConfig())) return false; + } + if (!getSelfLink().equals(other.getSelfLink())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getEndpoint().equals(other.getEndpoint())) return false; + if (!getInitialClusterVersion().equals(other.getInitialClusterVersion())) return false; + if (!getCurrentMasterVersion().equals(other.getCurrentMasterVersion())) return false; + if (!getCurrentNodeVersion().equals(other.getCurrentNodeVersion())) return false; + if (!getCreateTime().equals(other.getCreateTime())) return false; + if (status_ != other.status_) return false; + if (!getStatusMessage().equals(other.getStatusMessage())) return false; + if (getNodeIpv4CidrSize() != other.getNodeIpv4CidrSize()) return false; + if (!getServicesIpv4Cidr().equals(other.getServicesIpv4Cidr())) return false; + if (!getInstanceGroupUrlsList().equals(other.getInstanceGroupUrlsList())) return false; + if (getCurrentNodeCount() != other.getCurrentNodeCount()) return false; + if (!getExpireTime().equals(other.getExpireTime())) return false; + if (!getLocation().equals(other.getLocation())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3309,7 +3301,7 @@ public com.google.container.v1.Cluster buildPartial() { } result.subnetwork_ = subnetwork_; if (nodePoolsBuilder_ == null) { - if (((bitField0_ & 0x00000800) == 0x00000800)) { + if (((bitField0_ & 0x00000800) != 0)) { nodePools_ = java.util.Collections.unmodifiableList(nodePools_); bitField0_ = (bitField0_ & ~0x00000800); } @@ -3317,7 +3309,7 @@ public com.google.container.v1.Cluster buildPartial() { } else { result.nodePools_ = nodePoolsBuilder_.build(); } - if (((bitField0_ & 0x00001000) == 0x00001000)) { + if (((bitField0_ & 0x00001000) != 0)) { locations_ = locations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00001000); } @@ -3372,7 +3364,7 @@ public com.google.container.v1.Cluster buildPartial() { result.statusMessage_ = statusMessage_; result.nodeIpv4CidrSize_ = nodeIpv4CidrSize_; result.servicesIpv4Cidr_ = servicesIpv4Cidr_; - if (((bitField1_ & 0x00000004) == 0x00000004)) { + if (((bitField1_ & 0x00000004) != 0)) { instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView(); bitField1_ = (bitField1_ & ~0x00000004); } @@ -3388,35 +3380,35 @@ public com.google.container.v1.Cluster buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3905,7 +3897,7 @@ public Builder clearInitialNodeCount() { return this; } - private com.google.container.v1.NodeConfig nodeConfig_ = null; + private com.google.container.v1.NodeConfig nodeConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodeConfig, com.google.container.v1.NodeConfig.Builder, @@ -4158,7 +4150,7 @@ public com.google.container.v1.NodeConfigOrBuilder getNodeConfigOrBuilder() { return nodeConfigBuilder_; } - private com.google.container.v1.MasterAuth masterAuth_ = null; + private com.google.container.v1.MasterAuth masterAuth_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MasterAuth, com.google.container.v1.MasterAuth.Builder, @@ -4785,7 +4777,7 @@ public Builder setClusterIpv4CidrBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.AddonsConfig addonsConfig_ = null; + private com.google.container.v1.AddonsConfig addonsConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.AddonsConfig, com.google.container.v1.AddonsConfig.Builder, @@ -5074,7 +5066,7 @@ public Builder setSubnetworkBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureNodePoolsIsMutable() { - if (!((bitField0_ & 0x00000800) == 0x00000800)) { + if (!((bitField0_ & 0x00000800) != 0)) { nodePools_ = new java.util.ArrayList(nodePools_); bitField0_ |= 0x00000800; } @@ -5448,10 +5440,7 @@ public java.util.List getNodePoolsBuil com.google.container.v1.NodePool, com.google.container.v1.NodePool.Builder, com.google.container.v1.NodePoolOrBuilder>( - nodePools_, - ((bitField0_ & 0x00000800) == 0x00000800), - getParentForChildren(), - isClean()); + nodePools_, ((bitField0_ & 0x00000800) != 0), getParentForChildren(), isClean()); nodePools_ = null; } return nodePoolsBuilder_; @@ -5461,7 +5450,7 @@ public java.util.List getNodePoolsBuil com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLocationsIsMutable() { - if (!((bitField0_ & 0x00001000) == 0x00001000)) { + if (!((bitField0_ & 0x00001000) != 0)) { locations_ = new com.google.protobuf.LazyStringArrayList(locations_); bitField0_ |= 0x00001000; } @@ -5933,7 +5922,7 @@ public Builder setLabelFingerprintBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.LegacyAbac legacyAbac_ = null; + private com.google.container.v1.LegacyAbac legacyAbac_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.LegacyAbac, com.google.container.v1.LegacyAbac.Builder, @@ -6114,7 +6103,7 @@ public com.google.container.v1.LegacyAbacOrBuilder getLegacyAbacOrBuilder() { return legacyAbacBuilder_; } - private com.google.container.v1.NetworkPolicy networkPolicy_ = null; + private com.google.container.v1.NetworkPolicy networkPolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NetworkPolicy, com.google.container.v1.NetworkPolicy.Builder, @@ -6295,7 +6284,7 @@ public com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder( return networkPolicyBuilder_; } - private com.google.container.v1.IPAllocationPolicy ipAllocationPolicy_ = null; + private com.google.container.v1.IPAllocationPolicy ipAllocationPolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.IPAllocationPolicy, com.google.container.v1.IPAllocationPolicy.Builder, @@ -6477,8 +6466,7 @@ public com.google.container.v1.IPAllocationPolicyOrBuilder getIpAllocationPolicy return ipAllocationPolicyBuilder_; } - private com.google.container.v1.MasterAuthorizedNetworksConfig masterAuthorizedNetworksConfig_ = - null; + private com.google.container.v1.MasterAuthorizedNetworksConfig masterAuthorizedNetworksConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MasterAuthorizedNetworksConfig, com.google.container.v1.MasterAuthorizedNetworksConfig.Builder, @@ -6685,7 +6673,7 @@ public Builder clearMasterAuthorizedNetworksConfig() { return masterAuthorizedNetworksConfigBuilder_; } - private com.google.container.v1.MaintenancePolicy maintenancePolicy_ = null; + private com.google.container.v1.MaintenancePolicy maintenancePolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MaintenancePolicy, com.google.container.v1.MaintenancePolicy.Builder, @@ -6867,7 +6855,7 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr return maintenancePolicyBuilder_; } - private com.google.container.v1.NetworkConfig networkConfig_ = null; + private com.google.container.v1.NetworkConfig networkConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NetworkConfig, com.google.container.v1.NetworkConfig.Builder, @@ -7048,7 +7036,7 @@ public com.google.container.v1.NetworkConfigOrBuilder getNetworkConfigOrBuilder( return networkConfigBuilder_; } - private com.google.container.v1.PrivateClusterConfig privateClusterConfig_ = null; + private com.google.container.v1.PrivateClusterConfig privateClusterConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.PrivateClusterConfig, com.google.container.v1.PrivateClusterConfig.Builder, @@ -8352,7 +8340,7 @@ public Builder setServicesIpv4CidrBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInstanceGroupUrlsIsMutable() { - if (!((bitField1_ & 0x00000004) == 0x00000004)) { + if (!((bitField1_ & 0x00000004) != 0)) { instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(instanceGroupUrls_); bitField1_ |= 0x00000004; } @@ -8754,7 +8742,7 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdate.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdate.java index 9896707b793c..1132987d9bd2 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdate.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdate.java @@ -120,7 +120,7 @@ private ClusterUpdate( case 82: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { desiredLocations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -153,7 +153,7 @@ private ClusterUpdate( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -165,7 +165,7 @@ private ClusterUpdate( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { desiredLocations_ = desiredLocations_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -763,34 +763,29 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.ClusterUpdate other = (com.google.container.v1.ClusterUpdate) obj; - boolean result = true; - result = result && getDesiredNodeVersion().equals(other.getDesiredNodeVersion()); - result = result && getDesiredMonitoringService().equals(other.getDesiredMonitoringService()); - result = result && (hasDesiredAddonsConfig() == other.hasDesiredAddonsConfig()); + if (!getDesiredNodeVersion().equals(other.getDesiredNodeVersion())) return false; + if (!getDesiredMonitoringService().equals(other.getDesiredMonitoringService())) return false; + if (hasDesiredAddonsConfig() != other.hasDesiredAddonsConfig()) return false; if (hasDesiredAddonsConfig()) { - result = result && getDesiredAddonsConfig().equals(other.getDesiredAddonsConfig()); + if (!getDesiredAddonsConfig().equals(other.getDesiredAddonsConfig())) return false; } - result = result && getDesiredNodePoolId().equals(other.getDesiredNodePoolId()); - result = result && getDesiredImageType().equals(other.getDesiredImageType()); - result = result && (hasDesiredNodePoolAutoscaling() == other.hasDesiredNodePoolAutoscaling()); + if (!getDesiredNodePoolId().equals(other.getDesiredNodePoolId())) return false; + if (!getDesiredImageType().equals(other.getDesiredImageType())) return false; + if (hasDesiredNodePoolAutoscaling() != other.hasDesiredNodePoolAutoscaling()) return false; if (hasDesiredNodePoolAutoscaling()) { - result = - result && getDesiredNodePoolAutoscaling().equals(other.getDesiredNodePoolAutoscaling()); - } - result = result && getDesiredLocationsList().equals(other.getDesiredLocationsList()); - result = - result - && (hasDesiredMasterAuthorizedNetworksConfig() - == other.hasDesiredMasterAuthorizedNetworksConfig()); + if (!getDesiredNodePoolAutoscaling().equals(other.getDesiredNodePoolAutoscaling())) + return false; + } + if (!getDesiredLocationsList().equals(other.getDesiredLocationsList())) return false; + if (hasDesiredMasterAuthorizedNetworksConfig() + != other.hasDesiredMasterAuthorizedNetworksConfig()) return false; if (hasDesiredMasterAuthorizedNetworksConfig()) { - result = - result - && getDesiredMasterAuthorizedNetworksConfig() - .equals(other.getDesiredMasterAuthorizedNetworksConfig()); - } - result = result && getDesiredMasterVersion().equals(other.getDesiredMasterVersion()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDesiredMasterAuthorizedNetworksConfig() + .equals(other.getDesiredMasterAuthorizedNetworksConfig())) return false; + } + if (!getDesiredMasterVersion().equals(other.getDesiredMasterVersion())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1045,7 +1040,7 @@ public com.google.container.v1.ClusterUpdate buildPartial() { } else { result.desiredNodePoolAutoscaling_ = desiredNodePoolAutoscalingBuilder_.build(); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { desiredLocations_ = desiredLocations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000040); } @@ -1064,35 +1059,35 @@ public com.google.container.v1.ClusterUpdate buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1421,7 +1416,7 @@ public Builder setDesiredMonitoringServiceBytes(com.google.protobuf.ByteString v return this; } - private com.google.container.v1.AddonsConfig desiredAddonsConfig_ = null; + private com.google.container.v1.AddonsConfig desiredAddonsConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.AddonsConfig, com.google.container.v1.AddonsConfig.Builder, @@ -1811,7 +1806,7 @@ public Builder setDesiredImageTypeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodePoolAutoscaling desiredNodePoolAutoscaling_ = null; + private com.google.container.v1.NodePoolAutoscaling desiredNodePoolAutoscaling_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodePoolAutoscaling, com.google.container.v1.NodePoolAutoscaling.Builder, @@ -2028,7 +2023,7 @@ public Builder clearDesiredNodePoolAutoscaling() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDesiredLocationsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { desiredLocations_ = new com.google.protobuf.LazyStringArrayList(desiredLocations_); bitField0_ |= 0x00000040; } @@ -2213,7 +2208,7 @@ public Builder addDesiredLocationsBytes(com.google.protobuf.ByteString value) { } private com.google.container.v1.MasterAuthorizedNetworksConfig - desiredMasterAuthorizedNetworksConfig_ = null; + desiredMasterAuthorizedNetworksConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MasterAuthorizedNetworksConfig, com.google.container.v1.MasterAuthorizedNetworksConfig.Builder, @@ -2551,7 +2546,7 @@ public Builder setDesiredMasterVersionBytes(com.google.protobuf.ByteString value @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java index 5e1772199147..ff9490558432 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java @@ -83,7 +83,7 @@ private CompleteIPRotationRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -370,13 +370,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.CompleteIPRotationRequest other = (com.google.container.v1.CompleteIPRotationRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.container.v1.CompleteIPRotationRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1102,7 +1101,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java index c1281c29121d..eaa5bab03ebd 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java @@ -90,7 +90,7 @@ private CreateClusterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -372,16 +372,15 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.CreateClusterRequest other = (com.google.container.v1.CreateClusterRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && (hasCluster() == other.hasCluster()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (hasCluster() != other.hasCluster()) return false; if (hasCluster()) { - result = result && getCluster().equals(other.getCluster()); + if (!getCluster().equals(other.getCluster())) return false; } - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -599,35 +598,35 @@ public com.google.container.v1.CreateClusterRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -909,7 +908,7 @@ public Builder setZoneBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.Cluster cluster_ = null; + private com.google.container.v1.Cluster cluster_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.Cluster, com.google.container.v1.Cluster.Builder, @@ -1194,7 +1193,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java index eaa1597a77fd..185b012c8961 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java @@ -98,7 +98,7 @@ private CreateNodePoolRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -432,17 +432,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.CreateNodePoolRequest other = (com.google.container.v1.CreateNodePoolRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (hasNodePool() == other.hasNodePool()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (hasNodePool() != other.hasNodePool()) return false; if (hasNodePool()) { - result = result && getNodePool().equals(other.getNodePool()); + if (!getNodePool().equals(other.getNodePool())) return false; } - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -665,35 +664,35 @@ public com.google.container.v1.CreateNodePoolRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1083,7 +1082,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodePool nodePool_ = null; + private com.google.container.v1.NodePool nodePool_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodePool, com.google.container.v1.NodePool.Builder, @@ -1370,7 +1369,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java index dec44c9ad7dd..f58baffb30d9 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java @@ -67,7 +67,7 @@ private DailyMaintenanceWindow( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -246,11 +246,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.DailyMaintenanceWindow other = (com.google.container.v1.DailyMaintenanceWindow) obj; - boolean result = true; - result = result && getStartTime().equals(other.getStartTime()); - result = result && getDuration().equals(other.getDuration()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getStartTime().equals(other.getStartTime())) return false; + if (!getDuration().equals(other.getDuration())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -448,35 +447,35 @@ public com.google.container.v1.DailyMaintenanceWindow buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -743,7 +742,7 @@ public Builder setDurationBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java index 812deb713313..a83a848ef7a2 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java @@ -83,7 +83,7 @@ private DeleteClusterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -370,13 +370,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.DeleteClusterRequest other = (com.google.container.v1.DeleteClusterRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.container.v1.DeleteClusterRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1100,7 +1099,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java index b86a1c99298d..b78afff96f8d 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java @@ -91,7 +91,7 @@ private DeleteNodePoolRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -433,14 +433,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.DeleteNodePoolRequest other = (com.google.container.v1.DeleteNodePoolRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -653,35 +652,35 @@ public com.google.container.v1.DeleteNodePoolRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1282,7 +1281,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java index 6cde0918aeb6..3c1f13ce347e 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java @@ -83,7 +83,7 @@ private GetClusterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -370,13 +370,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.GetClusterRequest other = (com.google.container.v1.GetClusterRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.container.v1.GetClusterRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1100,7 +1099,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java index 05506ef8d359..1ab06d9ff931 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java @@ -91,7 +91,7 @@ private GetNodePoolRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -433,14 +433,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.GetNodePoolRequest other = (com.google.container.v1.GetNodePoolRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -653,35 +652,35 @@ public com.google.container.v1.GetNodePoolRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1282,7 +1281,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java index 63254bfb2c9a..fcf9b785af72 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java @@ -83,7 +83,7 @@ private GetOperationRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -370,13 +370,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.GetOperationRequest other = (com.google.container.v1.GetOperationRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getOperationId().equals(other.getOperationId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getOperationId().equals(other.getOperationId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.container.v1.GetOperationRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1100,7 +1099,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java index 0a3dfbd21cb8..41795a88eb51 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java @@ -75,7 +75,7 @@ private GetServerConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -307,12 +307,11 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.GetServerConfigRequest other = (com.google.container.v1.GetServerConfigRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -515,35 +514,35 @@ public com.google.container.v1.GetServerConfigRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -918,7 +917,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java index 4264d5b85d49..5cb0f3451479 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java @@ -24,9 +24,7 @@ private HorizontalPodAutoscaling(com.google.protobuf.GeneratedMessageV3.Builder< super(builder); } - private HorizontalPodAutoscaling() { - disabled_ = false; - } + private HorizontalPodAutoscaling() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -59,7 +57,7 @@ private HorizontalPodAutoscaling( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -153,10 +151,9 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.HorizontalPodAutoscaling other = (com.google.container.v1.HorizontalPodAutoscaling) obj; - boolean result = true; - result = result && (getDisabled() == other.getDisabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getDisabled() != other.getDisabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -351,35 +348,35 @@ public com.google.container.v1.HorizontalPodAutoscaling buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -479,7 +476,7 @@ public Builder clearDisabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java index d03889b5dd19..c3ffe04776e6 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java @@ -23,9 +23,7 @@ private HttpLoadBalancing(com.google.protobuf.GeneratedMessageV3.Builder buil super(builder); } - private HttpLoadBalancing() { - disabled_ = false; - } + private HttpLoadBalancing() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -58,7 +56,7 @@ private HttpLoadBalancing( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.HttpLoadBalancing other = (com.google.container.v1.HttpLoadBalancing) obj; - boolean result = true; - result = result && (getDisabled() == other.getDisabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getDisabled() != other.getDisabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -349,35 +346,35 @@ public com.google.container.v1.HttpLoadBalancing buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -476,7 +473,7 @@ public Builder clearDisabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java index 9e63cffca5dc..aca66076fa9f 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java @@ -23,8 +23,6 @@ private IPAllocationPolicy(com.google.protobuf.GeneratedMessageV3.Builder bui } private IPAllocationPolicy() { - useIpAliases_ = false; - createSubnetwork_ = false; subnetworkName_ = ""; clusterIpv4Cidr_ = ""; nodeIpv4Cidr_ = ""; @@ -135,7 +133,7 @@ private IPAllocationPolicy( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -780,21 +778,20 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.IPAllocationPolicy other = (com.google.container.v1.IPAllocationPolicy) obj; - boolean result = true; - result = result && (getUseIpAliases() == other.getUseIpAliases()); - result = result && (getCreateSubnetwork() == other.getCreateSubnetwork()); - result = result && getSubnetworkName().equals(other.getSubnetworkName()); - result = result && getClusterIpv4Cidr().equals(other.getClusterIpv4Cidr()); - result = result && getNodeIpv4Cidr().equals(other.getNodeIpv4Cidr()); - result = result && getServicesIpv4Cidr().equals(other.getServicesIpv4Cidr()); - result = result && getClusterSecondaryRangeName().equals(other.getClusterSecondaryRangeName()); - result = - result && getServicesSecondaryRangeName().equals(other.getServicesSecondaryRangeName()); - result = result && getClusterIpv4CidrBlock().equals(other.getClusterIpv4CidrBlock()); - result = result && getNodeIpv4CidrBlock().equals(other.getNodeIpv4CidrBlock()); - result = result && getServicesIpv4CidrBlock().equals(other.getServicesIpv4CidrBlock()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getUseIpAliases() != other.getUseIpAliases()) return false; + if (getCreateSubnetwork() != other.getCreateSubnetwork()) return false; + if (!getSubnetworkName().equals(other.getSubnetworkName())) return false; + if (!getClusterIpv4Cidr().equals(other.getClusterIpv4Cidr())) return false; + if (!getNodeIpv4Cidr().equals(other.getNodeIpv4Cidr())) return false; + if (!getServicesIpv4Cidr().equals(other.getServicesIpv4Cidr())) return false; + if (!getClusterSecondaryRangeName().equals(other.getClusterSecondaryRangeName())) return false; + if (!getServicesSecondaryRangeName().equals(other.getServicesSecondaryRangeName())) + return false; + if (!getClusterIpv4CidrBlock().equals(other.getClusterIpv4CidrBlock())) return false; + if (!getNodeIpv4CidrBlock().equals(other.getNodeIpv4CidrBlock())) return false; + if (!getServicesIpv4CidrBlock().equals(other.getServicesIpv4CidrBlock())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1037,35 +1034,35 @@ public com.google.container.v1.IPAllocationPolicy buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2310,7 +2307,7 @@ public Builder setServicesIpv4CidrBlockBytes(com.google.protobuf.ByteString valu @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java index b36b469f9ba0..bd3764f38abb 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java @@ -22,9 +22,7 @@ private KubernetesDashboard(com.google.protobuf.GeneratedMessageV3.Builder bu super(builder); } - private KubernetesDashboard() { - disabled_ = false; - } + private KubernetesDashboard() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -57,7 +55,7 @@ private KubernetesDashboard( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -149,10 +147,9 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.KubernetesDashboard other = (com.google.container.v1.KubernetesDashboard) obj; - boolean result = true; - result = result && (getDisabled() == other.getDisabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getDisabled() != other.getDisabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -345,35 +342,35 @@ public com.google.container.v1.KubernetesDashboard buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -466,7 +463,7 @@ public Builder clearDisabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java index 9ec481568c60..92429f4e0188 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java @@ -23,9 +23,7 @@ private LegacyAbac(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LegacyAbac() { - enabled_ = false; - } + private LegacyAbac() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -58,7 +56,7 @@ private LegacyAbac( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.LegacyAbac other = (com.google.container.v1.LegacyAbac) obj; - boolean result = true; - result = result && (getEnabled() == other.getEnabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnabled() != other.getEnabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +344,35 @@ public com.google.container.v1.LegacyAbac buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -477,7 +474,7 @@ public Builder clearEnabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java index a825737ce81f..edd51efc6b93 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java @@ -75,7 +75,7 @@ private ListClustersRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -311,12 +311,11 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListClustersRequest other = (com.google.container.v1.ListClustersRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -519,35 +518,35 @@ public com.google.container.v1.ListClustersRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -932,7 +931,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java index 10c9fd4e4cb6..9cd05a1f4cf7 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java @@ -53,7 +53,7 @@ private ListClustersResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { clusters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private ListClustersResponse( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { missingZones_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -73,7 +73,7 @@ private ListClustersResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,10 +85,10 @@ private ListClustersResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { clusters_ = java.util.Collections.unmodifiableList(clusters_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { missingZones_ = missingZones_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -291,11 +291,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListClustersResponse other = (com.google.container.v1.ListClustersResponse) obj; - boolean result = true; - result = result && getClustersList().equals(other.getClustersList()); - result = result && getMissingZonesList().equals(other.getMissingZonesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getClustersList().equals(other.getClustersList())) return false; + if (!getMissingZonesList().equals(other.getMissingZonesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -497,7 +496,7 @@ public com.google.container.v1.ListClustersResponse buildPartial() { new com.google.container.v1.ListClustersResponse(this); int from_bitField0_ = bitField0_; if (clustersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { clusters_ = java.util.Collections.unmodifiableList(clusters_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -505,7 +504,7 @@ public com.google.container.v1.ListClustersResponse buildPartial() { } else { result.clusters_ = clustersBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { missingZones_ = missingZones_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -516,35 +515,35 @@ public com.google.container.v1.ListClustersResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -631,7 +630,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureClustersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { clusters_ = new java.util.ArrayList(clusters_); bitField0_ |= 0x00000001; } @@ -985,10 +984,7 @@ public java.util.List getClustersBuilde com.google.container.v1.Cluster, com.google.container.v1.Cluster.Builder, com.google.container.v1.ClusterOrBuilder>( - clusters_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + clusters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); clusters_ = null; } return clustersBuilder_; @@ -998,7 +994,7 @@ public java.util.List getClustersBuilde com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureMissingZonesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { missingZones_ = new com.google.protobuf.LazyStringArrayList(missingZones_); bitField0_ |= 0x00000002; } @@ -1148,7 +1144,7 @@ public Builder addMissingZonesBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java index 9d5c844d84f3..346456a8a414 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java @@ -83,7 +83,7 @@ private ListNodePoolsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -370,13 +370,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListNodePoolsRequest other = (com.google.container.v1.ListNodePoolsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.container.v1.ListNodePoolsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1100,7 +1099,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java index 9da1b33889a7..1412ca3aa787 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java @@ -52,7 +52,7 @@ private ListNodePoolsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { nodePools_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private ListNodePoolsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private ListNodePoolsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { nodePools_ = java.util.Collections.unmodifiableList(nodePools_); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListNodePoolsResponse other = (com.google.container.v1.ListNodePoolsResponse) obj; - boolean result = true; - result = result && getNodePoolsList().equals(other.getNodePoolsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getNodePoolsList().equals(other.getNodePoolsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -405,7 +404,7 @@ public com.google.container.v1.ListNodePoolsResponse buildPartial() { new com.google.container.v1.ListNodePoolsResponse(this); int from_bitField0_ = bitField0_; if (nodePoolsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { nodePools_ = java.util.Collections.unmodifiableList(nodePools_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -419,35 +418,35 @@ public com.google.container.v1.ListNodePoolsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -524,7 +523,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureNodePoolsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { nodePools_ = new java.util.ArrayList(nodePools_); bitField0_ |= 0x00000001; } @@ -862,10 +861,7 @@ public java.util.List getNodePoolsBuil com.google.container.v1.NodePool, com.google.container.v1.NodePool.Builder, com.google.container.v1.NodePoolOrBuilder>( - nodePools_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + nodePools_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); nodePools_ = null; } return nodePoolsBuilder_; @@ -873,7 +869,7 @@ public java.util.List getNodePoolsBuil @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java index 488afc36e91b..6e5a3c5fd517 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java @@ -75,7 +75,7 @@ private ListOperationsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -309,12 +309,11 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListOperationsRequest other = (com.google.container.v1.ListOperationsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -517,35 +516,35 @@ public com.google.container.v1.ListOperationsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -925,7 +924,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java index 4d760fcd49ca..137a99b0da27 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java @@ -53,7 +53,7 @@ private ListOperationsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { operations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private ListOperationsResponse( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { missingZones_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -73,7 +73,7 @@ private ListOperationsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,10 +85,10 @@ private ListOperationsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { operations_ = java.util.Collections.unmodifiableList(operations_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { missingZones_ = missingZones_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -286,11 +286,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.ListOperationsResponse other = (com.google.container.v1.ListOperationsResponse) obj; - boolean result = true; - result = result && getOperationsList().equals(other.getOperationsList()); - result = result && getMissingZonesList().equals(other.getMissingZonesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOperationsList().equals(other.getOperationsList())) return false; + if (!getMissingZonesList().equals(other.getMissingZonesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -492,7 +491,7 @@ public com.google.container.v1.ListOperationsResponse buildPartial() { new com.google.container.v1.ListOperationsResponse(this); int from_bitField0_ = bitField0_; if (operationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { operations_ = java.util.Collections.unmodifiableList(operations_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -500,7 +499,7 @@ public com.google.container.v1.ListOperationsResponse buildPartial() { } else { result.operations_ = operationsBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { missingZones_ = missingZones_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -511,35 +510,35 @@ public com.google.container.v1.ListOperationsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -626,7 +625,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureOperationsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { operations_ = new java.util.ArrayList(operations_); bitField0_ |= 0x00000001; } @@ -964,10 +963,7 @@ public java.util.List getOperationsBu com.google.container.v1.Operation, com.google.container.v1.Operation.Builder, com.google.container.v1.OperationOrBuilder>( - operations_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + operations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); operations_ = null; } return operationsBuilder_; @@ -977,7 +973,7 @@ public java.util.List getOperationsBu com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureMissingZonesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { missingZones_ = new com.google.protobuf.LazyStringArrayList(missingZones_); bitField0_ |= 0x00000002; } @@ -1127,7 +1123,7 @@ public Builder addMissingZonesBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java index bcb15e045d2a..d2c6c8157636 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java @@ -66,7 +66,7 @@ private MaintenancePolicy( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,13 +184,12 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.MaintenancePolicy other = (com.google.container.v1.MaintenancePolicy) obj; - boolean result = true; - result = result && (hasWindow() == other.hasWindow()); + if (hasWindow() != other.hasWindow()) return false; if (hasWindow()) { - result = result && getWindow().equals(other.getWindow()); + if (!getWindow().equals(other.getWindow())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -393,35 +392,35 @@ public com.google.container.v1.MaintenancePolicy buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -468,7 +467,7 @@ public Builder mergeFrom( return this; } - private com.google.container.v1.MaintenanceWindow window_ = null; + private com.google.container.v1.MaintenanceWindow window_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MaintenanceWindow, com.google.container.v1.MaintenanceWindow.Builder, @@ -651,7 +650,7 @@ public com.google.container.v1.MaintenanceWindowOrBuilder getWindowOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java index 5b77bd86d5f2..06684660668b 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java @@ -66,7 +66,7 @@ private MaintenanceWindow( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -227,18 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.MaintenanceWindow other = (com.google.container.v1.MaintenanceWindow) obj; - boolean result = true; - result = result && getPolicyCase().equals(other.getPolicyCase()); - if (!result) return false; + if (!getPolicyCase().equals(other.getPolicyCase())) return false; switch (policyCase_) { case 2: - result = result && getDailyMaintenanceWindow().equals(other.getDailyMaintenanceWindow()); + if (!getDailyMaintenanceWindow().equals(other.getDailyMaintenanceWindow())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +442,35 @@ public com.google.container.v1.MaintenanceWindow buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -748,7 +746,7 @@ public Builder clearDailyMaintenanceWindow() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java index 62170b4cf0dd..5cf2832adaae 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java @@ -109,7 +109,7 @@ private MasterAuth( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -495,18 +495,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.MasterAuth other = (com.google.container.v1.MasterAuth) obj; - boolean result = true; - result = result && getUsername().equals(other.getUsername()); - result = result && getPassword().equals(other.getPassword()); - result = result && (hasClientCertificateConfig() == other.hasClientCertificateConfig()); + if (!getUsername().equals(other.getUsername())) return false; + if (!getPassword().equals(other.getPassword())) return false; + if (hasClientCertificateConfig() != other.hasClientCertificateConfig()) return false; if (hasClientCertificateConfig()) { - result = result && getClientCertificateConfig().equals(other.getClientCertificateConfig()); + if (!getClientCertificateConfig().equals(other.getClientCertificateConfig())) return false; } - result = result && getClusterCaCertificate().equals(other.getClusterCaCertificate()); - result = result && getClientCertificate().equals(other.getClientCertificate()); - result = result && getClientKey().equals(other.getClientKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getClusterCaCertificate().equals(other.getClusterCaCertificate())) return false; + if (!getClientCertificate().equals(other.getClientCertificate())) return false; + if (!getClientKey().equals(other.getClientKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -734,35 +733,35 @@ public com.google.container.v1.MasterAuth buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1042,7 +1041,7 @@ public Builder setPasswordBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.ClientCertificateConfig clientCertificateConfig_ = null; + private com.google.container.v1.ClientCertificateConfig clientCertificateConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.ClientCertificateConfig, com.google.container.v1.ClientCertificateConfig.Builder, @@ -1545,7 +1544,7 @@ public Builder setClientKeyBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java index 9d52419793b7..07579ed59846 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java @@ -27,7 +27,6 @@ private MasterAuthorizedNetworksConfig( } private MasterAuthorizedNetworksConfig() { - enabled_ = false; cidrBlocks_ = java.util.Collections.emptyList(); } @@ -62,7 +61,7 @@ private MasterAuthorizedNetworksConfig( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { cidrBlocks_ = new java.util.ArrayList< com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock>(); @@ -76,7 +75,7 @@ private MasterAuthorizedNetworksConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +87,7 @@ private MasterAuthorizedNetworksConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { cidrBlocks_ = java.util.Collections.unmodifiableList(cidrBlocks_); } this.unknownFields = unknownFields.build(); @@ -222,7 +221,7 @@ private CidrBlock( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -391,11 +390,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock other = (com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock) obj; - boolean result = true; - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getCidrBlock().equals(other.getCidrBlock()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getCidrBlock().equals(other.getCidrBlock())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -600,23 +598,23 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock buildPar @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -624,13 +622,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -879,7 +877,7 @@ public Builder setCidrBlockBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1076,11 +1074,10 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.MasterAuthorizedNetworksConfig other = (com.google.container.v1.MasterAuthorizedNetworksConfig) obj; - boolean result = true; - result = result && (getEnabled() == other.getEnabled()); - result = result && getCidrBlocksList().equals(other.getCidrBlocksList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnabled() != other.getEnabled()) return false; + if (!getCidrBlocksList().equals(other.getCidrBlocksList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1286,7 +1283,7 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig buildPartial() { int to_bitField0_ = 0; result.enabled_ = enabled_; if (cidrBlocksBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { cidrBlocks_ = java.util.Collections.unmodifiableList(cidrBlocks_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -1301,35 +1298,35 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1455,7 +1452,7 @@ public Builder clearEnabled() { cidrBlocks_ = java.util.Collections.emptyList(); private void ensureCidrBlocksIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { cidrBlocks_ = new java.util.ArrayList< com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock>(cidrBlocks_); @@ -1852,10 +1849,7 @@ public Builder removeCidrBlocks(int index) { com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock, com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock.Builder, com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlockOrBuilder>( - cidrBlocks_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + cidrBlocks_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); cidrBlocks_ = null; } return cidrBlocksBuilder_; @@ -1863,7 +1857,7 @@ public Builder removeCidrBlocks(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java index 972867cadfa8..28e1a46aab61 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java @@ -67,7 +67,7 @@ private NetworkConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,11 +245,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.NetworkConfig other = (com.google.container.v1.NetworkConfig) obj; - boolean result = true; - result = result && getNetwork().equals(other.getNetwork()); - result = result && getSubnetwork().equals(other.getSubnetwork()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getNetwork().equals(other.getNetwork())) return false; + if (!getSubnetwork().equals(other.getSubnetwork())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.container.v1.NetworkConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -741,7 +740,7 @@ public Builder setSubnetworkBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java index 858be66a7d8f..e5c6ee86b646 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java @@ -25,7 +25,6 @@ private NetworkPolicy(com.google.protobuf.GeneratedMessageV3.Builder builder) private NetworkPolicy() { provider_ = 0; - enabled_ = false; } @java.lang.Override @@ -66,7 +65,7 @@ private NetworkPolicy( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -318,11 +317,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.NetworkPolicy other = (com.google.container.v1.NetworkPolicy) obj; - boolean result = true; - result = result && provider_ == other.provider_; - result = result && (getEnabled() == other.getEnabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (provider_ != other.provider_) return false; + if (getEnabled() != other.getEnabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -520,35 +518,35 @@ public com.google.container.v1.NetworkPolicy buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -720,7 +718,7 @@ public Builder clearEnabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java index 5a05e4039f69..1dfda02a9dab 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java @@ -24,9 +24,7 @@ private NetworkPolicyConfig(com.google.protobuf.GeneratedMessageV3.Builder bu super(builder); } - private NetworkPolicyConfig() { - disabled_ = false; - } + private NetworkPolicyConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -59,7 +57,7 @@ private NetworkPolicyConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -151,10 +149,9 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.NetworkPolicyConfig other = (com.google.container.v1.NetworkPolicyConfig) obj; - boolean result = true; - result = result && (getDisabled() == other.getDisabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getDisabled() != other.getDisabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -349,35 +346,35 @@ public com.google.container.v1.NetworkPolicyConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -470,7 +467,7 @@ public Builder clearDisabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java index c32d68e46057..9f77b9139371 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java @@ -24,13 +24,10 @@ private NodeConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private NodeConfig() { machineType_ = ""; - diskSizeGb_ = 0; oauthScopes_ = com.google.protobuf.LazyStringArrayList.EMPTY; serviceAccount_ = ""; imageType_ = ""; - localSsdCount_ = 0; tags_ = com.google.protobuf.LazyStringArrayList.EMPTY; - preemptible_ = false; accelerators_ = java.util.Collections.emptyList(); diskType_ = ""; minCpuPlatform_ = ""; @@ -75,7 +72,7 @@ private NodeConfig( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { oauthScopes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -84,7 +81,7 @@ private NodeConfig( } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { metadata_ = com.google.protobuf.MapField.newMapField( MetadataDefaultEntryHolder.defaultEntry); @@ -106,7 +103,7 @@ private NodeConfig( } case 50: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000040; @@ -125,7 +122,7 @@ private NodeConfig( case 66: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { tags_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000100; } @@ -146,7 +143,7 @@ private NodeConfig( } case 90: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { accelerators_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; @@ -172,7 +169,7 @@ private NodeConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,13 +181,13 @@ private NodeConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { oauthScopes_ = oauthScopes_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (((mutable_bitField0_ & 0x00000100) != 0)) { tags_ = tags_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (((mutable_bitField0_ & 0x00000400) != 0)) { accelerators_ = java.util.Collections.unmodifiableList(accelerators_); } this.unknownFields = unknownFields.build(); @@ -1178,22 +1175,21 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.NodeConfig other = (com.google.container.v1.NodeConfig) obj; - boolean result = true; - result = result && getMachineType().equals(other.getMachineType()); - result = result && (getDiskSizeGb() == other.getDiskSizeGb()); - result = result && getOauthScopesList().equals(other.getOauthScopesList()); - result = result && getServiceAccount().equals(other.getServiceAccount()); - result = result && internalGetMetadata().equals(other.internalGetMetadata()); - result = result && getImageType().equals(other.getImageType()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && (getLocalSsdCount() == other.getLocalSsdCount()); - result = result && getTagsList().equals(other.getTagsList()); - result = result && (getPreemptible() == other.getPreemptible()); - result = result && getAcceleratorsList().equals(other.getAcceleratorsList()); - result = result && getDiskType().equals(other.getDiskType()); - result = result && getMinCpuPlatform().equals(other.getMinCpuPlatform()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMachineType().equals(other.getMachineType())) return false; + if (getDiskSizeGb() != other.getDiskSizeGb()) return false; + if (!getOauthScopesList().equals(other.getOauthScopesList())) return false; + if (!getServiceAccount().equals(other.getServiceAccount())) return false; + if (!internalGetMetadata().equals(other.internalGetMetadata())) return false; + if (!getImageType().equals(other.getImageType())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (getLocalSsdCount() != other.getLocalSsdCount()) return false; + if (!getTagsList().equals(other.getTagsList())) return false; + if (getPreemptible() != other.getPreemptible()) return false; + if (!getAcceleratorsList().equals(other.getAcceleratorsList())) return false; + if (!getDiskType().equals(other.getDiskType())) return false; + if (!getMinCpuPlatform().equals(other.getMinCpuPlatform())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1467,7 +1463,7 @@ public com.google.container.v1.NodeConfig buildPartial() { int to_bitField0_ = 0; result.machineType_ = machineType_; result.diskSizeGb_ = diskSizeGb_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { oauthScopes_ = oauthScopes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1479,14 +1475,14 @@ public com.google.container.v1.NodeConfig buildPartial() { result.labels_ = internalGetLabels(); result.labels_.makeImmutable(); result.localSsdCount_ = localSsdCount_; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { tags_ = tags_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000100); } result.tags_ = tags_; result.preemptible_ = preemptible_; if (acceleratorsBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000400) != 0)) { accelerators_ = java.util.Collections.unmodifiableList(accelerators_); bitField0_ = (bitField0_ & ~0x00000400); } @@ -1503,35 +1499,35 @@ public com.google.container.v1.NodeConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1823,7 +1819,7 @@ public Builder clearDiskSizeGb() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureOauthScopesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { oauthScopes_ = new com.google.protobuf.LazyStringArrayList(oauthScopes_); bitField0_ |= 0x00000004; } @@ -2797,7 +2793,7 @@ public Builder clearLocalSsdCount() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureTagsIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { tags_ = new com.google.protobuf.LazyStringArrayList(tags_); bitField0_ |= 0x00000100; } @@ -3017,7 +3013,7 @@ public Builder clearPreemptible() { java.util.Collections.emptyList(); private void ensureAcceleratorsIsMutable() { - if (!((bitField0_ & 0x00000400) == 0x00000400)) { + if (!((bitField0_ & 0x00000400) != 0)) { accelerators_ = new java.util.ArrayList(accelerators_); bitField0_ |= 0x00000400; @@ -3394,10 +3390,7 @@ public com.google.container.v1.AcceleratorConfig.Builder addAcceleratorsBuilder( com.google.container.v1.AcceleratorConfig, com.google.container.v1.AcceleratorConfig.Builder, com.google.container.v1.AcceleratorConfigOrBuilder>( - accelerators_, - ((bitField0_ & 0x00000400) == 0x00000400), - getParentForChildren(), - isClean()); + accelerators_, ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); accelerators_ = null; } return acceleratorsBuilder_; @@ -3628,7 +3621,7 @@ public Builder setMinCpuPlatformBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java index 9a844e4ea6a0..2365e52c7ef7 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java @@ -23,10 +23,7 @@ private NodeManagement(com.google.protobuf.GeneratedMessageV3.Builder builder super(builder); } - private NodeManagement() { - autoUpgrade_ = false; - autoRepair_ = false; - } + private NodeManagement() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -80,7 +77,7 @@ private NodeManagement( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,15 +241,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.NodeManagement other = (com.google.container.v1.NodeManagement) obj; - boolean result = true; - result = result && (getAutoUpgrade() == other.getAutoUpgrade()); - result = result && (getAutoRepair() == other.getAutoRepair()); - result = result && (hasUpgradeOptions() == other.hasUpgradeOptions()); + if (getAutoUpgrade() != other.getAutoUpgrade()) return false; + if (getAutoRepair() != other.getAutoRepair()) return false; + if (hasUpgradeOptions() != other.hasUpgradeOptions()) return false; if (hasUpgradeOptions()) { - result = result && getUpgradeOptions().equals(other.getUpgradeOptions()); + if (!getUpgradeOptions().equals(other.getUpgradeOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -466,35 +462,35 @@ public com.google.container.v1.NodeManagement buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -650,7 +646,7 @@ public Builder clearAutoRepair() { return this; } - private com.google.container.v1.AutoUpgradeOptions upgradeOptions_ = null; + private com.google.container.v1.AutoUpgradeOptions upgradeOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.AutoUpgradeOptions, com.google.container.v1.AutoUpgradeOptions.Builder, @@ -834,7 +830,7 @@ public com.google.container.v1.AutoUpgradeOptionsOrBuilder getUpgradeOptionsOrBu @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java index 50ed3a794369..59f157f3de8d 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java @@ -29,7 +29,6 @@ private NodePool(com.google.protobuf.GeneratedMessageV3.Builder builder) { private NodePool() { name_ = ""; - initialNodeCount_ = 0; selfLink_ = ""; version_ = ""; instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -137,7 +136,7 @@ private NodePool( case 818: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -160,7 +159,7 @@ private NodePool( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -172,7 +171,7 @@ private NodePool( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -950,28 +949,27 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.NodePool other = (com.google.container.v1.NodePool) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasConfig() == other.hasConfig()); + if (!getName().equals(other.getName())) return false; + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); - } - result = result && (getInitialNodeCount() == other.getInitialNodeCount()); - result = result && getSelfLink().equals(other.getSelfLink()); - result = result && getVersion().equals(other.getVersion()); - result = result && getInstanceGroupUrlsList().equals(other.getInstanceGroupUrlsList()); - result = result && status_ == other.status_; - result = result && getStatusMessage().equals(other.getStatusMessage()); - result = result && (hasAutoscaling() == other.hasAutoscaling()); + if (!getConfig().equals(other.getConfig())) return false; + } + if (getInitialNodeCount() != other.getInitialNodeCount()) return false; + if (!getSelfLink().equals(other.getSelfLink())) return false; + if (!getVersion().equals(other.getVersion())) return false; + if (!getInstanceGroupUrlsList().equals(other.getInstanceGroupUrlsList())) return false; + if (status_ != other.status_) return false; + if (!getStatusMessage().equals(other.getStatusMessage())) return false; + if (hasAutoscaling() != other.hasAutoscaling()) return false; if (hasAutoscaling()) { - result = result && getAutoscaling().equals(other.getAutoscaling()); + if (!getAutoscaling().equals(other.getAutoscaling())) return false; } - result = result && (hasManagement() == other.hasManagement()); + if (hasManagement() != other.hasManagement()) return false; if (hasManagement()) { - result = result && getManagement().equals(other.getManagement()); + if (!getManagement().equals(other.getManagement())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1227,7 +1225,7 @@ public com.google.container.v1.NodePool buildPartial() { result.initialNodeCount_ = initialNodeCount_; result.selfLink_ = selfLink_; result.version_ = version_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -1251,35 +1249,35 @@ public com.google.container.v1.NodePool buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1460,7 +1458,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodeConfig config_ = null; + private com.google.container.v1.NodeConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodeConfig, com.google.container.v1.NodeConfig.Builder, @@ -1882,7 +1880,7 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInstanceGroupUrlsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(instanceGroupUrls_); bitField0_ |= 0x00000020; } @@ -2214,7 +2212,7 @@ public Builder setStatusMessageBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodePoolAutoscaling autoscaling_ = null; + private com.google.container.v1.NodePoolAutoscaling autoscaling_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodePoolAutoscaling, com.google.container.v1.NodePoolAutoscaling.Builder, @@ -2405,7 +2403,7 @@ public com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuil return autoscalingBuilder_; } - private com.google.container.v1.NodeManagement management_ = null; + private com.google.container.v1.NodeManagement management_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodeManagement, com.google.container.v1.NodeManagement.Builder, @@ -2588,7 +2586,7 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder() @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java index 9f2030b97559..15e3b71a8eb0 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java @@ -23,11 +23,7 @@ private NodePoolAutoscaling(com.google.protobuf.GeneratedMessageV3.Builder bu super(builder); } - private NodePoolAutoscaling() { - enabled_ = false; - minNodeCount_ = 0; - maxNodeCount_ = 0; - } + private NodePoolAutoscaling() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -70,7 +66,7 @@ private NodePoolAutoscaling( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -206,12 +202,11 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.NodePoolAutoscaling other = (com.google.container.v1.NodePoolAutoscaling) obj; - boolean result = true; - result = result && (getEnabled() == other.getEnabled()); - result = result && (getMinNodeCount() == other.getMinNodeCount()); - result = result && (getMaxNodeCount() == other.getMaxNodeCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnabled() != other.getEnabled()) return false; + if (getMinNodeCount() != other.getMinNodeCount()) return false; + if (getMaxNodeCount() != other.getMaxNodeCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -415,35 +410,35 @@ public com.google.container.v1.NodePoolAutoscaling buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -636,7 +631,7 @@ public Builder clearMaxNodeCount() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java index d91e7eefdd30..59f698423c54 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java @@ -140,7 +140,7 @@ private Operation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1383,20 +1383,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.Operation other = (com.google.container.v1.Operation) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getZone().equals(other.getZone()); - result = result && operationType_ == other.operationType_; - result = result && status_ == other.status_; - result = result && getDetail().equals(other.getDetail()); - result = result && getStatusMessage().equals(other.getStatusMessage()); - result = result && getSelfLink().equals(other.getSelfLink()); - result = result && getTargetLink().equals(other.getTargetLink()); - result = result && getLocation().equals(other.getLocation()); - result = result && getStartTime().equals(other.getStartTime()); - result = result && getEndTime().equals(other.getEndTime()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getZone().equals(other.getZone())) return false; + if (operationType_ != other.operationType_) return false; + if (status_ != other.status_) return false; + if (!getDetail().equals(other.getDetail())) return false; + if (!getStatusMessage().equals(other.getStatusMessage())) return false; + if (!getSelfLink().equals(other.getSelfLink())) return false; + if (!getTargetLink().equals(other.getTargetLink())) return false; + if (!getLocation().equals(other.getLocation())) return false; + if (!getStartTime().equals(other.getStartTime())) return false; + if (!getEndTime().equals(other.getEndTime())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1638,35 +1637,35 @@ public com.google.container.v1.Operation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2797,7 +2796,7 @@ public Builder setEndTimeBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java index dc563e4cce18..4aa44e126a1d 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java @@ -23,8 +23,6 @@ private PrivateClusterConfig(com.google.protobuf.GeneratedMessageV3.Builder b } private PrivateClusterConfig() { - enablePrivateNodes_ = false; - enablePrivateEndpoint_ = false; masterIpv4CidrBlock_ = ""; privateEndpoint_ = ""; publicEndpoint_ = ""; @@ -87,7 +85,7 @@ private PrivateClusterConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -355,14 +353,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.PrivateClusterConfig other = (com.google.container.v1.PrivateClusterConfig) obj; - boolean result = true; - result = result && (getEnablePrivateNodes() == other.getEnablePrivateNodes()); - result = result && (getEnablePrivateEndpoint() == other.getEnablePrivateEndpoint()); - result = result && getMasterIpv4CidrBlock().equals(other.getMasterIpv4CidrBlock()); - result = result && getPrivateEndpoint().equals(other.getPrivateEndpoint()); - result = result && getPublicEndpoint().equals(other.getPublicEndpoint()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnablePrivateNodes() != other.getEnablePrivateNodes()) return false; + if (getEnablePrivateEndpoint() != other.getEnablePrivateEndpoint()) return false; + if (!getMasterIpv4CidrBlock().equals(other.getMasterIpv4CidrBlock())) return false; + if (!getPrivateEndpoint().equals(other.getPrivateEndpoint())) return false; + if (!getPublicEndpoint().equals(other.getPublicEndpoint())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -575,35 +572,35 @@ public com.google.container.v1.PrivateClusterConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1058,7 +1055,7 @@ public Builder setPublicEndpointBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java index 73bbf91e44cf..56907d13328a 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java @@ -94,7 +94,7 @@ private RollbackNodePoolUpgradeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -436,14 +436,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.RollbackNodePoolUpgradeRequest other = (com.google.container.v1.RollbackNodePoolUpgradeRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -659,35 +658,35 @@ public com.google.container.v1.RollbackNodePoolUpgradeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1290,7 +1289,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java index 96056abf1b3d..5bc49b8becf1 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java @@ -64,7 +64,7 @@ private ServerConfig( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { validNodeVersions_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -81,7 +81,7 @@ private ServerConfig( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { validImageTypes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -91,7 +91,7 @@ private ServerConfig( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { validMasterVersions_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -100,7 +100,7 @@ private ServerConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -112,13 +112,13 @@ private ServerConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { validNodeVersions_ = validNodeVersions_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { validImageTypes_ = validImageTypes_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { validMasterVersions_ = validMasterVersions_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -464,14 +464,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.ServerConfig other = (com.google.container.v1.ServerConfig) obj; - boolean result = true; - result = result && getDefaultClusterVersion().equals(other.getDefaultClusterVersion()); - result = result && getValidNodeVersionsList().equals(other.getValidNodeVersionsList()); - result = result && getDefaultImageType().equals(other.getDefaultImageType()); - result = result && getValidImageTypesList().equals(other.getValidImageTypesList()); - result = result && getValidMasterVersionsList().equals(other.getValidMasterVersionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDefaultClusterVersion().equals(other.getDefaultClusterVersion())) return false; + if (!getValidNodeVersionsList().equals(other.getValidNodeVersionsList())) return false; + if (!getDefaultImageType().equals(other.getDefaultImageType())) return false; + if (!getValidImageTypesList().equals(other.getValidImageTypesList())) return false; + if (!getValidMasterVersionsList().equals(other.getValidMasterVersionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -680,18 +679,18 @@ public com.google.container.v1.ServerConfig buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.defaultClusterVersion_ = defaultClusterVersion_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { validNodeVersions_ = validNodeVersions_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.validNodeVersions_ = validNodeVersions_; result.defaultImageType_ = defaultImageType_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { validImageTypes_ = validImageTypes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } result.validImageTypes_ = validImageTypes_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { validMasterVersions_ = validMasterVersions_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } @@ -703,35 +702,35 @@ public com.google.container.v1.ServerConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -913,7 +912,7 @@ public Builder setDefaultClusterVersionBytes(com.google.protobuf.ByteString valu com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureValidNodeVersionsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { validNodeVersions_ = new com.google.protobuf.LazyStringArrayList(validNodeVersions_); bitField0_ |= 0x00000002; } @@ -1150,7 +1149,7 @@ public Builder setDefaultImageTypeBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureValidImageTypesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { validImageTypes_ = new com.google.protobuf.LazyStringArrayList(validImageTypes_); bitField0_ |= 0x00000008; } @@ -1293,7 +1292,7 @@ public Builder addValidImageTypesBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureValidMasterVersionsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { validMasterVersions_ = new com.google.protobuf.LazyStringArrayList(validMasterVersions_); bitField0_ |= 0x00000010; } @@ -1434,7 +1433,7 @@ public Builder addValidMasterVersionsBytes(com.google.protobuf.ByteString value) @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java index d2546dcff308..58ae12a33c8a 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java @@ -99,7 +99,7 @@ private SetAddonsConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -436,17 +436,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetAddonsConfigRequest other = (com.google.container.v1.SetAddonsConfigRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (hasAddonsConfig() == other.hasAddonsConfig()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (hasAddonsConfig() != other.hasAddonsConfig()) return false; if (hasAddonsConfig()) { - result = result && getAddonsConfig().equals(other.getAddonsConfig()); + if (!getAddonsConfig().equals(other.getAddonsConfig())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -669,35 +668,35 @@ public com.google.container.v1.SetAddonsConfigRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1087,7 +1086,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.AddonsConfig addonsConfig_ = null; + private com.google.container.v1.AddonsConfig addonsConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.AddonsConfig, com.google.container.v1.AddonsConfig.Builder, @@ -1378,7 +1377,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java index 387c8aaf88c1..a92ce98eee02 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java @@ -79,7 +79,7 @@ private SetLabelsRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { resourceLabels_ = com.google.protobuf.MapField.newMapField( ResourceLabelsDefaultEntryHolder.defaultEntry); @@ -110,7 +110,7 @@ private SetLabelsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -575,15 +575,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.container.v1.SetLabelsRequest other = (com.google.container.v1.SetLabelsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && internalGetResourceLabels().equals(other.internalGetResourceLabels()); - result = result && getLabelFingerprint().equals(other.getLabelFingerprint()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!internalGetResourceLabels().equals(other.internalGetResourceLabels())) return false; + if (!getLabelFingerprint().equals(other.getLabelFingerprint())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -828,35 +827,35 @@ public com.google.container.v1.SetLabelsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1625,7 +1624,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java index 8f76b071f26d..845c5ec7c14b 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java @@ -27,7 +27,6 @@ private SetLegacyAbacRequest() { projectId_ = ""; zone_ = ""; clusterId_ = ""; - enabled_ = false; name_ = ""; } @@ -90,7 +89,7 @@ private SetLegacyAbacRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -398,14 +397,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetLegacyAbacRequest other = (com.google.container.v1.SetLegacyAbacRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (getEnabled() == other.getEnabled()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (getEnabled() != other.getEnabled()) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -619,35 +617,35 @@ public com.google.container.v1.SetLegacyAbacRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1182,7 +1180,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java index c8d1fe81b57f..2d0d24dc4c73 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java @@ -78,7 +78,7 @@ private SetLocationsRequest( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { locations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -94,7 +94,7 @@ private SetLocationsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +106,7 @@ private SetLocationsRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { locations_ = locations_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -467,14 +467,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetLocationsRequest other = (com.google.container.v1.SetLocationsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getLocationsList().equals(other.getLocationsList()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getLocationsList().equals(other.getLocationsList())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -683,7 +682,7 @@ public com.google.container.v1.SetLocationsRequest buildPartial() { result.projectId_ = projectId_; result.zone_ = zone_; result.clusterId_ = clusterId_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { locations_ = locations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -696,35 +695,35 @@ public com.google.container.v1.SetLocationsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1127,7 +1126,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLocationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { locations_ = new com.google.protobuf.LazyStringArrayList(locations_); bitField0_ |= 0x00000008; } @@ -1412,7 +1411,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java index ac87e7c9b5ad..0c7a80543976 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java @@ -91,7 +91,7 @@ private SetLoggingServiceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -431,14 +431,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetLoggingServiceRequest other = (com.google.container.v1.SetLoggingServiceRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getLoggingService().equals(other.getLoggingService()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getLoggingService().equals(other.getLoggingService())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -651,35 +650,35 @@ public com.google.container.v1.SetLoggingServiceRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1276,7 +1275,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java index 2ee0103c7f27..c9eb9505f460 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java @@ -99,7 +99,7 @@ private SetMaintenancePolicyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -426,17 +426,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetMaintenancePolicyRequest other = (com.google.container.v1.SetMaintenancePolicyRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (hasMaintenancePolicy() == other.hasMaintenancePolicy()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (hasMaintenancePolicy() != other.hasMaintenancePolicy()) return false; if (hasMaintenancePolicy()) { - result = result && getMaintenancePolicy().equals(other.getMaintenancePolicy()); + if (!getMaintenancePolicy().equals(other.getMaintenancePolicy())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -659,35 +658,35 @@ public com.google.container.v1.SetMaintenancePolicyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1049,7 +1048,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.MaintenancePolicy maintenancePolicy_ = null; + private com.google.container.v1.MaintenancePolicy maintenancePolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MaintenancePolicy, com.google.container.v1.MaintenancePolicy.Builder, @@ -1346,7 +1345,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java index 31dcd28d60b0..67ee1c4dac4c 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java @@ -106,7 +106,7 @@ private SetMasterAuthRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -649,18 +649,17 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetMasterAuthRequest other = (com.google.container.v1.SetMasterAuthRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && action_ == other.action_; - result = result && (hasUpdate() == other.hasUpdate()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (action_ != other.action_) return false; + if (hasUpdate() != other.hasUpdate()) return false; if (hasUpdate()) { - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -888,35 +887,35 @@ public com.google.container.v1.SetMasterAuthRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1387,7 +1386,7 @@ public Builder clearAction() { return this; } - private com.google.container.v1.MasterAuth update_ = null; + private com.google.container.v1.MasterAuth update_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.MasterAuth, com.google.container.v1.MasterAuth.Builder, @@ -1665,7 +1664,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java index bbf7dcd5ded6..e317136dcb60 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java @@ -91,7 +91,7 @@ private SetMonitoringServiceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -433,14 +433,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetMonitoringServiceRequest other = (com.google.container.v1.SetMonitoringServiceRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getMonitoringService().equals(other.getMonitoringService()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getMonitoringService().equals(other.getMonitoringService())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -653,35 +652,35 @@ public com.google.container.v1.SetMonitoringServiceRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1284,7 +1283,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java index 665ddedbf4ad..0fe2c5f5c328 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java @@ -99,7 +99,7 @@ private SetNetworkPolicyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -433,17 +433,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetNetworkPolicyRequest other = (com.google.container.v1.SetNetworkPolicyRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (hasNetworkPolicy() == other.hasNetworkPolicy()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (hasNetworkPolicy() != other.hasNetworkPolicy()) return false; if (hasNetworkPolicy()) { - result = result && getNetworkPolicy().equals(other.getNetworkPolicy()); + if (!getNetworkPolicy().equals(other.getNetworkPolicy())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -666,35 +665,35 @@ public com.google.container.v1.SetNetworkPolicyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1085,7 +1084,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NetworkPolicy networkPolicy_ = null; + private com.google.container.v1.NetworkPolicy networkPolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NetworkPolicy, com.google.container.v1.NetworkPolicy.Builder, @@ -1367,7 +1366,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java index c47658613edd..98942ad9eb00 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java @@ -107,7 +107,7 @@ private SetNodePoolAutoscalingRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -496,18 +496,17 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetNodePoolAutoscalingRequest other = (com.google.container.v1.SetNodePoolAutoscalingRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && (hasAutoscaling() == other.hasAutoscaling()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (hasAutoscaling() != other.hasAutoscaling()) return false; if (hasAutoscaling()) { - result = result && getAutoscaling().equals(other.getAutoscaling()); + if (!getAutoscaling().equals(other.getAutoscaling())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -736,35 +735,35 @@ public com.google.container.v1.SetNodePoolAutoscalingRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1264,7 +1263,7 @@ public Builder setNodePoolIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodePoolAutoscaling autoscaling_ = null; + private com.google.container.v1.NodePoolAutoscaling autoscaling_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodePoolAutoscaling, com.google.container.v1.NodePoolAutoscaling.Builder, @@ -1552,7 +1551,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java index a7e81097849e..6cc533482bee 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java @@ -108,7 +108,7 @@ private SetNodePoolManagementRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -497,18 +497,17 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetNodePoolManagementRequest other = (com.google.container.v1.SetNodePoolManagementRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && (hasManagement() == other.hasManagement()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (hasManagement() != other.hasManagement()) return false; if (hasManagement()) { - result = result && getManagement().equals(other.getManagement()); + if (!getManagement().equals(other.getManagement())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -737,35 +736,35 @@ public com.google.container.v1.SetNodePoolManagementRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1265,7 +1264,7 @@ public Builder setNodePoolIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.NodeManagement management_ = null; + private com.google.container.v1.NodeManagement management_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.NodeManagement, com.google.container.v1.NodeManagement.Builder, @@ -1552,7 +1551,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java index fcda3352a8ac..edba389edf7a 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java @@ -28,7 +28,6 @@ private SetNodePoolSizeRequest() { zone_ = ""; clusterId_ = ""; nodePoolId_ = ""; - nodeCount_ = 0; name_ = ""; } @@ -98,7 +97,7 @@ private SetNodePoolSizeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -461,15 +460,14 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.SetNodePoolSizeRequest other = (com.google.container.v1.SetNodePoolSizeRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && (getNodeCount() == other.getNodeCount()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (getNodeCount() != other.getNodeCount()) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -688,35 +686,35 @@ public com.google.container.v1.SetNodePoolSizeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1364,7 +1362,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java index 98a3435c202c..2dad2d55b892 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java @@ -28,7 +28,6 @@ private StartIPRotationRequest() { zone_ = ""; clusterId_ = ""; name_ = ""; - rotateCredentials_ = false; } @java.lang.Override @@ -90,7 +89,7 @@ private StartIPRotationRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -398,14 +397,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.StartIPRotationRequest other = (com.google.container.v1.StartIPRotationRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getName().equals(other.getName()); - result = result && (getRotateCredentials() == other.getRotateCredentials()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getName().equals(other.getName())) return false; + if (getRotateCredentials() != other.getRotateCredentials()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -619,35 +617,35 @@ public com.google.container.v1.StartIPRotationRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1182,7 +1180,7 @@ public Builder clearRotateCredentials() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java index 75dd0bdd396b..ab6735826e3c 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java @@ -99,7 +99,7 @@ private UpdateClusterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -431,17 +431,16 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.UpdateClusterRequest other = (com.google.container.v1.UpdateClusterRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && (hasUpdate() == other.hasUpdate()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (hasUpdate() != other.hasUpdate()) return false; if (hasUpdate()) { - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; } - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -664,35 +663,35 @@ public com.google.container.v1.UpdateClusterRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1082,7 +1081,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.container.v1.ClusterUpdate update_ = null; + private com.google.container.v1.ClusterUpdate update_; private com.google.protobuf.SingleFieldBuilderV3< com.google.container.v1.ClusterUpdate, com.google.container.v1.ClusterUpdate.Builder, @@ -1364,7 +1363,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java index 4998fad27c69..16ea42bdf9f6 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java @@ -91,7 +91,7 @@ private UpdateMasterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -441,14 +441,13 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.UpdateMasterRequest other = (com.google.container.v1.UpdateMasterRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getMasterVersion().equals(other.getMasterVersion()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getMasterVersion().equals(other.getMasterVersion())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -661,35 +660,35 @@ public com.google.container.v1.UpdateMasterRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1310,7 +1309,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java index 4ec9ce4937be..9dcd308f16fb 100644 --- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java +++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java @@ -107,7 +107,7 @@ private UpdateNodePoolRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -563,16 +563,15 @@ public boolean equals(final java.lang.Object obj) { com.google.container.v1.UpdateNodePoolRequest other = (com.google.container.v1.UpdateNodePoolRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getZone().equals(other.getZone()); - result = result && getClusterId().equals(other.getClusterId()); - result = result && getNodePoolId().equals(other.getNodePoolId()); - result = result && getNodeVersion().equals(other.getNodeVersion()); - result = result && getImageType().equals(other.getImageType()); - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getZone().equals(other.getZone())) return false; + if (!getClusterId().equals(other.getClusterId())) return false; + if (!getNodePoolId().equals(other.getNodePoolId())) return false; + if (!getNodeVersion().equals(other.getNodeVersion())) return false; + if (!getImageType().equals(other.getImageType())) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -795,35 +794,35 @@ public com.google.container.v1.UpdateNodePoolRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1660,7 +1659,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-container/synth.metadata b/google-cloud-clients/google-cloud-container/synth.metadata index dd97106d2183..0c7c7e242fc7 100644 --- a/google-cloud-clients/google-cloud-container/synth.metadata +++ b/google-cloud-clients/google-cloud-container/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:38:39.370591Z", + "updateTime": "2019-03-29T07:38:30.815641Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],