From 0c3e1fc0d0a348197a23e2a59048523fb8d88ea8 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 29 Mar 2019 00:39:22 -0700 Subject: [PATCH] Regenerate containeranalysis client --- .../v1beta1/GetScanConfigRequest.java | 23 +++-- .../v1beta1/ListScanConfigsRequest.java | 30 +++--- .../v1beta1/ListScanConfigsResponse.java | 38 ++++---- .../containeranalysis/v1beta1/ScanConfig.java | 40 ++++---- .../v1beta1/UpdateScanConfigRequest.java | 29 +++--- .../v1beta1/BatchCreateNotesRequest.java | 27 +++--- .../v1beta1/BatchCreateNotesResponse.java | 36 +++---- .../BatchCreateOccurrencesRequest.java | 38 ++++---- .../BatchCreateOccurrencesResponse.java | 36 +++---- .../io/grafeas/v1beta1/CreateNoteRequest.java | 31 +++--- .../v1beta1/CreateOccurrenceRequest.java | 29 +++--- .../io/grafeas/v1beta1/DeleteNoteRequest.java | 23 +++-- .../v1beta1/DeleteOccurrenceRequest.java | 23 +++-- .../io/grafeas/v1beta1/GetNoteRequest.java | 23 +++-- .../v1beta1/GetOccurrenceNoteRequest.java | 23 +++-- .../grafeas/v1beta1/GetOccurrenceRequest.java | 23 +++-- ...ulnerabilityOccurrencesSummaryRequest.java | 25 +++-- .../v1beta1/ListNoteOccurrencesRequest.java | 30 +++--- .../v1beta1/ListNoteOccurrencesResponse.java | 38 ++++---- .../io/grafeas/v1beta1/ListNotesRequest.java | 30 +++--- .../io/grafeas/v1beta1/ListNotesResponse.java | 38 ++++---- .../v1beta1/ListOccurrencesRequest.java | 30 +++--- .../v1beta1/ListOccurrencesResponse.java | 38 ++++---- .../main/java/io/grafeas/v1beta1/Note.java | 89 ++++++++--------- .../java/io/grafeas/v1beta1/Occurrence.java | 64 ++++++------ .../java/io/grafeas/v1beta1/Resource.java | 31 +++--- .../io/grafeas/v1beta1/UpdateNoteRequest.java | 35 ++++--- .../v1beta1/UpdateOccurrenceRequest.java | 35 ++++--- .../VulnerabilityOccurrencesSummary.java | 71 ++++++-------- .../v1beta1/attestation/Attestation.java | 26 +++-- .../v1beta1/attestation/Authority.java | 50 +++++----- .../grafeas/v1beta1/attestation/Details.java | 27 +++--- .../attestation/PgpSignedAttestation.java | 30 +++--- .../java/io/grafeas/v1beta1/build/Build.java | 29 +++--- .../grafeas/v1beta1/build/BuildSignature.java | 29 +++--- .../io/grafeas/v1beta1/build/Details.java | 29 +++--- .../io/grafeas/v1beta1/common/RelatedUrl.java | 25 +++-- .../v1beta1/deployment/Deployable.java | 31 +++--- .../v1beta1/deployment/Deployment.java | 53 +++++----- .../grafeas/v1beta1/deployment/Details.java | 27 +++--- .../io/grafeas/v1beta1/discovery/Details.java | 27 +++--- .../grafeas/v1beta1/discovery/Discovered.java | 37 ++++--- .../grafeas/v1beta1/discovery/Discovery.java | 23 +++-- .../java/io/grafeas/v1beta1/image/Basis.java | 29 +++--- .../io/grafeas/v1beta1/image/Derived.java | 47 ++++----- .../io/grafeas/v1beta1/image/Details.java | 27 +++--- .../io/grafeas/v1beta1/image/Fingerprint.java | 35 ++++--- .../java/io/grafeas/v1beta1/image/Layer.java | 25 +++-- .../java/io/grafeas/v1beta1/pkg/Details.java | 27 +++--- .../io/grafeas/v1beta1/pkg/Distribution.java | 37 ++++--- .../io/grafeas/v1beta1/pkg/Installation.java | 38 ++++---- .../java/io/grafeas/v1beta1/pkg/Location.java | 31 +++--- .../java/io/grafeas/v1beta1/pkg/Package.java | 38 ++++---- .../java/io/grafeas/v1beta1/pkg/Version.java | 30 +++--- .../grafeas/v1beta1/provenance/Artifact.java | 35 ++++--- .../v1beta1/provenance/BuildProvenance.java | 88 ++++++++--------- .../grafeas/v1beta1/provenance/Command.java | 57 ++++++----- .../v1beta1/provenance/FileHashes.java | 36 +++---- .../io/grafeas/v1beta1/provenance/Hash.java | 25 +++-- .../io/grafeas/v1beta1/provenance/Source.java | 45 +++++---- .../grafeas/v1beta1/source/AliasContext.java | 25 +++-- .../source/CloudRepoSourceContext.java | 34 +++---- .../v1beta1/source/GerritSourceContext.java | 32 +++--- .../v1beta1/source/GitSourceContext.java | 25 +++-- .../grafeas/v1beta1/source/ProjectRepoId.java | 25 +++-- .../io/grafeas/v1beta1/source/RepoId.java | 28 +++--- .../grafeas/v1beta1/source/SourceContext.java | 34 +++---- .../v1beta1/vulnerability/Details.java | 66 ++++++------- .../v1beta1/vulnerability/PackageIssue.java | 35 ++++--- .../v1beta1/vulnerability/Vulnerability.java | 97 +++++++++---------- .../vulnerability/VulnerabilityLocation.java | 31 +++--- .../synth.metadata | 10 +- 72 files changed, 1206 insertions(+), 1355 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java index c6925b70b82e..2878f5965601 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java @@ -59,7 +59,7 @@ private GetScanConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.containeranalysis.v1beta1.GetScanConfigRequest other = (com.google.containeranalysis.v1beta1.GetScanConfigRequest) obj; - boolean result = true; - 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 @@ -378,35 +377,35 @@ public com.google.containeranalysis.v1beta1.GetScanConfigRequest 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 @@ -557,7 +556,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-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java index 4c30c01f00dc..55acacc0dc30 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java @@ -25,7 +25,6 @@ private ListScanConfigsRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListScanConfigsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListScanConfigsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -322,13 +321,12 @@ public boolean equals(final java.lang.Object obj) { com.google.containeranalysis.v1beta1.ListScanConfigsRequest other = (com.google.containeranalysis.v1beta1.ListScanConfigsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -537,35 +535,35 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsRequest 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 @@ -959,7 +957,7 @@ public Builder setPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java index ac9083c17e4a..d13901d39d85 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java @@ -53,7 +53,7 @@ private ListScanConfigsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { scanConfigs_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -72,7 +72,7 @@ private ListScanConfigsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListScanConfigsResponse( } 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)) { scanConfigs_ = java.util.Collections.unmodifiableList(scanConfigs_); } this.unknownFields = unknownFields.build(); @@ -271,11 +271,10 @@ public boolean equals(final java.lang.Object obj) { com.google.containeranalysis.v1beta1.ListScanConfigsResponse other = (com.google.containeranalysis.v1beta1.ListScanConfigsResponse) obj; - boolean result = true; - result = result && getScanConfigsList().equals(other.getScanConfigsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getScanConfigsList().equals(other.getScanConfigsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,7 +477,7 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsResponse buildPartial int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (scanConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { scanConfigs_ = java.util.Collections.unmodifiableList(scanConfigs_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -494,35 +493,35 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsResponse 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 @@ -606,7 +605,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureScanConfigsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { scanConfigs_ = new java.util.ArrayList(scanConfigs_); bitField0_ |= 0x00000001; @@ -952,10 +951,7 @@ public com.google.containeranalysis.v1beta1.ScanConfig.Builder addScanConfigsBui com.google.containeranalysis.v1beta1.ScanConfig, com.google.containeranalysis.v1beta1.ScanConfig.Builder, com.google.containeranalysis.v1beta1.ScanConfigOrBuilder>( - scanConfigs_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + scanConfigs_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); scanConfigs_ = null; } return scanConfigsBuilder_; @@ -1067,7 +1063,7 @@ public Builder setNextPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java index b26de08cffd8..ed284f0bbdae 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java @@ -27,7 +27,6 @@ private ScanConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private ScanConfig() { name_ = ""; description_ = ""; - enabled_ = false; } @java.lang.Override @@ -105,7 +104,7 @@ private ScanConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -389,20 +388,19 @@ public boolean equals(final java.lang.Object obj) { com.google.containeranalysis.v1beta1.ScanConfig other = (com.google.containeranalysis.v1beta1.ScanConfig) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDescription().equals(other.getDescription()); - result = result && (getEnabled() == other.getEnabled()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (getEnabled() != other.getEnabled()) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -637,35 +635,35 @@ public com.google.containeranalysis.v1beta1.ScanConfig 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 @@ -969,7 +967,7 @@ public Builder clearEnabled() { return this; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1148,7 +1146,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1329,7 +1327,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java index 18f08286c9c0..7235a7c494c9 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java @@ -75,7 +75,7 @@ private UpdateScanConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,14 +244,13 @@ public boolean equals(final java.lang.Object obj) { com.google.containeranalysis.v1beta1.UpdateScanConfigRequest other = (com.google.containeranalysis.v1beta1.UpdateScanConfigRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasScanConfig() == other.hasScanConfig()); + if (!getName().equals(other.getName())) return false; + if (hasScanConfig() != other.hasScanConfig()) return false; if (hasScanConfig()) { - result = result && getScanConfig().equals(other.getScanConfig()); + if (!getScanConfig().equals(other.getScanConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -461,35 +460,35 @@ public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest 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 @@ -642,7 +641,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.containeranalysis.v1beta1.ScanConfig scanConfig_ = null; + private com.google.containeranalysis.v1beta1.ScanConfig scanConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.containeranalysis.v1beta1.ScanConfig, com.google.containeranalysis.v1beta1.ScanConfig.Builder, @@ -826,7 +825,7 @@ public com.google.containeranalysis.v1beta1.ScanConfigOrBuilder getScanConfigOrB @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java index f7a43295febd..4adf9d81353a 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java @@ -59,7 +59,7 @@ private BatchCreateNotesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { notes_ = com.google.protobuf.MapField.newMapField(NotesDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; @@ -72,7 +72,7 @@ private BatchCreateNotesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -315,11 +315,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.BatchCreateNotesRequest other = (io.grafeas.v1beta1.BatchCreateNotesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && internalGetNotes().equals(other.internalGetNotes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!internalGetNotes().equals(other.internalGetNotes())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -542,35 +541,35 @@ public io.grafeas.v1beta1.BatchCreateNotesRequest 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 @@ -875,7 +874,7 @@ public Builder putAllNotes(java.util.Map(); mutable_bitField0_ |= 0x00000001; } @@ -61,7 +61,7 @@ private BatchCreateNotesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -73,7 +73,7 @@ private BatchCreateNotesResponse( } 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)) { notes_ = java.util.Collections.unmodifiableList(notes_); } this.unknownFields = unknownFields.build(); @@ -204,10 +204,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.BatchCreateNotesResponse other = (io.grafeas.v1beta1.BatchCreateNotesResponse) obj; - boolean result = true; - result = result && getNotesList().equals(other.getNotesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getNotesList().equals(other.getNotesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -403,7 +402,7 @@ public io.grafeas.v1beta1.BatchCreateNotesResponse buildPartial() { new io.grafeas.v1beta1.BatchCreateNotesResponse(this); int from_bitField0_ = bitField0_; if (notesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { notes_ = java.util.Collections.unmodifiableList(notes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -417,35 +416,35 @@ public io.grafeas.v1beta1.BatchCreateNotesResponse 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 @@ -521,7 +520,7 @@ public Builder mergeFrom( private java.util.List notes_ = java.util.Collections.emptyList(); private void ensureNotesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { notes_ = new java.util.ArrayList(notes_); bitField0_ |= 0x00000001; } @@ -853,10 +852,7 @@ public java.util.List getNotesBuilderList() { io.grafeas.v1beta1.Note, io.grafeas.v1beta1.Note.Builder, io.grafeas.v1beta1.NoteOrBuilder>( - notes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + notes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); notes_ = null; } return notesBuilder_; @@ -864,7 +860,7 @@ public java.util.List getNotesBuilderList() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java index 5585689b8188..029e0b189336 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java @@ -60,7 +60,7 @@ private BatchCreateOccurrencesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { occurrences_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -70,7 +70,7 @@ private BatchCreateOccurrencesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private BatchCreateOccurrencesRequest( } 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)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); } this.unknownFields = unknownFields.build(); @@ -266,11 +266,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.BatchCreateOccurrencesRequest other = (io.grafeas.v1beta1.BatchCreateOccurrencesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getOccurrencesList().equals(other.getOccurrencesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getOccurrencesList().equals(other.getOccurrencesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -472,7 +471,7 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesRequest buildPartial() { int to_bitField0_ = 0; result.parent_ = parent_; if (occurrencesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -487,35 +486,35 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesRequest 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 @@ -696,7 +695,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureOccurrencesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { occurrences_ = new java.util.ArrayList(occurrences_); bitField0_ |= 0x00000002; } @@ -1034,10 +1033,7 @@ public java.util.List getOccurrencesBuild io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, io.grafeas.v1beta1.OccurrenceOrBuilder>( - occurrences_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + occurrences_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); occurrences_ = null; } return occurrencesBuilder_; @@ -1045,7 +1041,7 @@ public java.util.List getOccurrencesBuild @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java index fb5216dbbc14..376c2a968896 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java @@ -53,7 +53,7 @@ private BatchCreateOccurrencesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private BatchCreateOccurrencesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private BatchCreateOccurrencesResponse( } 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)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.BatchCreateOccurrencesResponse other = (io.grafeas.v1beta1.BatchCreateOccurrencesResponse) obj; - boolean result = true; - result = result && getOccurrencesList().equals(other.getOccurrencesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOccurrencesList().equals(other.getOccurrencesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,7 +405,7 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesResponse buildPartial() { new io.grafeas.v1beta1.BatchCreateOccurrencesResponse(this); int from_bitField0_ = bitField0_; if (occurrencesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -420,35 +419,35 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesResponse 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 @@ -527,7 +526,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureOccurrencesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(occurrences_); bitField0_ |= 0x00000001; } @@ -865,10 +864,7 @@ public java.util.List getOccurrencesBuild io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, io.grafeas.v1beta1.OccurrenceOrBuilder>( - occurrences_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + occurrences_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); occurrences_ = null; } return occurrencesBuilder_; @@ -876,7 +872,7 @@ public java.util.List getOccurrencesBuild @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java index 109696a40112..f7f334ecaffe 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java @@ -81,7 +81,7 @@ private CreateNoteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -295,15 +295,14 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.CreateNoteRequest other = (io.grafeas.v1beta1.CreateNoteRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getNoteId().equals(other.getNoteId()); - result = result && (hasNote() == other.hasNote()); + if (!getParent().equals(other.getParent())) return false; + if (!getNoteId().equals(other.getNoteId())) return false; + if (hasNote() != other.hasNote()) return false; if (hasNote()) { - result = result && getNote().equals(other.getNote()); + if (!getNote().equals(other.getNote())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -514,35 +513,35 @@ public io.grafeas.v1beta1.CreateNoteRequest 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 @@ -790,7 +789,7 @@ public Builder setNoteIdBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.Note note_ = null; + private io.grafeas.v1beta1.Note note_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Note, io.grafeas.v1beta1.Note.Builder, @@ -965,7 +964,7 @@ public io.grafeas.v1beta1.NoteOrBuilder getNoteOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java index 4582f70969cd..1a1e6c6e0742 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java @@ -74,7 +74,7 @@ private CreateOccurrenceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -241,14 +241,13 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.CreateOccurrenceRequest other = (io.grafeas.v1beta1.CreateOccurrenceRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasOccurrence() == other.hasOccurrence()); + if (!getParent().equals(other.getParent())) return false; + if (hasOccurrence() != other.hasOccurrence()) return false; if (hasOccurrence()) { - result = result && getOccurrence().equals(other.getOccurrence()); + if (!getOccurrence().equals(other.getOccurrence())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -456,35 +455,35 @@ public io.grafeas.v1beta1.CreateOccurrenceRequest 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 +633,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.Occurrence occurrence_ = null; + private io.grafeas.v1beta1.Occurrence occurrence_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, @@ -815,7 +814,7 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrenceOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java index bea691ad7e57..96ed2588a3ea 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java @@ -59,7 +59,7 @@ private DeleteNoteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.DeleteNoteRequest other = (io.grafeas.v1beta1.DeleteNoteRequest) obj; - boolean result = true; - 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 @@ -373,35 +372,35 @@ public io.grafeas.v1beta1.DeleteNoteRequest 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 @@ -550,7 +549,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java index fe74a6d615ff..8cacedb40ed6 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java @@ -59,7 +59,7 @@ private DeleteOccurrenceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.DeleteOccurrenceRequest other = (io.grafeas.v1beta1.DeleteOccurrenceRequest) obj; - boolean result = true; - 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 @@ -377,35 +376,35 @@ public io.grafeas.v1beta1.DeleteOccurrenceRequest 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 @@ -554,7 +553,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java index c3e04a8ec5b4..11a205b43e2b 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java @@ -59,7 +59,7 @@ private GetNoteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.GetNoteRequest other = (io.grafeas.v1beta1.GetNoteRequest) obj; - boolean result = true; - 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 @@ -371,35 +370,35 @@ public io.grafeas.v1beta1.GetNoteRequest 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 @@ -548,7 +547,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java index c99d8e0bbd1d..23d0ce2afc03 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java @@ -59,7 +59,7 @@ private GetOccurrenceNoteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.GetOccurrenceNoteRequest other = (io.grafeas.v1beta1.GetOccurrenceNoteRequest) obj; - boolean result = true; - 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 @@ -377,35 +376,35 @@ public io.grafeas.v1beta1.GetOccurrenceNoteRequest 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 @@ -554,7 +553,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java index 9253912006ac..2cdd2e65af1f 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java @@ -59,7 +59,7 @@ private GetOccurrenceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.GetOccurrenceRequest other = (io.grafeas.v1beta1.GetOccurrenceRequest) obj; - boolean result = true; - 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 @@ -376,35 +375,35 @@ public io.grafeas.v1beta1.GetOccurrenceRequest 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 @@ -553,7 +552,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java index 0fbfb7efc071..e42d51e218d7 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java @@ -69,7 +69,7 @@ private GetVulnerabilityOccurrencesSummaryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -240,11 +240,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest other = (io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest 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 @@ -722,7 +721,7 @@ public Builder setFilterBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java index 70866b713fa8..bda62926e7b7 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java @@ -25,7 +25,6 @@ private ListNoteOccurrencesRequest(com.google.protobuf.GeneratedMessageV3.Builde private ListNoteOccurrencesRequest() { name_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListNoteOccurrencesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -322,13 +321,12 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.ListNoteOccurrencesRequest other = (io.grafeas.v1beta1.ListNoteOccurrencesRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -536,35 +534,35 @@ public io.grafeas.v1beta1.ListNoteOccurrencesRequest 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 @@ -956,7 +954,7 @@ public Builder setPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java index 6b3c37bd4f7f..22ce63b29adf 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java @@ -53,7 +53,7 @@ private ListNoteOccurrencesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListNoteOccurrencesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListNoteOccurrencesResponse( } 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)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); } this.unknownFields = unknownFields.build(); @@ -264,11 +264,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.ListNoteOccurrencesResponse other = (io.grafeas.v1beta1.ListNoteOccurrencesResponse) obj; - boolean result = true; - result = result && getOccurrencesList().equals(other.getOccurrencesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOccurrencesList().equals(other.getOccurrencesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -469,7 +468,7 @@ public io.grafeas.v1beta1.ListNoteOccurrencesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (occurrencesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -485,35 +484,35 @@ public io.grafeas.v1beta1.ListNoteOccurrencesResponse 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 @@ -594,7 +593,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureOccurrencesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(occurrences_); bitField0_ |= 0x00000001; } @@ -932,10 +931,7 @@ public java.util.List getOccurrencesBuild io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, io.grafeas.v1beta1.OccurrenceOrBuilder>( - occurrences_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + occurrences_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); occurrences_ = null; } return occurrencesBuilder_; @@ -1037,7 +1033,7 @@ public Builder setNextPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java index 48d2a1ab33e4..47aaa5180bcd 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java @@ -25,7 +25,6 @@ private ListNotesRequest(com.google.protobuf.GeneratedMessageV3.Builder build private ListNotesRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListNotesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -320,13 +319,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.ListNotesRequest other = (io.grafeas.v1beta1.ListNotesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -530,35 +528,35 @@ public io.grafeas.v1beta1.ListNotesRequest 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 @@ -950,7 +948,7 @@ public Builder setPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java index 52066904157c..17dc2542edc8 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java @@ -53,7 +53,7 @@ private ListNotesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { notes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -69,7 +69,7 @@ private ListNotesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +81,7 @@ private ListNotesResponse( } 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)) { notes_ = java.util.Collections.unmodifiableList(notes_); } this.unknownFields = unknownFields.build(); @@ -264,11 +264,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.ListNotesResponse other = (io.grafeas.v1beta1.ListNotesResponse) obj; - boolean result = true; - result = result && getNotesList().equals(other.getNotesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getNotesList().equals(other.getNotesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -467,7 +466,7 @@ public io.grafeas.v1beta1.ListNotesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (notesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { notes_ = java.util.Collections.unmodifiableList(notes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -483,35 +482,35 @@ public io.grafeas.v1beta1.ListNotesResponse 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 @@ -591,7 +590,7 @@ public Builder mergeFrom( private java.util.List notes_ = java.util.Collections.emptyList(); private void ensureNotesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { notes_ = new java.util.ArrayList(notes_); bitField0_ |= 0x00000001; } @@ -923,10 +922,7 @@ public java.util.List getNotesBuilderList() { io.grafeas.v1beta1.Note, io.grafeas.v1beta1.Note.Builder, io.grafeas.v1beta1.NoteOrBuilder>( - notes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + notes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); notes_ = null; } return notesBuilder_; @@ -1038,7 +1034,7 @@ public Builder setNextPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java index 99c79a6f5efd..cd0a582d76ad 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java @@ -25,7 +25,6 @@ private ListOccurrencesRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListOccurrencesRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListOccurrencesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -322,13 +321,12 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.ListOccurrencesRequest other = (io.grafeas.v1beta1.ListOccurrencesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -536,35 +534,35 @@ public io.grafeas.v1beta1.ListOccurrencesRequest 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 @@ -956,7 +954,7 @@ public Builder setPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java index 3604d8c64a0e..dc7b034a024f 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java @@ -53,7 +53,7 @@ private ListOccurrencesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListOccurrencesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListOccurrencesResponse( } 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)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.ListOccurrencesResponse other = (io.grafeas.v1beta1.ListOccurrencesResponse) obj; - boolean result = true; - result = result && getOccurrencesList().equals(other.getOccurrencesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOccurrencesList().equals(other.getOccurrencesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -473,7 +472,7 @@ public io.grafeas.v1beta1.ListOccurrencesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (occurrencesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { occurrences_ = java.util.Collections.unmodifiableList(occurrences_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -489,35 +488,35 @@ public io.grafeas.v1beta1.ListOccurrencesResponse 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 @@ -598,7 +597,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureOccurrencesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { occurrences_ = new java.util.ArrayList(occurrences_); bitField0_ |= 0x00000001; } @@ -936,10 +935,7 @@ public java.util.List getOccurrencesBuild io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, io.grafeas.v1beta1.OccurrenceOrBuilder>( - occurrences_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + occurrences_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); occurrences_ = null; } return occurrencesBuilder_; @@ -1051,7 +1047,7 @@ public Builder setNextPageTokenBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java index c8f91b994279..29084fc4c2ab 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java @@ -85,7 +85,7 @@ private Note( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { relatedUrl_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -142,7 +142,7 @@ private Note( case 74: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { relatedNoteNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000100; } @@ -257,7 +257,7 @@ private Note( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -269,10 +269,10 @@ private Note( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { relatedUrl_ = java.util.Collections.unmodifiableList(relatedUrl_); } - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (((mutable_bitField0_ & 0x00000100) != 0)) { relatedNoteNames_ = relatedNoteNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -1211,54 +1211,52 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.Note other = (io.grafeas.v1beta1.Note) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getShortDescription().equals(other.getShortDescription()); - result = result && getLongDescription().equals(other.getLongDescription()); - result = result && kind_ == other.kind_; - result = result && getRelatedUrlList().equals(other.getRelatedUrlList()); - result = result && (hasExpirationTime() == other.hasExpirationTime()); + if (!getName().equals(other.getName())) return false; + if (!getShortDescription().equals(other.getShortDescription())) return false; + if (!getLongDescription().equals(other.getLongDescription())) return false; + if (kind_ != other.kind_) return false; + if (!getRelatedUrlList().equals(other.getRelatedUrlList())) return false; + if (hasExpirationTime() != other.hasExpirationTime()) return false; if (hasExpirationTime()) { - result = result && getExpirationTime().equals(other.getExpirationTime()); + if (!getExpirationTime().equals(other.getExpirationTime())) return false; } - result = result && (hasCreateTime() == other.hasCreateTime()); + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && getRelatedNoteNamesList().equals(other.getRelatedNoteNamesList()); - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getRelatedNoteNamesList().equals(other.getRelatedNoteNamesList())) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 10: - result = result && getVulnerability().equals(other.getVulnerability()); + if (!getVulnerability().equals(other.getVulnerability())) return false; break; case 11: - result = result && getBuild().equals(other.getBuild()); + if (!getBuild().equals(other.getBuild())) return false; break; case 12: - result = result && getBaseImage().equals(other.getBaseImage()); + if (!getBaseImage().equals(other.getBaseImage())) return false; break; case 13: - result = result && getPackage().equals(other.getPackage()); + if (!getPackage().equals(other.getPackage())) return false; break; case 14: - result = result && getDeployable().equals(other.getDeployable()); + if (!getDeployable().equals(other.getDeployable())) return false; break; case 15: - result = result && getDiscovery().equals(other.getDiscovery()); + if (!getDiscovery().equals(other.getDiscovery())) return false; break; case 16: - result = result && getAttestationAuthority().equals(other.getAttestationAuthority()); + if (!getAttestationAuthority().equals(other.getAttestationAuthority())) 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 @@ -1539,7 +1537,7 @@ public io.grafeas.v1beta1.Note buildPartial() { result.longDescription_ = longDescription_; result.kind_ = kind_; if (relatedUrlBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { relatedUrl_ = java.util.Collections.unmodifiableList(relatedUrl_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1562,7 +1560,7 @@ public io.grafeas.v1beta1.Note buildPartial() { } else { result.updateTime_ = updateTimeBuilder_.build(); } - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { relatedNoteNames_ = relatedNoteNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000100); } @@ -1624,35 +1622,35 @@ public io.grafeas.v1beta1.Note 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 @@ -2185,7 +2183,7 @@ public Builder clearKind() { java.util.Collections.emptyList(); private void ensureRelatedUrlIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { relatedUrl_ = new java.util.ArrayList(relatedUrl_); bitField0_ |= 0x00000010; } @@ -2523,16 +2521,13 @@ public java.util.List getRelatedUr io.grafeas.v1beta1.common.RelatedUrl, io.grafeas.v1beta1.common.RelatedUrl.Builder, io.grafeas.v1beta1.common.RelatedUrlOrBuilder>( - relatedUrl_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + relatedUrl_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); relatedUrl_ = null; } return relatedUrlBuilder_; } - private com.google.protobuf.Timestamp expirationTime_ = null; + private com.google.protobuf.Timestamp expirationTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2713,7 +2708,7 @@ public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() { return expirationTimeBuilder_; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2901,7 +2896,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3093,7 +3088,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureRelatedNoteNamesIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { relatedNoteNames_ = new com.google.protobuf.LazyStringArrayList(relatedNoteNames_); bitField0_ |= 0x00000100; } @@ -4629,7 +4624,7 @@ public io.grafeas.v1beta1.attestation.AuthorityOrBuilder getAttestationAuthority @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java index ca0aeeab5e95..69216d5685a7 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java @@ -237,7 +237,7 @@ private Occurrence( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1051,52 +1051,50 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.Occurrence other = (io.grafeas.v1beta1.Occurrence) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasResource() == other.hasResource()); + if (!getName().equals(other.getName())) return false; + if (hasResource() != other.hasResource()) return false; if (hasResource()) { - result = result && getResource().equals(other.getResource()); + if (!getResource().equals(other.getResource())) return false; } - result = result && getNoteName().equals(other.getNoteName()); - result = result && kind_ == other.kind_; - result = result && getRemediation().equals(other.getRemediation()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getNoteName().equals(other.getNoteName())) return false; + if (kind_ != other.kind_) return false; + if (!getRemediation().equals(other.getRemediation())) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && getDetailsCase().equals(other.getDetailsCase()); - if (!result) return false; + if (!getDetailsCase().equals(other.getDetailsCase())) return false; switch (detailsCase_) { case 8: - result = result && getVulnerability().equals(other.getVulnerability()); + if (!getVulnerability().equals(other.getVulnerability())) return false; break; case 9: - result = result && getBuild().equals(other.getBuild()); + if (!getBuild().equals(other.getBuild())) return false; break; case 10: - result = result && getDerivedImage().equals(other.getDerivedImage()); + if (!getDerivedImage().equals(other.getDerivedImage())) return false; break; case 11: - result = result && getInstallation().equals(other.getInstallation()); + if (!getInstallation().equals(other.getInstallation())) return false; break; case 12: - result = result && getDeployment().equals(other.getDeployment()); + if (!getDeployment().equals(other.getDeployment())) return false; break; case 13: - result = result && getDiscovered().equals(other.getDiscovered()); + if (!getDiscovered().equals(other.getDiscovered())) return false; break; case 14: - result = result && getAttestation().equals(other.getAttestation()); + if (!getAttestation().equals(other.getAttestation())) 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 @@ -1428,35 +1426,35 @@ public io.grafeas.v1beta1.Occurrence 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 @@ -1678,7 +1676,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.Resource resource_ = null; + private io.grafeas.v1beta1.Resource resource_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Resource, io.grafeas.v1beta1.Resource.Builder, @@ -2131,7 +2129,7 @@ public Builder setRemediationBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2310,7 +2308,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3898,7 +3896,7 @@ public io.grafeas.v1beta1.attestation.DetailsOrBuilder getAttestationOrBuilder() @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java index bbee771c3cad..4a8906f7a4f4 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java @@ -82,7 +82,7 @@ private Resource( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,15 +298,14 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.Resource other = (io.grafeas.v1beta1.Resource) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getUri().equals(other.getUri()); - result = result && (hasContentHash() == other.hasContentHash()); + if (!getName().equals(other.getName())) return false; + if (!getUri().equals(other.getUri())) return false; + if (hasContentHash() != other.hasContentHash()) return false; if (hasContentHash()) { - result = result && getContentHash().equals(other.getContentHash()); + if (!getContentHash().equals(other.getContentHash())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -513,35 +512,35 @@ public io.grafeas.v1beta1.Resource 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 @@ -794,7 +793,7 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.provenance.Hash contentHash_ = null; + private io.grafeas.v1beta1.provenance.Hash contentHash_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.provenance.Hash, io.grafeas.v1beta1.provenance.Hash.Builder, @@ -977,7 +976,7 @@ public io.grafeas.v1beta1.provenance.HashOrBuilder getContentHashOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java index e57ee6dbc40f..d693f718fa50 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java @@ -88,7 +88,7 @@ private UpdateNoteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,18 +298,17 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.UpdateNoteRequest other = (io.grafeas.v1beta1.UpdateNoteRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasNote() == other.hasNote()); + if (!getName().equals(other.getName())) return false; + if (hasNote() != other.hasNote()) return false; if (hasNote()) { - result = result && getNote().equals(other.getNote()); + if (!getNote().equals(other.getNote())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -530,35 +529,35 @@ public io.grafeas.v1beta1.UpdateNoteRequest 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 @@ -711,7 +710,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.Note note_ = null; + private io.grafeas.v1beta1.Note note_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Note, io.grafeas.v1beta1.Note.Builder, @@ -884,7 +883,7 @@ public io.grafeas.v1beta1.NoteOrBuilder getNoteOrBuilder() { return noteBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1065,7 +1064,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java index df1bc38d2d93..833710d9eb9c 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java @@ -89,7 +89,7 @@ private UpdateOccurrenceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -301,18 +301,17 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.UpdateOccurrenceRequest other = (io.grafeas.v1beta1.UpdateOccurrenceRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasOccurrence() == other.hasOccurrence()); + if (!getName().equals(other.getName())) return false; + if (hasOccurrence() != other.hasOccurrence()) return false; if (hasOccurrence()) { - result = result && getOccurrence().equals(other.getOccurrence()); + if (!getOccurrence().equals(other.getOccurrence())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -535,35 +534,35 @@ public io.grafeas.v1beta1.UpdateOccurrenceRequest 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 @@ -716,7 +715,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.Occurrence occurrence_ = null; + private io.grafeas.v1beta1.Occurrence occurrence_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Occurrence, io.grafeas.v1beta1.Occurrence.Builder, @@ -895,7 +894,7 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrenceOrBuilder() { return occurrenceBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1076,7 +1075,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java index a8d15cae4667..a5bd73918838 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java @@ -54,7 +54,7 @@ private VulnerabilityOccurrencesSummary( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { counts_ = new java.util.ArrayList< io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest>(); @@ -69,7 +69,7 @@ private VulnerabilityOccurrencesSummary( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +81,7 @@ private VulnerabilityOccurrencesSummary( } 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)) { counts_ = java.util.Collections.unmodifiableList(counts_); } this.unknownFields = unknownFields.build(); @@ -206,8 +206,6 @@ private FixableTotalByDigest(com.google.protobuf.GeneratedMessageV3.Builder b private FixableTotalByDigest() { severity_ = 0; - fixableCount_ = 0L; - totalCount_ = 0L; } @java.lang.Override @@ -268,7 +266,7 @@ private FixableTotalByDigest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -466,16 +464,15 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest other = (io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest) obj; - boolean result = true; - result = result && (hasResource() == other.hasResource()); + if (hasResource() != other.hasResource()) return false; if (hasResource()) { - result = result && getResource().equals(other.getResource()); + if (!getResource().equals(other.getResource())) return false; } - result = result && severity_ == other.severity_; - result = result && (getFixableCount() == other.getFixableCount()); - result = result && (getTotalCount() == other.getTotalCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (severity_ != other.severity_) return false; + if (getFixableCount() != other.getFixableCount()) return false; + if (getTotalCount() != other.getTotalCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -703,23 +700,23 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest b @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 @@ -727,13 +724,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 @@ -797,7 +794,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.Resource resource_ = null; + private io.grafeas.v1beta1.Resource resource_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.Resource, io.grafeas.v1beta1.Resource.Builder, @@ -1144,7 +1141,7 @@ public Builder clearTotalCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1322,10 +1319,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.VulnerabilityOccurrencesSummary other = (io.grafeas.v1beta1.VulnerabilityOccurrencesSummary) obj; - boolean result = true; - result = result && getCountsList().equals(other.getCountsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCountsList().equals(other.getCountsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1522,7 +1518,7 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary buildPartial() { new io.grafeas.v1beta1.VulnerabilityOccurrencesSummary(this); int from_bitField0_ = bitField0_; if (countsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { counts_ = java.util.Collections.unmodifiableList(counts_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1536,35 +1532,35 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary 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 @@ -1643,7 +1639,7 @@ public Builder mergeFrom( counts_ = java.util.Collections.emptyList(); private void ensureCountsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { counts_ = new java.util.ArrayList< io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest>(counts_); @@ -2045,10 +2041,7 @@ public Builder removeCounts(int index) { io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest, io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest.Builder, io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigestOrBuilder>( - counts_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + counts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); counts_ = null; } return countsBuilder_; @@ -2056,7 +2049,7 @@ public Builder removeCounts(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java index c80cae86c3d6..574901d1bf1e 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java @@ -76,7 +76,7 @@ private Attestation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -237,18 +237,16 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.attestation.Attestation other = (io.grafeas.v1beta1.attestation.Attestation) obj; - boolean result = true; - result = result && getSignatureCase().equals(other.getSignatureCase()); - if (!result) return false; + if (!getSignatureCase().equals(other.getSignatureCase())) return false; switch (signatureCase_) { case 1: - result = result && getPgpSignedAttestation().equals(other.getPgpSignedAttestation()); + if (!getPgpSignedAttestation().equals(other.getPgpSignedAttestation())) 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 @@ -461,35 +459,35 @@ public io.grafeas.v1beta1.attestation.Attestation 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 @@ -767,7 +765,7 @@ public Builder clearPgpSignedAttestation() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java index 4b210b68a07b..04dc39960c05 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java @@ -73,7 +73,7 @@ private Authority( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -193,7 +193,7 @@ private Hint( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -313,10 +313,9 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.attestation.Authority.Hint other = (io.grafeas.v1beta1.attestation.Authority.Hint) obj; - boolean result = true; - result = result && getHumanReadableName().equals(other.getHumanReadableName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getHumanReadableName().equals(other.getHumanReadableName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -517,23 +516,23 @@ public io.grafeas.v1beta1.attestation.Authority.Hint 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 @@ -541,13 +540,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 @@ -693,7 +692,7 @@ public Builder setHumanReadableNameBytes(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 @@ -827,13 +826,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.attestation.Authority other = (io.grafeas.v1beta1.attestation.Authority) obj; - boolean result = true; - result = result && (hasHint() == other.hasHint()); + if (hasHint() != other.hasHint()) return false; if (hasHint()) { - result = result && getHint().equals(other.getHint()); + if (!getHint().equals(other.getHint())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1043,35 +1041,35 @@ public io.grafeas.v1beta1.attestation.Authority 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 @@ -1118,7 +1116,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.attestation.Authority.Hint hint_ = null; + private io.grafeas.v1beta1.attestation.Authority.Hint hint_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.attestation.Authority.Hint, io.grafeas.v1beta1.attestation.Authority.Hint.Builder, @@ -1301,7 +1299,7 @@ public io.grafeas.v1beta1.attestation.Authority.HintOrBuilder getHintOrBuilder() @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java index 2aee5d58618f..b9e121cafb50 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java @@ -66,7 +66,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,13 +183,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.attestation.Details other = (io.grafeas.v1beta1.attestation.Details) obj; - boolean result = true; - result = result && (hasAttestation() == other.hasAttestation()); + if (hasAttestation() != other.hasAttestation()) return false; if (hasAttestation()) { - result = result && getAttestation().equals(other.getAttestation()); + if (!getAttestation().equals(other.getAttestation())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -392,35 +391,35 @@ public io.grafeas.v1beta1.attestation.Details 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 @@ -467,7 +466,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.attestation.Attestation attestation_ = null; + private io.grafeas.v1beta1.attestation.Attestation attestation_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.attestation.Attestation, io.grafeas.v1beta1.attestation.Attestation.Builder, @@ -651,7 +650,7 @@ public io.grafeas.v1beta1.attestation.AttestationOrBuilder getAttestationOrBuild @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java index f81b002ce8d8..aff40b1fa5b1 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java @@ -76,7 +76,7 @@ private PgpSignedAttestation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -516,20 +516,18 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.attestation.PgpSignedAttestation other = (io.grafeas.v1beta1.attestation.PgpSignedAttestation) obj; - boolean result = true; - result = result && getSignature().equals(other.getSignature()); - result = result && contentType_ == other.contentType_; - result = result && getKeyIdCase().equals(other.getKeyIdCase()); - if (!result) return false; + if (!getSignature().equals(other.getSignature())) return false; + if (contentType_ != other.contentType_) return false; + if (!getKeyIdCase().equals(other.getKeyIdCase())) return false; switch (keyIdCase_) { case 2: - result = result && getPgpKeyId().equals(other.getPgpKeyId()); + if (!getPgpKeyId().equals(other.getPgpKeyId())) 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 @@ -743,35 +741,35 @@ public io.grafeas.v1beta1.attestation.PgpSignedAttestation 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 @@ -1261,7 +1259,7 @@ public Builder setPgpKeyIdBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java index a1efb73e5bc2..b57f4d99c341 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java @@ -76,7 +76,7 @@ private Build( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,14 +244,13 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.build.Build other = (io.grafeas.v1beta1.build.Build) obj; - boolean result = true; - result = result && getBuilderVersion().equals(other.getBuilderVersion()); - result = result && (hasSignature() == other.hasSignature()); + if (!getBuilderVersion().equals(other.getBuilderVersion())) return false; + if (hasSignature() != other.hasSignature()) return false; if (hasSignature()) { - result = result && getSignature().equals(other.getSignature()); + if (!getSignature().equals(other.getSignature())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -457,35 +456,35 @@ public io.grafeas.v1beta1.build.Build 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 @@ -630,7 +629,7 @@ public Builder setBuilderVersionBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.build.BuildSignature signature_ = null; + private io.grafeas.v1beta1.build.BuildSignature signature_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.build.BuildSignature, io.grafeas.v1beta1.build.BuildSignature.Builder, @@ -822,7 +821,7 @@ public io.grafeas.v1beta1.build.BuildSignatureOrBuilder getSignatureOrBuilder() @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java index 58251080214f..6a7c9581d696 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java @@ -81,7 +81,7 @@ private BuildSignature( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -482,13 +482,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.build.BuildSignature other = (io.grafeas.v1beta1.build.BuildSignature) obj; - boolean result = true; - result = result && getPublicKey().equals(other.getPublicKey()); - result = result && getSignature().equals(other.getSignature()); - result = result && getKeyId().equals(other.getKeyId()); - result = result && keyType_ == other.keyType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPublicKey().equals(other.getPublicKey())) return false; + if (!getSignature().equals(other.getSignature())) return false; + if (!getKeyId().equals(other.getKeyId())) return false; + if (keyType_ != other.keyType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -696,35 +695,35 @@ public io.grafeas.v1beta1.build.BuildSignature 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 @@ -1168,7 +1167,7 @@ public Builder clearKeyType() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java index d72c1912087f..65ef709e7642 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java @@ -75,7 +75,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -258,14 +258,13 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.build.Details other = (io.grafeas.v1beta1.build.Details) obj; - boolean result = true; - result = result && (hasProvenance() == other.hasProvenance()); + if (hasProvenance() != other.hasProvenance()) return false; if (hasProvenance()) { - result = result && getProvenance().equals(other.getProvenance()); + if (!getProvenance().equals(other.getProvenance())) return false; } - result = result && getProvenanceBytes().equals(other.getProvenanceBytes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProvenanceBytes().equals(other.getProvenanceBytes())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -471,35 +470,35 @@ public io.grafeas.v1beta1.build.Details 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 @@ -550,7 +549,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.provenance.BuildProvenance provenance_ = null; + private io.grafeas.v1beta1.provenance.BuildProvenance provenance_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.provenance.BuildProvenance, io.grafeas.v1beta1.provenance.BuildProvenance.Builder, @@ -873,7 +872,7 @@ public Builder setProvenanceBytesBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java index 08d71ee7e416..5e1f4b966d5c 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java @@ -67,7 +67,7 @@ private RelatedUrl( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -234,11 +234,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.common.RelatedUrl other = (io.grafeas.v1beta1.common.RelatedUrl) obj; - boolean result = true; - result = result && getUrl().equals(other.getUrl()); - result = result && getLabel().equals(other.getLabel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUrl().equals(other.getUrl())) return false; + if (!getLabel().equals(other.getLabel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -432,35 +431,35 @@ public io.grafeas.v1beta1.common.RelatedUrl 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 @@ -702,7 +701,7 @@ public Builder setLabelBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java index 4525f796e09c..58543ce8905d 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java @@ -53,7 +53,7 @@ private Deployable( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { resourceUri_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private Deployable( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private Deployable( } 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)) { resourceUri_ = resourceUri_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -197,10 +197,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.deployment.Deployable other = (io.grafeas.v1beta1.deployment.Deployable) obj; - boolean result = true; - result = result && getResourceUriList().equals(other.getResourceUriList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResourceUriList().equals(other.getResourceUriList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,7 +388,7 @@ public io.grafeas.v1beta1.deployment.Deployable buildPartial() { io.grafeas.v1beta1.deployment.Deployable result = new io.grafeas.v1beta1.deployment.Deployable(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { resourceUri_ = resourceUri_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -400,35 +399,35 @@ public io.grafeas.v1beta1.deployment.Deployable 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 @@ -488,7 +487,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureResourceUriIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { resourceUri_ = new com.google.protobuf.LazyStringArrayList(resourceUri_); bitField0_ |= 0x00000001; } @@ -629,7 +628,7 @@ public Builder addResourceUriBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java index 7573783a7062..f164a4212e52 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java @@ -108,7 +108,7 @@ private Deployment( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { resourceUri_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -124,7 +124,7 @@ private Deployment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private Deployment( } 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)) { resourceUri_ = resourceUri_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -708,22 +708,21 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.deployment.Deployment other = (io.grafeas.v1beta1.deployment.Deployment) obj; - boolean result = true; - result = result && getUserEmail().equals(other.getUserEmail()); - result = result && (hasDeployTime() == other.hasDeployTime()); + if (!getUserEmail().equals(other.getUserEmail())) return false; + if (hasDeployTime() != other.hasDeployTime()) return false; if (hasDeployTime()) { - result = result && getDeployTime().equals(other.getDeployTime()); + if (!getDeployTime().equals(other.getDeployTime())) return false; } - result = result && (hasUndeployTime() == other.hasUndeployTime()); + if (hasUndeployTime() != other.hasUndeployTime()) return false; if (hasUndeployTime()) { - result = result && getUndeployTime().equals(other.getUndeployTime()); - } - result = result && getConfig().equals(other.getConfig()); - result = result && getAddress().equals(other.getAddress()); - result = result && getResourceUriList().equals(other.getResourceUriList()); - result = result && platform_ == other.platform_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUndeployTime().equals(other.getUndeployTime())) return false; + } + if (!getConfig().equals(other.getConfig())) return false; + if (!getAddress().equals(other.getAddress())) return false; + if (!getResourceUriList().equals(other.getResourceUriList())) return false; + if (platform_ != other.platform_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -962,7 +961,7 @@ public io.grafeas.v1beta1.deployment.Deployment buildPartial() { } result.config_ = config_; result.address_ = address_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { resourceUri_ = resourceUri_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -975,35 +974,35 @@ public io.grafeas.v1beta1.deployment.Deployment 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 @@ -1174,7 +1173,7 @@ public Builder setUserEmailBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp deployTime_ = null; + private com.google.protobuf.Timestamp deployTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1353,7 +1352,7 @@ public com.google.protobuf.TimestampOrBuilder getDeployTimeOrBuilder() { return deployTimeBuilder_; } - private com.google.protobuf.Timestamp undeployTime_ = null; + private com.google.protobuf.Timestamp undeployTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1726,7 +1725,7 @@ public Builder setAddressBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureResourceUriIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { resourceUri_ = new com.google.protobuf.LazyStringArrayList(resourceUri_); bitField0_ |= 0x00000020; } @@ -1954,7 +1953,7 @@ public Builder clearPlatform() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java index 284b5a9aa73a..3c293ecfef3a 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java @@ -66,7 +66,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,13 +183,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.deployment.Details other = (io.grafeas.v1beta1.deployment.Details) obj; - boolean result = true; - result = result && (hasDeployment() == other.hasDeployment()); + if (hasDeployment() != other.hasDeployment()) return false; if (hasDeployment()) { - result = result && getDeployment().equals(other.getDeployment()); + if (!getDeployment().equals(other.getDeployment())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -391,35 +390,35 @@ public io.grafeas.v1beta1.deployment.Details 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 +465,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.deployment.Deployment deployment_ = null; + private io.grafeas.v1beta1.deployment.Deployment deployment_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.deployment.Deployment, io.grafeas.v1beta1.deployment.Deployment.Builder, @@ -649,7 +648,7 @@ public io.grafeas.v1beta1.deployment.DeploymentOrBuilder getDeploymentOrBuilder( @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java index ec78a7f3a77e..4eaf0da89ec2 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java @@ -66,7 +66,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,13 +183,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.discovery.Details other = (io.grafeas.v1beta1.discovery.Details) obj; - boolean result = true; - result = result && (hasDiscovered() == other.hasDiscovered()); + if (hasDiscovered() != other.hasDiscovered()) return false; if (hasDiscovered()) { - result = result && getDiscovered().equals(other.getDiscovered()); + if (!getDiscovered().equals(other.getDiscovered())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +389,35 @@ public io.grafeas.v1beta1.discovery.Details 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 @@ -465,7 +464,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.discovery.Discovered discovered_ = null; + private io.grafeas.v1beta1.discovery.Discovered discovered_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.discovery.Discovered, io.grafeas.v1beta1.discovery.Discovered.Builder, @@ -648,7 +647,7 @@ public io.grafeas.v1beta1.discovery.DiscoveredOrBuilder getDiscoveredOrBuilder() @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java index 6911087a575b..a6a09b205421 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java @@ -97,7 +97,7 @@ private Discovered( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -715,19 +715,18 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.discovery.Discovered other = (io.grafeas.v1beta1.discovery.Discovered) obj; - boolean result = true; - result = result && continuousAnalysis_ == other.continuousAnalysis_; - result = result && (hasLastAnalysisTime() == other.hasLastAnalysisTime()); + if (continuousAnalysis_ != other.continuousAnalysis_) return false; + if (hasLastAnalysisTime() != other.hasLastAnalysisTime()) return false; if (hasLastAnalysisTime()) { - result = result && getLastAnalysisTime().equals(other.getLastAnalysisTime()); + if (!getLastAnalysisTime().equals(other.getLastAnalysisTime())) return false; } - result = result && analysisStatus_ == other.analysisStatus_; - result = result && (hasAnalysisStatusError() == other.hasAnalysisStatusError()); + if (analysisStatus_ != other.analysisStatus_) return false; + if (hasAnalysisStatusError() != other.hasAnalysisStatusError()) return false; if (hasAnalysisStatusError()) { - result = result && getAnalysisStatusError().equals(other.getAnalysisStatusError()); + if (!getAnalysisStatusError().equals(other.getAnalysisStatusError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -955,35 +954,35 @@ public io.grafeas.v1beta1.discovery.Discovered 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 @@ -1123,7 +1122,7 @@ public Builder clearContinuousAnalysis() { return this; } - private com.google.protobuf.Timestamp lastAnalysisTime_ = null; + private com.google.protobuf.Timestamp lastAnalysisTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1382,7 +1381,7 @@ public Builder clearAnalysisStatus() { return this; } - private com.google.rpc.Status analysisStatusError_ = null; + private com.google.rpc.Status analysisStatusError_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> analysisStatusErrorBuilder_; @@ -1579,7 +1578,7 @@ public com.google.rpc.StatusOrBuilder getAnalysisStatusErrorOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java index 8a900d2c7ab4..446bfe3498fd 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java @@ -61,7 +61,7 @@ private Discovery( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -167,10 +167,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.discovery.Discovery other = (io.grafeas.v1beta1.discovery.Discovery) obj; - boolean result = true; - result = result && analysisKind_ == other.analysisKind_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (analysisKind_ != other.analysisKind_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -365,35 +364,35 @@ public io.grafeas.v1beta1.discovery.Discovery 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 @@ -518,7 +517,7 @@ public Builder clearAnalysisKind() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java index d10fb7842408..08f90b2a1264 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java @@ -79,7 +79,7 @@ private Basis( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,14 +245,13 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.image.Basis other = (io.grafeas.v1beta1.image.Basis) obj; - boolean result = true; - result = result && getResourceUrl().equals(other.getResourceUrl()); - result = result && (hasFingerprint() == other.hasFingerprint()); + if (!getResourceUrl().equals(other.getResourceUrl())) return false; + if (hasFingerprint() != other.hasFingerprint()) return false; if (hasFingerprint()) { - result = result && getFingerprint().equals(other.getFingerprint()); + if (!getFingerprint().equals(other.getFingerprint())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -459,35 +458,35 @@ public io.grafeas.v1beta1.image.Basis 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 @@ -637,7 +636,7 @@ public Builder setResourceUrlBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.image.Fingerprint fingerprint_ = null; + private io.grafeas.v1beta1.image.Fingerprint fingerprint_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.image.Fingerprint, io.grafeas.v1beta1.image.Fingerprint.Builder, @@ -820,7 +819,7 @@ public io.grafeas.v1beta1.image.FingerprintOrBuilder getFingerprintOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java index 4556cd87dd66..1d1eb583d13f 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java @@ -25,7 +25,6 @@ private Derived(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private Derived() { - distance_ = 0; layerInfo_ = java.util.Collections.emptyList(); baseResourceUrl_ = ""; } @@ -77,7 +76,7 @@ private Derived( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { layerInfo_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -94,7 +93,7 @@ private Derived( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +105,7 @@ private Derived( } 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)) { layerInfo_ = java.util.Collections.unmodifiableList(layerInfo_); } this.unknownFields = unknownFields.build(); @@ -366,16 +365,15 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.image.Derived other = (io.grafeas.v1beta1.image.Derived) obj; - boolean result = true; - result = result && (hasFingerprint() == other.hasFingerprint()); + if (hasFingerprint() != other.hasFingerprint()) return false; if (hasFingerprint()) { - result = result && getFingerprint().equals(other.getFingerprint()); + if (!getFingerprint().equals(other.getFingerprint())) return false; } - result = result && (getDistance() == other.getDistance()); - result = result && getLayerInfoList().equals(other.getLayerInfoList()); - result = result && getBaseResourceUrl().equals(other.getBaseResourceUrl()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getDistance() != other.getDistance()) return false; + if (!getLayerInfoList().equals(other.getLayerInfoList())) return false; + if (!getBaseResourceUrl().equals(other.getBaseResourceUrl())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -596,7 +594,7 @@ public io.grafeas.v1beta1.image.Derived buildPartial() { } result.distance_ = distance_; if (layerInfoBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { layerInfo_ = java.util.Collections.unmodifiableList(layerInfo_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -612,35 +610,35 @@ public io.grafeas.v1beta1.image.Derived 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 @@ -723,7 +721,7 @@ public Builder mergeFrom( private int bitField0_; - private io.grafeas.v1beta1.image.Fingerprint fingerprint_ = null; + private io.grafeas.v1beta1.image.Fingerprint fingerprint_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.image.Fingerprint, io.grafeas.v1beta1.image.Fingerprint.Builder, @@ -955,7 +953,7 @@ public Builder clearDistance() { java.util.Collections.emptyList(); private void ensureLayerInfoIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { layerInfo_ = new java.util.ArrayList(layerInfo_); bitField0_ |= 0x00000004; } @@ -1327,10 +1325,7 @@ public java.util.List getLayerInfoBuilde io.grafeas.v1beta1.image.Layer, io.grafeas.v1beta1.image.Layer.Builder, io.grafeas.v1beta1.image.LayerOrBuilder>( - layerInfo_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + layerInfo_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); layerInfo_ = null; } return layerInfoBuilder_; @@ -1437,7 +1432,7 @@ public Builder setBaseResourceUrlBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java index ed79c1ea7c79..eeeb5ff69419 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java @@ -65,7 +65,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,13 +180,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.image.Details other = (io.grafeas.v1beta1.image.Details) obj; - boolean result = true; - result = result && (hasDerivedImage() == other.hasDerivedImage()); + if (hasDerivedImage() != other.hasDerivedImage()) return false; if (hasDerivedImage()) { - result = result && getDerivedImage().equals(other.getDerivedImage()); + if (!getDerivedImage().equals(other.getDerivedImage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -387,35 +386,35 @@ public io.grafeas.v1beta1.image.Details 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 @@ -462,7 +461,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.image.Derived derivedImage_ = null; + private io.grafeas.v1beta1.image.Derived derivedImage_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.image.Derived, io.grafeas.v1beta1.image.Derived.Builder, @@ -645,7 +644,7 @@ public io.grafeas.v1beta1.image.DerivedOrBuilder getDerivedImageOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java index 7b96fa045bdc..530c3e2b6b2c 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java @@ -62,7 +62,7 @@ private Fingerprint( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { v2Blob_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -78,7 +78,7 @@ private Fingerprint( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private Fingerprint( } 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)) { v2Blob_ = v2Blob_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -318,12 +318,11 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.image.Fingerprint other = (io.grafeas.v1beta1.image.Fingerprint) obj; - boolean result = true; - result = result && getV1Name().equals(other.getV1Name()); - result = result && getV2BlobList().equals(other.getV2BlobList()); - result = result && getV2Name().equals(other.getV2Name()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getV1Name().equals(other.getV1Name())) return false; + if (!getV2BlobList().equals(other.getV2BlobList())) return false; + if (!getV2Name().equals(other.getV2Name())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -520,7 +519,7 @@ public io.grafeas.v1beta1.image.Fingerprint buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.v1Name_ = v1Name_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { v2Blob_ = v2Blob_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -533,35 +532,35 @@ public io.grafeas.v1beta1.image.Fingerprint 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 @@ -723,7 +722,7 @@ public Builder setV1NameBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureV2BlobIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { v2Blob_ = new com.google.protobuf.LazyStringArrayList(v2Blob_); bitField0_ |= 0x00000002; } @@ -973,7 +972,7 @@ public Builder setV2NameBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java index 75430e91bff3..785a9b0829e2 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java @@ -67,7 +67,7 @@ private Layer( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -695,11 +695,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.image.Layer other = (io.grafeas.v1beta1.image.Layer) obj; - boolean result = true; - result = result && directive_ == other.directive_; - result = result && getArguments().equals(other.getArguments()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (directive_ != other.directive_) return false; + if (!getArguments().equals(other.getArguments())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -892,35 +891,35 @@ public io.grafeas.v1beta1.image.Layer 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 @@ -1143,7 +1142,7 @@ public Builder setArgumentsBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java index 69ab0bc5227a..0d02a5b21566 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java @@ -66,7 +66,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,13 +182,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Details other = (io.grafeas.v1beta1.pkg.Details) obj; - boolean result = true; - result = result && (hasInstallation() == other.hasInstallation()); + if (hasInstallation() != other.hasInstallation()) return false; if (hasInstallation()) { - result = result && getInstallation().equals(other.getInstallation()); + if (!getInstallation().equals(other.getInstallation())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -388,35 +387,35 @@ public io.grafeas.v1beta1.pkg.Details 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 @@ -463,7 +462,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.pkg.Installation installation_ = null; + private io.grafeas.v1beta1.pkg.Installation installation_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Installation, io.grafeas.v1beta1.pkg.Installation.Builder, @@ -646,7 +645,7 @@ public io.grafeas.v1beta1.pkg.InstallationOrBuilder getInstallationOrBuilder() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java index 547cc10c0f5e..15b5c35c9796 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java @@ -107,7 +107,7 @@ private Distribution( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -463,18 +463,17 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Distribution other = (io.grafeas.v1beta1.pkg.Distribution) obj; - boolean result = true; - result = result && getCpeUri().equals(other.getCpeUri()); - result = result && architecture_ == other.architecture_; - result = result && (hasLatestVersion() == other.hasLatestVersion()); + if (!getCpeUri().equals(other.getCpeUri())) return false; + if (architecture_ != other.architecture_) return false; + if (hasLatestVersion() != other.hasLatestVersion()) return false; if (hasLatestVersion()) { - result = result && getLatestVersion().equals(other.getLatestVersion()); + if (!getLatestVersion().equals(other.getLatestVersion())) return false; } - result = result && getMaintainer().equals(other.getMaintainer()); - result = result && getUrl().equals(other.getUrl()); - result = result && getDescription().equals(other.getDescription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMaintainer().equals(other.getMaintainer())) return false; + if (!getUrl().equals(other.getUrl())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -701,35 +700,35 @@ public io.grafeas.v1beta1.pkg.Distribution 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 @@ -975,7 +974,7 @@ public Builder clearArchitecture() { return this; } - private io.grafeas.v1beta1.pkg.Version latestVersion_ = null; + private io.grafeas.v1beta1.pkg.Version latestVersion_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Version, io.grafeas.v1beta1.pkg.Version.Builder, @@ -1449,7 +1448,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java index b6c6d4695a6c..95528469a39c 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java @@ -61,7 +61,7 @@ private Installation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { location_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private Installation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private Installation( } 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)) { location_ = java.util.Collections.unmodifiableList(location_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Installation other = (io.grafeas.v1beta1.pkg.Installation) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLocationList().equals(other.getLocationList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLocationList().equals(other.getLocationList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public io.grafeas.v1beta1.pkg.Installation buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (locationBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { location_ = java.util.Collections.unmodifiableList(location_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -489,35 +488,35 @@ public io.grafeas.v1beta1.pkg.Installation 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 @@ -692,7 +691,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureLocationIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { location_ = new java.util.ArrayList(location_); bitField0_ |= 0x00000002; } @@ -1046,10 +1045,7 @@ public java.util.List getLocationBuilde io.grafeas.v1beta1.pkg.Location, io.grafeas.v1beta1.pkg.Location.Builder, io.grafeas.v1beta1.pkg.LocationOrBuilder>( - location_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + location_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); location_ = null; } return locationBuilder_; @@ -1057,7 +1053,7 @@ public java.util.List getLocationBuilde @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java index ba4089a54d02..6286ebfbbfd2 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java @@ -83,7 +83,7 @@ private Location( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,15 +297,14 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Location other = (io.grafeas.v1beta1.pkg.Location) obj; - boolean result = true; - result = result && getCpeUri().equals(other.getCpeUri()); - result = result && (hasVersion() == other.hasVersion()); + if (!getCpeUri().equals(other.getCpeUri())) return false; + if (hasVersion() != other.hasVersion()) return false; if (hasVersion()) { - result = result && getVersion().equals(other.getVersion()); + if (!getVersion().equals(other.getVersion())) return false; } - result = result && getPath().equals(other.getPath()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPath().equals(other.getPath())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -516,35 +515,35 @@ public io.grafeas.v1beta1.pkg.Location 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 @@ -698,7 +697,7 @@ public Builder setCpeUriBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.pkg.Version version_ = null; + private io.grafeas.v1beta1.pkg.Version version_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Version, io.grafeas.v1beta1.pkg.Version.Builder, @@ -969,7 +968,7 @@ public Builder setPathBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java index ca8334432b66..bf4d0914261e 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java @@ -62,7 +62,7 @@ private Package( } case 82: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { distribution_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -73,7 +73,7 @@ private Package( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private Package( } 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)) { distribution_ = java.util.Collections.unmodifiableList(distribution_); } this.unknownFields = unknownFields.build(); @@ -265,11 +265,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Package other = (io.grafeas.v1beta1.pkg.Package) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDistributionList().equals(other.getDistributionList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDistributionList().equals(other.getDistributionList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,7 +469,7 @@ public io.grafeas.v1beta1.pkg.Package buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (distributionBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { distribution_ = java.util.Collections.unmodifiableList(distribution_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -485,35 +484,35 @@ public io.grafeas.v1beta1.pkg.Package 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 @@ -688,7 +687,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureDistributionIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { distribution_ = new java.util.ArrayList(distribution_); bitField0_ |= 0x00000002; } @@ -1027,10 +1026,7 @@ public io.grafeas.v1beta1.pkg.Distribution.Builder addDistributionBuilder(int in io.grafeas.v1beta1.pkg.Distribution, io.grafeas.v1beta1.pkg.Distribution.Builder, io.grafeas.v1beta1.pkg.DistributionOrBuilder>( - distribution_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + distribution_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); distribution_ = null; } return distributionBuilder_; @@ -1038,7 +1034,7 @@ public io.grafeas.v1beta1.pkg.Distribution.Builder addDistributionBuilder(int in @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java index f1a8e0fad306..263ee21c25a3 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java @@ -23,7 +23,6 @@ private Version(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private Version() { - epoch_ = 0; name_ = ""; revision_ = ""; kind_ = 0; @@ -81,7 +80,7 @@ private Version( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -478,13 +477,12 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.pkg.Version other = (io.grafeas.v1beta1.pkg.Version) obj; - boolean result = true; - result = result && (getEpoch() == other.getEpoch()); - result = result && getName().equals(other.getName()); - result = result && getRevision().equals(other.getRevision()); - result = result && kind_ == other.kind_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEpoch() != other.getEpoch()) return false; + if (!getName().equals(other.getName())) return false; + if (!getRevision().equals(other.getRevision())) return false; + if (kind_ != other.kind_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -689,35 +687,35 @@ public io.grafeas.v1beta1.pkg.Version 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 @@ -1090,7 +1088,7 @@ public Builder clearKind() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java index 16af9f75da59..1d40b2c53ade 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java @@ -69,7 +69,7 @@ private Artifact( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { names_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -78,7 +78,7 @@ private Artifact( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private Artifact( } 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)) { names_ = names_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -332,12 +332,11 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.provenance.Artifact other = (io.grafeas.v1beta1.provenance.Artifact) obj; - boolean result = true; - result = result && getChecksum().equals(other.getChecksum()); - result = result && getId().equals(other.getId()); - result = result && getNamesList().equals(other.getNamesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getChecksum().equals(other.getChecksum())) return false; + if (!getId().equals(other.getId())) return false; + if (!getNamesList().equals(other.getNamesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -537,7 +536,7 @@ public io.grafeas.v1beta1.provenance.Artifact buildPartial() { int to_bitField0_ = 0; result.checksum_ = checksum_; result.id_ = id_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { names_ = names_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -549,35 +548,35 @@ public io.grafeas.v1beta1.provenance.Artifact 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 @@ -843,7 +842,7 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureNamesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { names_ = new com.google.protobuf.LazyStringArrayList(names_); bitField0_ |= 0x00000004; } @@ -1020,7 +1019,7 @@ public Builder addNamesBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java index eb52771db321..18a1eaebcf0e 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java @@ -74,7 +74,7 @@ private BuildProvenance( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { commands_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -85,7 +85,7 @@ private BuildProvenance( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { builtArtifacts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -178,7 +178,7 @@ private BuildProvenance( } case 98: { - if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) { + if (!((mutable_bitField0_ & 0x00000800) != 0)) { buildOptions_ = com.google.protobuf.MapField.newMapField( BuildOptionsDefaultEntryHolder.defaultEntry); @@ -200,7 +200,7 @@ private BuildProvenance( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,10 +212,10 @@ private BuildProvenance( } 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)) { commands_ = java.util.Collections.unmodifiableList(commands_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { builtArtifacts_ = java.util.Collections.unmodifiableList(builtArtifacts_); } this.unknownFields = unknownFields.build(); @@ -1021,34 +1021,33 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.provenance.BuildProvenance other = (io.grafeas.v1beta1.provenance.BuildProvenance) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getProjectId().equals(other.getProjectId()); - result = result && getCommandsList().equals(other.getCommandsList()); - result = result && getBuiltArtifactsList().equals(other.getBuiltArtifactsList()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getId().equals(other.getId())) return false; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getCommandsList().equals(other.getCommandsList())) return false; + if (!getBuiltArtifactsList().equals(other.getBuiltArtifactsList())) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && getCreator().equals(other.getCreator()); - result = result && getLogsUri().equals(other.getLogsUri()); - result = result && (hasSourceProvenance() == other.hasSourceProvenance()); + if (!getCreator().equals(other.getCreator())) return false; + if (!getLogsUri().equals(other.getLogsUri())) return false; + if (hasSourceProvenance() != other.hasSourceProvenance()) return false; if (hasSourceProvenance()) { - result = result && getSourceProvenance().equals(other.getSourceProvenance()); + if (!getSourceProvenance().equals(other.getSourceProvenance())) return false; } - result = result && getTriggerId().equals(other.getTriggerId()); - result = result && internalGetBuildOptions().equals(other.internalGetBuildOptions()); - result = result && getBuilderVersion().equals(other.getBuilderVersion()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTriggerId().equals(other.getTriggerId())) return false; + if (!internalGetBuildOptions().equals(other.internalGetBuildOptions())) return false; + if (!getBuilderVersion().equals(other.getBuilderVersion())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1348,7 +1347,7 @@ public io.grafeas.v1beta1.provenance.BuildProvenance buildPartial() { result.id_ = id_; result.projectId_ = projectId_; if (commandsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { commands_ = java.util.Collections.unmodifiableList(commands_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1357,7 +1356,7 @@ public io.grafeas.v1beta1.provenance.BuildProvenance buildPartial() { result.commands_ = commandsBuilder_.build(); } if (builtArtifactsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { builtArtifacts_ = java.util.Collections.unmodifiableList(builtArtifacts_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1398,35 +1397,35 @@ public io.grafeas.v1beta1.provenance.BuildProvenance 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 @@ -1755,7 +1754,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureCommandsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { commands_ = new java.util.ArrayList(commands_); bitField0_ |= 0x00000004; } @@ -2093,10 +2092,7 @@ public java.util.List getCommands io.grafeas.v1beta1.provenance.Command, io.grafeas.v1beta1.provenance.Command.Builder, io.grafeas.v1beta1.provenance.CommandOrBuilder>( - commands_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + commands_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); commands_ = null; } return commandsBuilder_; @@ -2106,7 +2102,7 @@ public java.util.List getCommands java.util.Collections.emptyList(); private void ensureBuiltArtifactsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { builtArtifacts_ = new java.util.ArrayList(builtArtifacts_); bitField0_ |= 0x00000008; @@ -2448,7 +2444,7 @@ public io.grafeas.v1beta1.provenance.Artifact.Builder addBuiltArtifactsBuilder(i io.grafeas.v1beta1.provenance.Artifact.Builder, io.grafeas.v1beta1.provenance.ArtifactOrBuilder>( builtArtifacts_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); builtArtifacts_ = null; @@ -2456,7 +2452,7 @@ public io.grafeas.v1beta1.provenance.Artifact.Builder addBuiltArtifactsBuilder(i return builtArtifactsBuilder_; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2635,7 +2631,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2810,7 +2806,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3183,7 +3179,7 @@ public Builder setLogsUriBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.provenance.Source sourceProvenance_ = null; + private io.grafeas.v1beta1.provenance.Source sourceProvenance_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.provenance.Source, io.grafeas.v1beta1.provenance.Source.Builder, @@ -3717,7 +3713,7 @@ public Builder setBuilderVersionBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java index d5431fea7554..cc3da42143f1 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java @@ -65,7 +65,7 @@ private Command( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { env_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -75,7 +75,7 @@ private Command( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { args_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -99,7 +99,7 @@ private Command( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { waitFor_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -108,7 +108,7 @@ private Command( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,13 +120,13 @@ private Command( } 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)) { env_ = env_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { args_ = args_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { waitFor_ = waitFor_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -527,15 +527,14 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.provenance.Command other = (io.grafeas.v1beta1.provenance.Command) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getEnvList().equals(other.getEnvList()); - result = result && getArgsList().equals(other.getArgsList()); - result = result && getDir().equals(other.getDir()); - result = result && getId().equals(other.getId()); - result = result && getWaitForList().equals(other.getWaitForList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getEnvList().equals(other.getEnvList())) return false; + if (!getArgsList().equals(other.getArgsList())) return false; + if (!getDir().equals(other.getDir())) return false; + if (!getId().equals(other.getId())) return false; + if (!getWaitForList().equals(other.getWaitForList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -749,19 +748,19 @@ public io.grafeas.v1beta1.provenance.Command buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { env_ = env_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.env_ = env_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { args_ = args_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } result.args_ = args_; result.dir_ = dir_; result.id_ = id_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { waitFor_ = waitFor_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -773,35 +772,35 @@ public io.grafeas.v1beta1.provenance.Command 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 @@ -991,7 +990,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.LazyStringList env_ = com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEnvIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { env_ = new com.google.protobuf.LazyStringArrayList(env_); bitField0_ |= 0x00000002; } @@ -1134,7 +1133,7 @@ public Builder addEnvBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureArgsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { args_ = new com.google.protobuf.LazyStringArrayList(args_); bitField0_ |= 0x00000004; } @@ -1475,7 +1474,7 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureWaitForIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { waitFor_ = new com.google.protobuf.LazyStringArrayList(waitFor_); bitField0_ |= 0x00000020; } @@ -1616,7 +1615,7 @@ public Builder addWaitForBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java index 51ea58b3d3f6..daac09abca0d 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java @@ -53,7 +53,7 @@ private FileHashes( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fileHash_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private FileHashes( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private FileHashes( } 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)) { fileHash_ = java.util.Collections.unmodifiableList(fileHash_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.provenance.FileHashes other = (io.grafeas.v1beta1.provenance.FileHashes) obj; - boolean result = true; - result = result && getFileHashList().equals(other.getFileHashList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFileHashList().equals(other.getFileHashList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -407,7 +406,7 @@ public io.grafeas.v1beta1.provenance.FileHashes buildPartial() { new io.grafeas.v1beta1.provenance.FileHashes(this); int from_bitField0_ = bitField0_; if (fileHashBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fileHash_ = java.util.Collections.unmodifiableList(fileHash_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -421,35 +420,35 @@ public io.grafeas.v1beta1.provenance.FileHashes 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 @@ -526,7 +525,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFileHashIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fileHash_ = new java.util.ArrayList(fileHash_); bitField0_ |= 0x00000001; } @@ -864,10 +863,7 @@ public java.util.List getFileHashBui io.grafeas.v1beta1.provenance.Hash, io.grafeas.v1beta1.provenance.Hash.Builder, io.grafeas.v1beta1.provenance.HashOrBuilder>( - fileHash_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fileHash_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fileHash_ = null; } return fileHashBuilder_; @@ -875,7 +871,7 @@ public java.util.List getFileHashBui @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java index 63a8885ac9b9..1736b048395f 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java @@ -65,7 +65,7 @@ private Hash( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -315,11 +315,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.provenance.Hash other = (io.grafeas.v1beta1.provenance.Hash) obj; - boolean result = true; - result = result && type_ == other.type_; - result = result && getValue().equals(other.getValue()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (type_ != other.type_) return false; + if (!getValue().equals(other.getValue())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -515,35 +514,35 @@ public io.grafeas.v1beta1.provenance.Hash 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 @@ -718,7 +717,7 @@ public Builder clearValue() { @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java index 58c26905ab62..6430bb0485b2 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java @@ -60,7 +60,7 @@ private Source( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fileHashes_ = com.google.protobuf.MapField.newMapField( FileHashesDefaultEntryHolder.defaultEntry); @@ -93,7 +93,7 @@ private Source( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { additionalContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -105,7 +105,7 @@ private Source( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -117,7 +117,7 @@ private Source( } 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)) { additionalContexts_ = java.util.Collections.unmodifiableList(additionalContexts_); } this.unknownFields = unknownFields.build(); @@ -511,16 +511,15 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.provenance.Source other = (io.grafeas.v1beta1.provenance.Source) obj; - boolean result = true; - result = result && getArtifactStorageSourceUri().equals(other.getArtifactStorageSourceUri()); - result = result && internalGetFileHashes().equals(other.internalGetFileHashes()); - result = result && (hasContext() == other.hasContext()); + if (!getArtifactStorageSourceUri().equals(other.getArtifactStorageSourceUri())) return false; + if (!internalGetFileHashes().equals(other.internalGetFileHashes())) return false; + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && getAdditionalContextsList().equals(other.getAdditionalContextsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAdditionalContextsList().equals(other.getAdditionalContextsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -762,7 +761,7 @@ public io.grafeas.v1beta1.provenance.Source buildPartial() { result.context_ = contextBuilder_.build(); } if (additionalContextsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { additionalContexts_ = java.util.Collections.unmodifiableList(additionalContexts_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -777,35 +776,35 @@ public io.grafeas.v1beta1.provenance.Source 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 @@ -1183,7 +1182,7 @@ public Builder putAllFileHashes( return this; } - private io.grafeas.v1beta1.source.SourceContext context_ = null; + private io.grafeas.v1beta1.source.SourceContext context_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.source.SourceContext, io.grafeas.v1beta1.source.SourceContext.Builder, @@ -1368,7 +1367,7 @@ public io.grafeas.v1beta1.source.SourceContextOrBuilder getContextOrBuilder() { java.util.Collections.emptyList(); private void ensureAdditionalContextsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { additionalContexts_ = new java.util.ArrayList(additionalContexts_); bitField0_ |= 0x00000008; @@ -1765,7 +1764,7 @@ public io.grafeas.v1beta1.source.SourceContext.Builder addAdditionalContextsBuil io.grafeas.v1beta1.source.SourceContext.Builder, io.grafeas.v1beta1.source.SourceContextOrBuilder>( additionalContexts_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); additionalContexts_ = null; @@ -1775,7 +1774,7 @@ public io.grafeas.v1beta1.source.SourceContext.Builder addAdditionalContextsBuil @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java index d2911f9588bd..fe42f701e1ff 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java @@ -67,7 +67,7 @@ private AliasContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -391,11 +391,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.source.AliasContext other = (io.grafeas.v1beta1.source.AliasContext) obj; - boolean result = true; - result = result && kind_ == other.kind_; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (kind_ != other.kind_) return false; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -593,35 +592,35 @@ public io.grafeas.v1beta1.source.AliasContext 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 @@ -844,7 +843,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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java index f01f69365896..9242fc5899fb 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java @@ -89,7 +89,7 @@ private CloudRepoSourceContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -355,25 +355,23 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.source.CloudRepoSourceContext other = (io.grafeas.v1beta1.source.CloudRepoSourceContext) obj; - boolean result = true; - result = result && (hasRepoId() == other.hasRepoId()); + if (hasRepoId() != other.hasRepoId()) return false; if (hasRepoId()) { - result = result && getRepoId().equals(other.getRepoId()); + if (!getRepoId().equals(other.getRepoId())) return false; } - result = result && getRevisionCase().equals(other.getRevisionCase()); - if (!result) return false; + if (!getRevisionCase().equals(other.getRevisionCase())) return false; switch (revisionCase_) { case 2: - result = result && getRevisionId().equals(other.getRevisionId()); + if (!getRevisionId().equals(other.getRevisionId())) return false; break; case 3: - result = result && getAliasContext().equals(other.getAliasContext()); + if (!getAliasContext().equals(other.getAliasContext())) 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 @@ -602,35 +600,35 @@ public io.grafeas.v1beta1.source.CloudRepoSourceContext 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 @@ -710,7 +708,7 @@ public Builder clearRevision() { return this; } - private io.grafeas.v1beta1.source.RepoId repoId_ = null; + private io.grafeas.v1beta1.source.RepoId repoId_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.source.RepoId, io.grafeas.v1beta1.source.RepoId.Builder, @@ -1193,7 +1191,7 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder( @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java index 3cf11a49f572..d9927ca870dd 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java @@ -90,7 +90,7 @@ private GerritSourceContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -413,23 +413,21 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.source.GerritSourceContext other = (io.grafeas.v1beta1.source.GerritSourceContext) obj; - boolean result = true; - result = result && getHostUri().equals(other.getHostUri()); - result = result && getGerritProject().equals(other.getGerritProject()); - result = result && getRevisionCase().equals(other.getRevisionCase()); - if (!result) return false; + if (!getHostUri().equals(other.getHostUri())) return false; + if (!getGerritProject().equals(other.getGerritProject())) return false; + if (!getRevisionCase().equals(other.getRevisionCase())) return false; switch (revisionCase_) { case 3: - result = result && getRevisionId().equals(other.getRevisionId()); + if (!getRevisionId().equals(other.getRevisionId())) return false; break; case 4: - result = result && getAliasContext().equals(other.getAliasContext()); + if (!getAliasContext().equals(other.getAliasContext())) 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 @@ -652,35 +650,35 @@ public io.grafeas.v1beta1.source.GerritSourceContext 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 @@ -1270,7 +1268,7 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder( @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java index 657c8f858a7b..8de5fa81a220 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java @@ -68,7 +68,7 @@ private GitSourceContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -237,11 +237,10 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.source.GitSourceContext other = (io.grafeas.v1beta1.source.GitSourceContext) obj; - boolean result = true; - result = result && getUrl().equals(other.getUrl()); - result = result && getRevisionId().equals(other.getRevisionId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUrl().equals(other.getUrl())) return false; + if (!getRevisionId().equals(other.getRevisionId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -440,35 +439,35 @@ public io.grafeas.v1beta1.source.GitSourceContext 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 @@ -710,7 +709,7 @@ public Builder setRevisionIdBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java index b3159c6102e5..40b590e05def 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java @@ -68,7 +68,7 @@ private ProjectRepoId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -236,11 +236,10 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.source.ProjectRepoId other = (io.grafeas.v1beta1.source.ProjectRepoId) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getRepoName().equals(other.getRepoName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getRepoName().equals(other.getRepoName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -439,35 +438,35 @@ public io.grafeas.v1beta1.source.ProjectRepoId 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 @@ -709,7 +708,7 @@ public Builder setRepoNameBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java index 10c3bf47cc77..170712cd7f77 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java @@ -73,7 +73,7 @@ private RepoId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -292,21 +292,19 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.source.RepoId other = (io.grafeas.v1beta1.source.RepoId) obj; - boolean result = true; - result = result && getIdCase().equals(other.getIdCase()); - if (!result) return false; + if (!getIdCase().equals(other.getIdCase())) return false; switch (idCase_) { case 1: - result = result && getProjectRepoId().equals(other.getProjectRepoId()); + if (!getProjectRepoId().equals(other.getProjectRepoId())) return false; break; case 2: - result = result && getUid().equals(other.getUid()); + if (!getUid().equals(other.getUid())) 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 @@ -517,35 +515,35 @@ public io.grafeas.v1beta1.source.RepoId 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 @@ -927,7 +925,7 @@ public Builder setUidBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java index 5f55438abfbb..fef52ae912ab 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java @@ -100,7 +100,7 @@ private SourceContext( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000008; @@ -113,7 +113,7 @@ private SourceContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -499,25 +499,23 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.source.SourceContext other = (io.grafeas.v1beta1.source.SourceContext) obj; - boolean result = true; - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && getContextCase().equals(other.getContextCase()); - if (!result) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!getContextCase().equals(other.getContextCase())) return false; switch (contextCase_) { case 1: - result = result && getCloudRepo().equals(other.getCloudRepo()); + if (!getCloudRepo().equals(other.getCloudRepo())) return false; break; case 2: - result = result && getGerrit().equals(other.getGerrit()); + if (!getGerrit().equals(other.getGerrit())) return false; break; case 3: - result = result && getGit().equals(other.getGit()); + if (!getGit().equals(other.getGit())) 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 @@ -776,35 +774,35 @@ public io.grafeas.v1beta1.source.SourceContext 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 @@ -1645,7 +1643,7 @@ public Builder putAllLabels(java.util.Map va @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java index 75b099d555e9..d75d84c49436 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java @@ -25,7 +25,6 @@ private Details(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Details() { type_ = ""; severity_ = 0; - cvssScore_ = 0F; packageIssue_ = java.util.Collections.emptyList(); shortDescription_ = ""; longDescription_ = ""; @@ -77,7 +76,7 @@ private Details( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { packageIssue_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -103,7 +102,7 @@ private Details( } case 58: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { relatedUrls_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -114,7 +113,7 @@ private Details( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -126,10 +125,10 @@ private Details( } 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)) { packageIssue_ = java.util.Collections.unmodifiableList(packageIssue_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { relatedUrls_ = java.util.Collections.unmodifiableList(relatedUrls_); } this.unknownFields = unknownFields.build(); @@ -545,19 +544,16 @@ public boolean equals(final java.lang.Object obj) { } io.grafeas.v1beta1.vulnerability.Details other = (io.grafeas.v1beta1.vulnerability.Details) obj; - boolean result = true; - result = result && getType().equals(other.getType()); - result = result && severity_ == other.severity_; - result = - result - && (java.lang.Float.floatToIntBits(getCvssScore()) - == java.lang.Float.floatToIntBits(other.getCvssScore())); - result = result && getPackageIssueList().equals(other.getPackageIssueList()); - result = result && getShortDescription().equals(other.getShortDescription()); - result = result && getLongDescription().equals(other.getLongDescription()); - result = result && getRelatedUrlsList().equals(other.getRelatedUrlsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getType().equals(other.getType())) return false; + if (severity_ != other.severity_) return false; + if (java.lang.Float.floatToIntBits(getCvssScore()) + != java.lang.Float.floatToIntBits(other.getCvssScore())) return false; + if (!getPackageIssueList().equals(other.getPackageIssueList())) return false; + if (!getShortDescription().equals(other.getShortDescription())) return false; + if (!getLongDescription().equals(other.getLongDescription())) return false; + if (!getRelatedUrlsList().equals(other.getRelatedUrlsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -788,7 +784,7 @@ public io.grafeas.v1beta1.vulnerability.Details buildPartial() { result.severity_ = severity_; result.cvssScore_ = cvssScore_; if (packageIssueBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { packageIssue_ = java.util.Collections.unmodifiableList(packageIssue_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -799,7 +795,7 @@ public io.grafeas.v1beta1.vulnerability.Details buildPartial() { result.shortDescription_ = shortDescription_; result.longDescription_ = longDescription_; if (relatedUrlsBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { relatedUrls_ = java.util.Collections.unmodifiableList(relatedUrls_); bitField0_ = (bitField0_ & ~0x00000040); } @@ -814,35 +810,35 @@ public io.grafeas.v1beta1.vulnerability.Details 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 @@ -1189,7 +1185,7 @@ public Builder clearCvssScore() { java.util.Collections.emptyList(); private void ensurePackageIssueIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { packageIssue_ = new java.util.ArrayList(packageIssue_); bitField0_ |= 0x00000008; @@ -1549,10 +1545,7 @@ public io.grafeas.v1beta1.vulnerability.PackageIssue.Builder addPackageIssueBuil io.grafeas.v1beta1.vulnerability.PackageIssue, io.grafeas.v1beta1.vulnerability.PackageIssue.Builder, io.grafeas.v1beta1.vulnerability.PackageIssueOrBuilder>( - packageIssue_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + packageIssue_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); packageIssue_ = null; } return packageIssueBuilder_; @@ -1750,7 +1743,7 @@ public Builder setLongDescriptionBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureRelatedUrlsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { relatedUrls_ = new java.util.ArrayList(relatedUrls_); bitField0_ |= 0x00000040; } @@ -2089,10 +2082,7 @@ public io.grafeas.v1beta1.common.RelatedUrl.Builder addRelatedUrlsBuilder(int in io.grafeas.v1beta1.common.RelatedUrl, io.grafeas.v1beta1.common.RelatedUrl.Builder, io.grafeas.v1beta1.common.RelatedUrlOrBuilder>( - relatedUrls_, - ((bitField0_ & 0x00000040) == 0x00000040), - getParentForChildren(), - isClean()); + relatedUrls_, ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); relatedUrls_ = null; } return relatedUrlsBuilder_; @@ -2100,7 +2090,7 @@ public io.grafeas.v1beta1.common.RelatedUrl.Builder addRelatedUrlsBuilder(int in @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java index cffed711835f..b6ecf5152cbb 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java @@ -94,7 +94,7 @@ private PackageIssue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -310,18 +310,17 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.vulnerability.PackageIssue other = (io.grafeas.v1beta1.vulnerability.PackageIssue) obj; - boolean result = true; - result = result && (hasAffectedLocation() == other.hasAffectedLocation()); + if (hasAffectedLocation() != other.hasAffectedLocation()) return false; if (hasAffectedLocation()) { - result = result && getAffectedLocation().equals(other.getAffectedLocation()); + if (!getAffectedLocation().equals(other.getAffectedLocation())) return false; } - result = result && (hasFixedLocation() == other.hasFixedLocation()); + if (hasFixedLocation() != other.hasFixedLocation()) return false; if (hasFixedLocation()) { - result = result && getFixedLocation().equals(other.getFixedLocation()); + if (!getFixedLocation().equals(other.getFixedLocation())) return false; } - result = result && getSeverityName().equals(other.getSeverityName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSeverityName().equals(other.getSeverityName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -545,35 +544,35 @@ public io.grafeas.v1beta1.vulnerability.PackageIssue 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 @@ -627,7 +626,7 @@ public Builder mergeFrom( return this; } - private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation affectedLocation_ = null; + private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation affectedLocation_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.vulnerability.VulnerabilityLocation, io.grafeas.v1beta1.vulnerability.VulnerabilityLocation.Builder, @@ -813,7 +812,7 @@ public Builder clearAffectedLocation() { return affectedLocationBuilder_; } - private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation fixedLocation_ = null; + private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation fixedLocation_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.vulnerability.VulnerabilityLocation, io.grafeas.v1beta1.vulnerability.VulnerabilityLocation.Builder, @@ -1094,7 +1093,7 @@ public Builder setSeverityNameBytes(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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java index 510f8d8c089e..4a2777528468 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java @@ -23,7 +23,6 @@ private Vulnerability(com.google.protobuf.GeneratedMessageV3.Builder builder) } private Vulnerability() { - cvssScore_ = 0F; severity_ = 0; details_ = java.util.Collections.emptyList(); } @@ -66,7 +65,7 @@ private Vulnerability( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { details_ = new java.util.ArrayList< io.grafeas.v1beta1.vulnerability.Vulnerability.Detail>(); @@ -80,7 +79,7 @@ private Vulnerability( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +91,7 @@ private Vulnerability( } 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)) { details_ = java.util.Collections.unmodifiableList(details_); } this.unknownFields = unknownFields.build(); @@ -363,7 +362,6 @@ private Detail() { severityName_ = ""; description_ = ""; packageType_ = ""; - isObsolete_ = false; } @java.lang.Override @@ -479,7 +477,7 @@ private Detail( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -967,27 +965,26 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.vulnerability.Vulnerability.Detail other = (io.grafeas.v1beta1.vulnerability.Vulnerability.Detail) obj; - boolean result = true; - result = result && getCpeUri().equals(other.getCpeUri()); - result = result && getPackage().equals(other.getPackage()); - result = result && (hasMinAffectedVersion() == other.hasMinAffectedVersion()); + if (!getCpeUri().equals(other.getCpeUri())) return false; + if (!getPackage().equals(other.getPackage())) return false; + if (hasMinAffectedVersion() != other.hasMinAffectedVersion()) return false; if (hasMinAffectedVersion()) { - result = result && getMinAffectedVersion().equals(other.getMinAffectedVersion()); + if (!getMinAffectedVersion().equals(other.getMinAffectedVersion())) return false; } - result = result && (hasMaxAffectedVersion() == other.hasMaxAffectedVersion()); + if (hasMaxAffectedVersion() != other.hasMaxAffectedVersion()) return false; if (hasMaxAffectedVersion()) { - result = result && getMaxAffectedVersion().equals(other.getMaxAffectedVersion()); + if (!getMaxAffectedVersion().equals(other.getMaxAffectedVersion())) return false; } - result = result && getSeverityName().equals(other.getSeverityName()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasFixedLocation() == other.hasFixedLocation()); + if (!getSeverityName().equals(other.getSeverityName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (hasFixedLocation() != other.hasFixedLocation()) return false; if (hasFixedLocation()) { - result = result && getFixedLocation().equals(other.getFixedLocation()); + if (!getFixedLocation().equals(other.getFixedLocation())) return false; } - result = result && getPackageType().equals(other.getPackageType()); - result = result && (getIsObsolete() == other.getIsObsolete()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPackageType().equals(other.getPackageType())) return false; + if (getIsObsolete() != other.getIsObsolete()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1255,23 +1252,23 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail 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 @@ -1279,13 +1276,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 @@ -1561,7 +1558,7 @@ public Builder setPackageBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.pkg.Version minAffectedVersion_ = null; + private io.grafeas.v1beta1.pkg.Version minAffectedVersion_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Version, io.grafeas.v1beta1.pkg.Version.Builder, @@ -1742,7 +1739,7 @@ public io.grafeas.v1beta1.pkg.VersionOrBuilder getMinAffectedVersionOrBuilder() return minAffectedVersionBuilder_; } - private io.grafeas.v1beta1.pkg.Version maxAffectedVersion_ = null; + private io.grafeas.v1beta1.pkg.Version maxAffectedVersion_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Version, io.grafeas.v1beta1.pkg.Version.Builder, @@ -2111,7 +2108,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation fixedLocation_ = null; + private io.grafeas.v1beta1.vulnerability.VulnerabilityLocation fixedLocation_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.vulnerability.VulnerabilityLocation, io.grafeas.v1beta1.vulnerability.VulnerabilityLocation.Builder, @@ -2446,7 +2443,7 @@ public Builder clearIsObsolete() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2673,15 +2670,12 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.vulnerability.Vulnerability other = (io.grafeas.v1beta1.vulnerability.Vulnerability) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getCvssScore()) - == java.lang.Float.floatToIntBits(other.getCvssScore())); - result = result && severity_ == other.severity_; - result = result && getDetailsList().equals(other.getDetailsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getCvssScore()) + != java.lang.Float.floatToIntBits(other.getCvssScore())) return false; + if (severity_ != other.severity_) return false; + if (!getDetailsList().equals(other.getDetailsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2888,7 +2882,7 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability buildPartial() { result.cvssScore_ = cvssScore_; result.severity_ = severity_; if (detailsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { details_ = java.util.Collections.unmodifiableList(details_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2903,35 +2897,35 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability 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 @@ -3134,7 +3128,7 @@ public Builder clearSeverity() { java.util.Collections.emptyList(); private void ensureDetailsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { details_ = new java.util.ArrayList( details_); @@ -3519,10 +3513,7 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.Builder addDetailsB io.grafeas.v1beta1.vulnerability.Vulnerability.Detail, io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.Builder, io.grafeas.v1beta1.vulnerability.Vulnerability.DetailOrBuilder>( - details_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + details_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); details_ = null; } return detailsBuilder_; @@ -3530,7 +3521,7 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.Builder addDetailsB @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-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java index 04cad8485fbb..1253ee425c62 100644 --- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java +++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java @@ -82,7 +82,7 @@ private VulnerabilityLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,15 +298,14 @@ public boolean equals(final java.lang.Object obj) { io.grafeas.v1beta1.vulnerability.VulnerabilityLocation other = (io.grafeas.v1beta1.vulnerability.VulnerabilityLocation) obj; - boolean result = true; - result = result && getCpeUri().equals(other.getCpeUri()); - result = result && getPackage().equals(other.getPackage()); - result = result && (hasVersion() == other.hasVersion()); + if (!getCpeUri().equals(other.getCpeUri())) return false; + if (!getPackage().equals(other.getPackage())) return false; + if (hasVersion() != other.hasVersion()) return false; if (hasVersion()) { - result = result && getVersion().equals(other.getVersion()); + if (!getVersion().equals(other.getVersion())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -520,35 +519,35 @@ public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation 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 @@ -798,7 +797,7 @@ public Builder setPackageBytes(com.google.protobuf.ByteString value) { return this; } - private io.grafeas.v1beta1.pkg.Version version_ = null; + private io.grafeas.v1beta1.pkg.Version version_; private com.google.protobuf.SingleFieldBuilderV3< io.grafeas.v1beta1.pkg.Version, io.grafeas.v1beta1.pkg.Version.Builder, @@ -975,7 +974,7 @@ public io.grafeas.v1beta1.pkg.VersionOrBuilder getVersionOrBuilder() { @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-containeranalysis/synth.metadata b/google-cloud-clients/google-cloud-containeranalysis/synth.metadata index f20b69a1e5e0..7a00eeb3c0fd 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/synth.metadata +++ b/google-cloud-clients/google-cloud-containeranalysis/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:39:28.087076Z", + "updateTime": "2019-03-29T07:39:21.448250Z", "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" } } ],