diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java index fd52d0263463..84ba94ab1de2 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java @@ -98,7 +98,7 @@ private Asset( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -369,19 +369,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.asset.v1beta1.Asset other = (com.google.cloud.asset.v1beta1.Asset) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getAssetType().equals(other.getAssetType()); - result = result && (hasResource() == other.hasResource()); + if (!getName().equals(other.getName())) return false; + if (!getAssetType().equals(other.getAssetType())) 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 && (hasIamPolicy() == other.hasIamPolicy()); + if (hasIamPolicy() != other.hasIamPolicy()) return false; if (hasIamPolicy()) { - result = result && getIamPolicy().equals(other.getIamPolicy()); + if (!getIamPolicy().equals(other.getIamPolicy())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -608,35 +607,35 @@ public com.google.cloud.asset.v1beta1.Asset 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 @@ -902,7 +901,7 @@ public Builder setAssetTypeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.asset.v1beta1.Resource resource_ = null; + private com.google.cloud.asset.v1beta1.Resource resource_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.Resource, com.google.cloud.asset.v1beta1.Resource.Builder, @@ -1083,7 +1082,7 @@ public com.google.cloud.asset.v1beta1.ResourceOrBuilder getResourceOrBuilder() { return resourceBuilder_; } - private com.google.iam.v1.Policy iamPolicy_ = null; + private com.google.iam.v1.Policy iamPolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.iam.v1.Policy, com.google.iam.v1.Policy.Builder, @@ -1269,7 +1268,7 @@ public com.google.iam.v1.PolicyOrBuilder getIamPolicyOrBuilder() { @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java index 0e898a4d37ee..b3aed23ff5e5 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java @@ -62,7 +62,7 @@ private BatchGetAssetsHistoryRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { assetNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -94,7 +94,7 @@ private BatchGetAssetsHistoryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +106,7 @@ private BatchGetAssetsHistoryRequest( } 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)) { assetNames_ = assetNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -408,16 +408,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest other = (com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAssetNamesList().equals(other.getAssetNamesList()); - result = result && contentType_ == other.contentType_; - result = result && (hasReadTimeWindow() == other.hasReadTimeWindow()); + if (!getParent().equals(other.getParent())) return false; + if (!getAssetNamesList().equals(other.getAssetNamesList())) return false; + if (contentType_ != other.contentType_) return false; + if (hasReadTimeWindow() != other.hasReadTimeWindow()) return false; if (hasReadTimeWindow()) { - result = result && getReadTimeWindow().equals(other.getReadTimeWindow()); + if (!getReadTimeWindow().equals(other.getReadTimeWindow())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -627,7 +626,7 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest buildPartial( int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { assetNames_ = assetNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -645,35 +644,35 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest 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 @@ -849,7 +848,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAssetNamesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { assetNames_ = new com.google.protobuf.LazyStringArrayList(assetNames_); bitField0_ |= 0x00000002; } @@ -1118,7 +1117,7 @@ public Builder clearContentType() { return this; } - private com.google.cloud.asset.v1beta1.TimeWindow readTimeWindow_ = null; + private com.google.cloud.asset.v1beta1.TimeWindow readTimeWindow_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.TimeWindow, com.google.cloud.asset.v1beta1.TimeWindow.Builder, @@ -1347,7 +1346,7 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java index 91ee2e7d2801..fc4af58570c8 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java @@ -52,7 +52,7 @@ private BatchGetAssetsHistoryResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { assets_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private BatchGetAssetsHistoryResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private BatchGetAssetsHistoryResponse( } 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)) { assets_ = java.util.Collections.unmodifiableList(assets_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse other = (com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse) obj; - boolean result = true; - result = result && getAssetsList().equals(other.getAssetsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAssetsList().equals(other.getAssetsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -408,7 +407,7 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse buildPartial new com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse(this); int from_bitField0_ = bitField0_; if (assetsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { assets_ = java.util.Collections.unmodifiableList(assets_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -422,35 +421,35 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse 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 @@ -530,7 +529,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAssetsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { assets_ = new java.util.ArrayList(assets_); bitField0_ |= 0x00000001; } @@ -869,10 +868,7 @@ public com.google.cloud.asset.v1beta1.TemporalAsset.Builder addAssetsBuilder(int com.google.cloud.asset.v1beta1.TemporalAsset, com.google.cloud.asset.v1beta1.TemporalAsset.Builder, com.google.cloud.asset.v1beta1.TemporalAssetOrBuilder>( - assets_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + assets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); assets_ = null; } return assetsBuilder_; @@ -880,7 +876,7 @@ public com.google.cloud.asset.v1beta1.TemporalAsset.Builder addAssetsBuilder(int @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java index dd6c8196d24d..579dbd03cba0 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java @@ -77,7 +77,7 @@ private ExportAssetsRequest( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { assetTypes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -109,7 +109,7 @@ private ExportAssetsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,7 +121,7 @@ private ExportAssetsRequest( } 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)) { assetTypes_ = assetTypes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -464,20 +464,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.ExportAssetsRequest other = (com.google.cloud.asset.v1beta1.ExportAssetsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getParent().equals(other.getParent())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && getAssetTypesList().equals(other.getAssetTypesList()); - result = result && contentType_ == other.contentType_; - result = result && (hasOutputConfig() == other.hasOutputConfig()); + if (!getAssetTypesList().equals(other.getAssetTypesList())) return false; + if (contentType_ != other.contentType_) return false; + if (hasOutputConfig() != other.hasOutputConfig()) return false; if (hasOutputConfig()) { - result = result && getOutputConfig().equals(other.getOutputConfig()); + if (!getOutputConfig().equals(other.getOutputConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -701,7 +700,7 @@ public com.google.cloud.asset.v1beta1.ExportAssetsRequest buildPartial() { } else { result.readTime_ = readTimeBuilder_.build(); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { assetTypes_ = assetTypes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -719,35 +718,35 @@ public com.google.cloud.asset.v1beta1.ExportAssetsRequest 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 +926,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1142,7 +1141,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAssetTypesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { assetTypes_ = new com.google.protobuf.LazyStringArrayList(assetTypes_); bitField0_ |= 0x00000004; } @@ -1398,7 +1397,7 @@ public Builder clearContentType() { return this; } - private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_ = null; + private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.OutputConfig, com.google.cloud.asset.v1beta1.OutputConfig.Builder, @@ -1591,7 +1590,7 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java index 74e0cb44185f..716f59fd9fd7 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java @@ -85,7 +85,7 @@ private ExportAssetsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.ExportAssetsResponse other = (com.google.cloud.asset.v1beta1.ExportAssetsResponse) obj; - boolean result = true; - result = result && (hasReadTime() == other.hasReadTime()); + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && (hasOutputConfig() == other.hasOutputConfig()); + if (hasOutputConfig() != other.hasOutputConfig()) return false; if (hasOutputConfig()) { - result = result && getOutputConfig().equals(other.getOutputConfig()); + if (!getOutputConfig().equals(other.getOutputConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +482,35 @@ public com.google.cloud.asset.v1beta1.ExportAssetsResponse 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 @@ -563,7 +562,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -738,7 +737,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { return readTimeBuilder_; } - private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_ = null; + private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.OutputConfig, com.google.cloud.asset.v1beta1.OutputConfig.Builder, @@ -931,7 +930,7 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java index ea5bae07f52c..ef57fe59b8d7 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java @@ -57,7 +57,7 @@ private GcsDestination( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -231,18 +231,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.GcsDestination other = (com.google.cloud.asset.v1beta1.GcsDestination) obj; - boolean result = true; - result = result && getObjectUriCase().equals(other.getObjectUriCase()); - if (!result) return false; + if (!getObjectUriCase().equals(other.getObjectUriCase())) return false; switch (objectUriCase_) { case 1: - result = result && getUri().equals(other.getUri()); + if (!getUri().equals(other.getUri())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +442,35 @@ public com.google.cloud.asset.v1beta1.GcsDestination 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 @@ -670,7 +668,7 @@ public Builder setUriBytes(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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java index 3e7838cde62c..21f20628ff17 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java @@ -67,7 +67,7 @@ private OutputConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -227,18 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.OutputConfig other = (com.google.cloud.asset.v1beta1.OutputConfig) obj; - boolean result = true; - result = result && getDestinationCase().equals(other.getDestinationCase()); - if (!result) return false; + if (!getDestinationCase().equals(other.getDestinationCase())) return false; switch (destinationCase_) { case 1: - result = result && getGcsDestination().equals(other.getGcsDestination()); + if (!getGcsDestination().equals(other.getGcsDestination())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +442,35 @@ public com.google.cloud.asset.v1beta1.OutputConfig 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 @@ -745,7 +743,7 @@ public com.google.cloud.asset.v1beta1.GcsDestinationOrBuilder getGcsDestinationO @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java index 2316e99b76b9..b7958c8e4619 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java @@ -105,7 +105,7 @@ private Resource( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -504,18 +504,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.asset.v1beta1.Resource other = (com.google.cloud.asset.v1beta1.Resource) obj; - boolean result = true; - result = result && getVersion().equals(other.getVersion()); - result = result && getDiscoveryDocumentUri().equals(other.getDiscoveryDocumentUri()); - result = result && getDiscoveryName().equals(other.getDiscoveryName()); - result = result && getResourceUrl().equals(other.getResourceUrl()); - result = result && getParent().equals(other.getParent()); - result = result && (hasData() == other.hasData()); + if (!getVersion().equals(other.getVersion())) return false; + if (!getDiscoveryDocumentUri().equals(other.getDiscoveryDocumentUri())) return false; + if (!getDiscoveryName().equals(other.getDiscoveryName())) return false; + if (!getResourceUrl().equals(other.getResourceUrl())) return false; + if (!getParent().equals(other.getParent())) return false; + if (hasData() != other.hasData()) return false; if (hasData()) { - result = result && getData().equals(other.getData()); + if (!getData().equals(other.getData())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -743,35 +742,35 @@ public com.google.cloud.asset.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 @@ -1398,7 +1397,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct data_ = null; + private com.google.protobuf.Struct data_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1582,7 +1581,7 @@ public com.google.protobuf.StructOrBuilder getDataOrBuilder() { @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java index 31b700867d3e..e6dbff3ecd0c 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java @@ -23,9 +23,7 @@ private TemporalAsset(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private TemporalAsset() { - deleted_ = false; - } + private TemporalAsset() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -90,7 +88,7 @@ private TemporalAsset( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -274,18 +272,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.TemporalAsset other = (com.google.cloud.asset.v1beta1.TemporalAsset) obj; - boolean result = true; - result = result && (hasWindow() == other.hasWindow()); + if (hasWindow() != other.hasWindow()) return false; if (hasWindow()) { - result = result && getWindow().equals(other.getWindow()); + if (!getWindow().equals(other.getWindow())) return false; } - result = result && (getDeleted() == other.getDeleted()); - result = result && (hasAsset() == other.hasAsset()); + if (getDeleted() != other.getDeleted()) return false; + if (hasAsset() != other.hasAsset()) return false; if (hasAsset()) { - result = result && getAsset().equals(other.getAsset()); + if (!getAsset().equals(other.getAsset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -509,35 +506,35 @@ public com.google.cloud.asset.v1beta1.TemporalAsset 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 @@ -590,7 +587,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.asset.v1beta1.TimeWindow window_ = null; + private com.google.cloud.asset.v1beta1.TimeWindow window_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.TimeWindow, com.google.cloud.asset.v1beta1.TimeWindow.Builder, @@ -815,7 +812,7 @@ public Builder clearDeleted() { return this; } - private com.google.cloud.asset.v1beta1.Asset asset_ = null; + private com.google.cloud.asset.v1beta1.Asset asset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.Asset, com.google.cloud.asset.v1beta1.Asset.Builder, @@ -994,7 +991,7 @@ public com.google.cloud.asset.v1beta1.AssetOrBuilder getAssetOrBuilder() { @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-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java index ad48d08e1971..686f6fddfa9a 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java @@ -80,7 +80,7 @@ private TimeWindow( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,17 +244,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.asset.v1beta1.TimeWindow other = (com.google.cloud.asset.v1beta1.TimeWindow) obj; - boolean result = true; - 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 && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -472,35 +471,35 @@ public com.google.cloud.asset.v1beta1.TimeWindow 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 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, @@ -725,7 +724,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, @@ -911,7 +910,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { @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-asset/synth.metadata b/google-cloud-clients/google-cloud-asset/synth.metadata index d5abb54d674b..a0467d6f5cfb 100644 --- a/google-cloud-clients/google-cloud-asset/synth.metadata +++ b/google-cloud-clients/google-cloud-asset/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:33:38.941289Z", + "updateTime": "2019-03-29T07:33:10.318780Z", "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" } } ],