diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java index 8aa82b4d00c8..7e7b0a696778 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java @@ -110,7 +110,7 @@ private AnnotationPayload( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -445,23 +445,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.AnnotationPayload other = (com.google.cloud.automl.v1beta1.AnnotationPayload) obj; - boolean result = true; - result = result && getAnnotationSpecId().equals(other.getAnnotationSpecId()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDetailCase().equals(other.getDetailCase()); - if (!result) return false; + if (!getAnnotationSpecId().equals(other.getAnnotationSpecId())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDetailCase().equals(other.getDetailCase())) return false; switch (detailCase_) { case 2: - result = result && getTranslation().equals(other.getTranslation()); + if (!getTranslation().equals(other.getTranslation())) return false; break; case 3: - result = result && getClassification().equals(other.getClassification()); + if (!getClassification().equals(other.getClassification())) 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 @@ -688,35 +686,35 @@ public com.google.cloud.automl.v1beta1.AnnotationPayload 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 @@ -1451,7 +1449,7 @@ public Builder setDisplayNameBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java index 6897cbe91ebe..173b18b3cc84 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java @@ -200,9 +200,7 @@ private ClassificationAnnotation(com.google.protobuf.GeneratedMessageV3.Builder< super(builder); } - private ClassificationAnnotation() { - score_ = 0F; - } + private ClassificationAnnotation() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -235,7 +233,7 @@ private ClassificationAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -334,13 +332,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation other = (com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getScore()) - == java.lang.Float.floatToIntBits(other.getScore())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getScore()) + != java.lang.Float.floatToIntBits(other.getScore())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -548,23 +543,23 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotat @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 @@ -572,13 +567,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 +688,7 @@ public Builder clearScore() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -965,8 +960,6 @@ private ClassificationEvaluationMetrics( } private ClassificationEvaluationMetrics() { - auPrc_ = 0F; - baseAuPrc_ = 0F; confidenceMetricsEntry_ = java.util.Collections.emptyList(); annotationSpecId_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -1007,7 +1000,7 @@ private ClassificationEvaluationMetrics( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { confidenceMetricsEntry_ = new java.util.ArrayList< com.google.cloud.automl.v1beta1.ClassificationProto @@ -1044,7 +1037,7 @@ private ClassificationEvaluationMetrics( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { annotationSpecId_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -1053,7 +1046,7 @@ private ClassificationEvaluationMetrics( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1065,10 +1058,10 @@ private ClassificationEvaluationMetrics( } 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)) { confidenceMetricsEntry_ = java.util.Collections.unmodifiableList(confidenceMetricsEntry_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { annotationSpecId_ = annotationSpecId_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -1202,15 +1195,7 @@ private ConfidenceMetricsEntry(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private ConfidenceMetricsEntry() { - confidenceThreshold_ = 0F; - recall_ = 0F; - precision_ = 0F; - f1Score_ = 0F; - recallAt1_ = 0F; - precisionAt1_ = 0F; - f1ScoreAt1_ = 0F; - } + private ConfidenceMetricsEntry() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -1273,7 +1258,7 @@ private ConfidenceMetricsEntry( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1508,37 +1493,22 @@ public boolean equals(final java.lang.Object obj) { .ConfidenceMetricsEntry) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getConfidenceThreshold()) - == java.lang.Float.floatToIntBits(other.getConfidenceThreshold())); - result = - result - && (java.lang.Float.floatToIntBits(getRecall()) - == java.lang.Float.floatToIntBits(other.getRecall())); - result = - result - && (java.lang.Float.floatToIntBits(getPrecision()) - == java.lang.Float.floatToIntBits(other.getPrecision())); - result = - result - && (java.lang.Float.floatToIntBits(getF1Score()) - == java.lang.Float.floatToIntBits(other.getF1Score())); - result = - result - && (java.lang.Float.floatToIntBits(getRecallAt1()) - == java.lang.Float.floatToIntBits(other.getRecallAt1())); - result = - result - && (java.lang.Float.floatToIntBits(getPrecisionAt1()) - == java.lang.Float.floatToIntBits(other.getPrecisionAt1())); - result = - result - && (java.lang.Float.floatToIntBits(getF1ScoreAt1()) - == java.lang.Float.floatToIntBits(other.getF1ScoreAt1())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidenceThreshold()) + != java.lang.Float.floatToIntBits(other.getConfidenceThreshold())) return false; + if (java.lang.Float.floatToIntBits(getRecall()) + != java.lang.Float.floatToIntBits(other.getRecall())) return false; + if (java.lang.Float.floatToIntBits(getPrecision()) + != java.lang.Float.floatToIntBits(other.getPrecision())) return false; + if (java.lang.Float.floatToIntBits(getF1Score()) + != java.lang.Float.floatToIntBits(other.getF1Score())) return false; + if (java.lang.Float.floatToIntBits(getRecallAt1()) + != java.lang.Float.floatToIntBits(other.getRecallAt1())) return false; + if (java.lang.Float.floatToIntBits(getPrecisionAt1()) + != java.lang.Float.floatToIntBits(other.getPrecisionAt1())) return false; + if (java.lang.Float.floatToIntBits(getF1ScoreAt1()) + != java.lang.Float.floatToIntBits(other.getF1ScoreAt1())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1803,23 +1773,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @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 @@ -1827,13 +1797,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 @@ -2246,7 +2216,7 @@ public Builder clearF1ScoreAt1() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2493,7 +2463,7 @@ private ConfusionMatrix( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationSpecId_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -2502,7 +2472,7 @@ private ConfusionMatrix( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { row_ = new java.util.ArrayList< com.google.cloud.automl.v1beta1.ClassificationProto @@ -2518,7 +2488,7 @@ private ConfusionMatrix( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2531,10 +2501,10 @@ private ConfusionMatrix( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { annotationSpecId_ = annotationSpecId_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { row_ = java.util.Collections.unmodifiableList(row_); } this.unknownFields = unknownFields.build(); @@ -2622,7 +2592,7 @@ private Row(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private Row() { - exampleCount_ = java.util.Collections.emptyList(); + exampleCount_ = emptyIntList(); } @java.lang.Override @@ -2651,31 +2621,31 @@ private Row( break; case 8: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - exampleCount_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + exampleCount_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - exampleCount_.add(input.readInt32()); + exampleCount_.addInt(input.readInt32()); break; } case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - exampleCount_ = new java.util.ArrayList(); + exampleCount_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - exampleCount_.add(input.readInt32()); + exampleCount_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2688,8 +2658,8 @@ private Row( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - exampleCount_ = java.util.Collections.unmodifiableList(exampleCount_); + if (((mutable_bitField0_ & 0x00000001) != 0)) { + exampleCount_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -2714,7 +2684,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int EXAMPLE_COUNT_FIELD_NUMBER = 1; - private java.util.List exampleCount_; + private com.google.protobuf.Internal.IntList exampleCount_; /** * * @@ -2755,7 +2725,7 @@ public int getExampleCountCount() { * repeated int32 example_count = 1; */ public int getExampleCount(int index) { - return exampleCount_.get(index); + return exampleCount_.getInt(index); } private int exampleCountMemoizedSerializedSize = -1; @@ -2781,7 +2751,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32NoTag(exampleCountMemoizedSerializedSize); } for (int i = 0; i < exampleCount_.size(); i++) { - output.writeInt32NoTag(exampleCount_.get(i)); + output.writeInt32NoTag(exampleCount_.getInt(i)); } unknownFields.writeTo(output); } @@ -2796,7 +2766,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < exampleCount_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(exampleCount_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + exampleCount_.getInt(i)); } size += dataSize; if (!getExampleCountList().isEmpty()) { @@ -2828,10 +2799,9 @@ public boolean equals(final java.lang.Object obj) { .ClassificationEvaluationMetrics.ConfusionMatrix.Row) obj; - boolean result = true; - result = result && getExampleCountList().equals(other.getExampleCountList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getExampleCountList().equals(other.getExampleCountList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3022,7 +2992,7 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - exampleCount_ = java.util.Collections.emptyList(); + exampleCount_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -3064,8 +3034,8 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { new com.google.cloud.automl.v1beta1.ClassificationProto .ClassificationEvaluationMetrics.ConfusionMatrix.Row(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - exampleCount_ = java.util.Collections.unmodifiableList(exampleCount_); + if (((bitField0_ & 0x00000001) != 0)) { + exampleCount_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.exampleCount_ = exampleCount_; @@ -3075,23 +3045,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @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 @@ -3099,13 +3069,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 @@ -3178,12 +3148,11 @@ public Builder mergeFrom( private int bitField0_; - private java.util.List exampleCount_ = - java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList exampleCount_ = emptyIntList(); private void ensureExampleCountIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - exampleCount_ = new java.util.ArrayList(exampleCount_); + if (!((bitField0_ & 0x00000001) != 0)) { + exampleCount_ = mutableCopy(exampleCount_); bitField0_ |= 0x00000001; } } @@ -3199,7 +3168,9 @@ private void ensureExampleCountIsMutable() { * repeated int32 example_count = 1; */ public java.util.List getExampleCountList() { - return java.util.Collections.unmodifiableList(exampleCount_); + return ((bitField0_ & 0x00000001) != 0) + ? java.util.Collections.unmodifiableList(exampleCount_) + : exampleCount_; } /** * @@ -3227,7 +3198,7 @@ public int getExampleCountCount() { * repeated int32 example_count = 1; */ public int getExampleCount(int index) { - return exampleCount_.get(index); + return exampleCount_.getInt(index); } /** * @@ -3242,7 +3213,7 @@ public int getExampleCount(int index) { */ public Builder setExampleCount(int index, int value) { ensureExampleCountIsMutable(); - exampleCount_.set(index, value); + exampleCount_.setInt(index, value); onChanged(); return this; } @@ -3259,7 +3230,7 @@ public Builder setExampleCount(int index, int value) { */ public Builder addExampleCount(int value) { ensureExampleCountIsMutable(); - exampleCount_.add(value); + exampleCount_.addInt(value); onChanged(); return this; } @@ -3293,7 +3264,7 @@ public Builder addAllExampleCount( * repeated int32 example_count = 1; */ public Builder clearExampleCount() { - exampleCount_ = java.util.Collections.emptyList(); + exampleCount_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; @@ -3302,7 +3273,7 @@ public Builder clearExampleCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3581,11 +3552,10 @@ public boolean equals(final java.lang.Object obj) { .ConfusionMatrix) obj; - boolean result = true; - result = result && getAnnotationSpecIdList().equals(other.getAnnotationSpecIdList()); - result = result && getRowList().equals(other.getRowList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationSpecIdList().equals(other.getAnnotationSpecIdList())) return false; + if (!getRowList().equals(other.getRowList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3828,13 +3798,13 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { new com.google.cloud.automl.v1beta1.ClassificationProto .ClassificationEvaluationMetrics.ConfusionMatrix(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationSpecId_ = annotationSpecId_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.annotationSpecId_ = annotationSpecId_; if (rowBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { row_ = java.util.Collections.unmodifiableList(row_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -3848,23 +3818,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @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 @@ -3872,13 +3842,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 @@ -3981,7 +3951,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAnnotationSpecIdIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationSpecId_ = new com.google.protobuf.LazyStringArrayList(annotationSpecId_); bitField0_ |= 0x00000001; } @@ -4126,7 +4096,7 @@ public Builder addAnnotationSpecIdBytes(com.google.protobuf.ByteString value) { row_ = java.util.Collections.emptyList(); private void ensureRowIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { row_ = new java.util.ArrayList< com.google.cloud.automl.v1beta1.ClassificationProto @@ -4632,10 +4602,7 @@ public Builder removeRow(int index) { .ClassificationEvaluationMetrics.ConfusionMatrix.Row.Builder, com.google.cloud.automl.v1beta1.ClassificationProto .ClassificationEvaluationMetrics.ConfusionMatrix.RowOrBuilder>( - row_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + row_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); row_ = null; } return rowBuilder_; @@ -4644,7 +4611,7 @@ public Builder removeRow(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 @@ -5016,24 +4983,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics other = (com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getAuPrc()) - == java.lang.Float.floatToIntBits(other.getAuPrc())); - result = - result - && (java.lang.Float.floatToIntBits(getBaseAuPrc()) - == java.lang.Float.floatToIntBits(other.getBaseAuPrc())); - result = - result && getConfidenceMetricsEntryList().equals(other.getConfidenceMetricsEntryList()); - result = result && (hasConfusionMatrix() == other.hasConfusionMatrix()); + if (java.lang.Float.floatToIntBits(getAuPrc()) + != java.lang.Float.floatToIntBits(other.getAuPrc())) return false; + if (java.lang.Float.floatToIntBits(getBaseAuPrc()) + != java.lang.Float.floatToIntBits(other.getBaseAuPrc())) return false; + if (!getConfidenceMetricsEntryList().equals(other.getConfidenceMetricsEntryList())) + return false; + if (hasConfusionMatrix() != other.hasConfusionMatrix()) return false; if (hasConfusionMatrix()) { - result = result && getConfusionMatrix().equals(other.getConfusionMatrix()); + if (!getConfusionMatrix().equals(other.getConfusionMatrix())) return false; } - result = result && getAnnotationSpecIdList().equals(other.getAnnotationSpecIdList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationSpecIdList().equals(other.getAnnotationSpecIdList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -5289,7 +5251,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.auPrc_ = auPrc_; result.baseAuPrc_ = baseAuPrc_; if (confidenceMetricsEntryBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { confidenceMetricsEntry_ = java.util.Collections.unmodifiableList(confidenceMetricsEntry_); bitField0_ = (bitField0_ & ~0x00000004); @@ -5303,7 +5265,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { } else { result.confusionMatrix_ = confusionMatrixBuilder_.build(); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { annotationSpecId_ = annotationSpecId_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } @@ -5315,23 +5277,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @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 @@ -5339,13 +5301,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 @@ -5542,7 +5504,7 @@ public Builder clearBaseAuPrc() { confidenceMetricsEntry_ = java.util.Collections.emptyList(); private void ensureConfidenceMetricsEntryIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { confidenceMetricsEntry_ = new java.util.ArrayList< com.google.cloud.automl.v1beta1.ClassificationProto @@ -5996,7 +5958,7 @@ public Builder removeConfidenceMetricsEntry(int index) { com.google.cloud.automl.v1beta1.ClassificationProto .ClassificationEvaluationMetrics.ConfidenceMetricsEntryOrBuilder>( confidenceMetricsEntry_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); confidenceMetricsEntry_ = null; @@ -6006,7 +5968,7 @@ public Builder removeConfidenceMetricsEntry(int index) { private com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics .ConfusionMatrix - confusionMatrix_ = null; + confusionMatrix_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics .ConfusionMatrix, @@ -6263,7 +6225,7 @@ public Builder clearConfusionMatrix() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAnnotationSpecIdIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { annotationSpecId_ = new com.google.protobuf.LazyStringArrayList(annotationSpecId_); bitField0_ |= 0x00000010; } @@ -6405,7 +6367,7 @@ public Builder addAnnotationSpecIdBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java index 30161c06e1c7..83a2a3ad5d0b 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java @@ -76,7 +76,7 @@ private CreateDatasetRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,14 +243,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.CreateDatasetRequest other = (com.google.cloud.automl.v1beta1.CreateDatasetRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDataset() == other.hasDataset()); + if (!getParent().equals(other.getParent())) return false; + if (hasDataset() != other.hasDataset()) return false; if (hasDataset()) { - result = result && getDataset().equals(other.getDataset()); + if (!getDataset().equals(other.getDataset())) 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 com.google.cloud.automl.v1beta1.CreateDatasetRequest 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 com.google.cloud.automl.v1beta1.Dataset dataset_ = null; + private com.google.cloud.automl.v1beta1.Dataset dataset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.Dataset, com.google.cloud.automl.v1beta1.Dataset.Builder, @@ -817,7 +816,7 @@ public com.google.cloud.automl.v1beta1.DatasetOrBuilder getDatasetOrBuilder() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java index 96dfa97515a0..0a0bc1b57908 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java @@ -49,7 +49,7 @@ private CreateModelOperationMetadata( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,9 +120,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.CreateModelOperationMetadata other = (com.google.cloud.automl.v1beta1.CreateModelOperationMetadata) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -312,35 +311,35 @@ public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata 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 @@ -389,7 +388,7 @@ public Builder mergeFrom( @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java index 3e8a6821dd1b..cc1f177045eb 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java @@ -76,7 +76,7 @@ private CreateModelRequest( } 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) { com.google.cloud.automl.v1beta1.CreateModelRequest other = (com.google.cloud.automl.v1beta1.CreateModelRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasModel() == other.hasModel()); + if (!getParent().equals(other.getParent())) return false; + if (hasModel() != other.hasModel()) return false; if (hasModel()) { - result = result && getModel().equals(other.getModel()); + if (!getModel().equals(other.getModel())) 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 com.google.cloud.automl.v1beta1.CreateModelRequest 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 @@ -632,7 +631,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.automl.v1beta1.Model model_ = null; + private com.google.cloud.automl.v1beta1.Model model_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.Model, com.google.cloud.automl.v1beta1.Model.Builder, @@ -811,7 +810,7 @@ public com.google.cloud.automl.v1beta1.ModelOrBuilder getModelOrBuilder() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java index d44b01ea0a7a..8681ae087620 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java @@ -26,7 +26,6 @@ private Dataset(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Dataset() { name_ = ""; displayName_ = ""; - exampleCount_ = 0; } @java.lang.Override @@ -155,7 +154,7 @@ private Dataset( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -627,38 +626,32 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.automl.v1beta1.Dataset other = (com.google.cloud.automl.v1beta1.Dataset) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && (getExampleCount() == other.getExampleCount()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (getExampleCount() != other.getExampleCount()) 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 && getDatasetMetadataCase().equals(other.getDatasetMetadataCase()); - if (!result) return false; + if (!getDatasetMetadataCase().equals(other.getDatasetMetadataCase())) return false; switch (datasetMetadataCase_) { case 23: - result = - result && getTranslationDatasetMetadata().equals(other.getTranslationDatasetMetadata()); + if (!getTranslationDatasetMetadata().equals(other.getTranslationDatasetMetadata())) + return false; break; case 24: - result = - result - && getImageClassificationDatasetMetadata() - .equals(other.getImageClassificationDatasetMetadata()); + if (!getImageClassificationDatasetMetadata() + .equals(other.getImageClassificationDatasetMetadata())) return false; break; case 25: - result = - result - && getTextClassificationDatasetMetadata() - .equals(other.getTextClassificationDatasetMetadata()); + if (!getTextClassificationDatasetMetadata() + .equals(other.getTextClassificationDatasetMetadata())) 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 @@ -917,35 +910,35 @@ public com.google.cloud.automl.v1beta1.Dataset 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 @@ -1991,7 +1984,7 @@ public Builder clearExampleCount() { 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, @@ -2172,7 +2165,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java index 46f259c19838..87227dde7788 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java @@ -60,7 +60,7 @@ private DeleteDatasetRequest( } 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) { com.google.cloud.automl.v1beta1.DeleteDatasetRequest other = (com.google.cloud.automl.v1beta1.DeleteDatasetRequest) 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 com.google.cloud.automl.v1beta1.DeleteDatasetRequest 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 @@ -551,7 +550,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java index 4de9ec482ac2..662dd089c07f 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java @@ -60,7 +60,7 @@ private DeleteModelRequest( } 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) { com.google.cloud.automl.v1beta1.DeleteModelRequest other = (com.google.cloud.automl.v1beta1.DeleteModelRequest) 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 com.google.cloud.automl.v1beta1.DeleteModelRequest 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 @@ -551,7 +550,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java index 580022a4b147..945633f53c31 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java @@ -60,7 +60,7 @@ private DeployModelRequest( } 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) { com.google.cloud.automl.v1beta1.DeployModelRequest other = (com.google.cloud.automl.v1beta1.DeployModelRequest) 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 com.google.cloud.automl.v1beta1.DeployModelRequest 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 @@ -551,7 +550,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java index 576896cecbd0..59d97f7359d3 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java @@ -82,7 +82,7 @@ private ExamplePayload( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,21 +297,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ExamplePayload other = (com.google.cloud.automl.v1beta1.ExamplePayload) obj; - boolean result = true; - result = result && getPayloadCase().equals(other.getPayloadCase()); - if (!result) return false; + if (!getPayloadCase().equals(other.getPayloadCase())) return false; switch (payloadCase_) { case 1: - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; break; case 2: - result = result && getTextSnippet().equals(other.getTextSnippet()); + if (!getTextSnippet().equals(other.getTextSnippet())) 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 @@ -528,35 +526,35 @@ public com.google.cloud.automl.v1beta1.ExamplePayload 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 @@ -1035,7 +1033,7 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTextSnippetOrBuil @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java index 719b0314cba4..de4f16751684 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java @@ -76,7 +76,7 @@ private ExportDataRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,14 +243,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ExportDataRequest other = (com.google.cloud.automl.v1beta1.ExportDataRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasOutputConfig() == other.hasOutputConfig()); + if (!getName().equals(other.getName())) 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 @@ -459,35 +458,35 @@ public com.google.cloud.automl.v1beta1.ExportDataRequest 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 setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.automl.v1beta1.OutputConfig outputConfig_ = null; + private com.google.cloud.automl.v1beta1.OutputConfig outputConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.OutputConfig, com.google.cloud.automl.v1beta1.OutputConfig.Builder, @@ -818,7 +817,7 @@ public com.google.cloud.automl.v1beta1.OutputConfigOrBuilder getOutputConfigOrBu @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java index 44b861b46d41..3a399ea2d2db 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java @@ -59,7 +59,7 @@ private GcsDestination( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -189,10 +189,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.GcsDestination other = (com.google.cloud.automl.v1beta1.GcsDestination) obj; - boolean result = true; - result = result && getOutputUriPrefix().equals(other.getOutputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUriPrefix().equals(other.getOutputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -385,35 +384,35 @@ public com.google.cloud.automl.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 @@ -582,7 +581,7 @@ public Builder setOutputUriPrefixBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java index 4ce56d1feb28..398f6a77895e 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java @@ -53,7 +53,7 @@ private GcsSource( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { inputUris_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private GcsSource( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private GcsSource( } 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)) { inputUris_ = inputUris_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.GcsSource other = (com.google.cloud.automl.v1beta1.GcsSource) obj; - boolean result = true; - result = result && getInputUrisList().equals(other.getInputUrisList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInputUrisList().equals(other.getInputUrisList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -398,7 +397,7 @@ public com.google.cloud.automl.v1beta1.GcsSource buildPartial() { com.google.cloud.automl.v1beta1.GcsSource result = new com.google.cloud.automl.v1beta1.GcsSource(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { inputUris_ = inputUris_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -409,35 +408,35 @@ public com.google.cloud.automl.v1beta1.GcsSource 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 @@ -497,7 +496,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInputUrisIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { inputUris_ = new com.google.protobuf.LazyStringArrayList(inputUris_); bitField0_ |= 0x00000001; } @@ -656,7 +655,7 @@ public Builder addInputUrisBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java index 9068dcbf0c05..2fcb73174729 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java @@ -60,7 +60,7 @@ private GetDatasetRequest( } 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) { com.google.cloud.automl.v1beta1.GetDatasetRequest other = (com.google.cloud.automl.v1beta1.GetDatasetRequest) 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 com.google.cloud.automl.v1beta1.GetDatasetRequest 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 @@ -551,7 +550,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java index 3590626025f3..da5bb85e5c1e 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java @@ -60,7 +60,7 @@ private GetModelEvaluationRequest( } 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) { com.google.cloud.automl.v1beta1.GetModelEvaluationRequest other = (com.google.cloud.automl.v1beta1.GetModelEvaluationRequest) 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.cloud.automl.v1beta1.GetModelEvaluationRequest 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 @@ -552,7 +551,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java index d912a639a4d6..139e3b4f98b5 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java @@ -60,7 +60,7 @@ private GetModelRequest( } 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) { com.google.cloud.automl.v1beta1.GetModelRequest other = (com.google.cloud.automl.v1beta1.GetModelRequest) 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 com.google.cloud.automl.v1beta1.GetModelRequest 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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java index 5b50f041ddf2..82534939f561 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java @@ -81,7 +81,7 @@ private Image( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -319,22 +319,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.automl.v1beta1.Image other = (com.google.cloud.automl.v1beta1.Image) obj; - boolean result = true; - result = result && getThumbnailUri().equals(other.getThumbnailUri()); - result = result && getDataCase().equals(other.getDataCase()); - if (!result) return false; + if (!getThumbnailUri().equals(other.getThumbnailUri())) return false; + if (!getDataCase().equals(other.getDataCase())) return false; switch (dataCase_) { case 1: - result = result && getImageBytes().equals(other.getImageBytes()); + if (!getImageBytes().equals(other.getImageBytes())) return false; break; case 6: - result = result && getInputConfig().equals(other.getInputConfig()); + if (!getInputConfig().equals(other.getInputConfig())) 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 @@ -551,35 +549,35 @@ public com.google.cloud.automl.v1beta1.Image 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 @@ -1012,7 +1010,7 @@ public Builder setThumbnailUriBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java index 9933ff53fadc..04e2e43a9b59 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java @@ -60,7 +60,7 @@ private ImageClassificationDatasetMetadata( } 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) { com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata other = (com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata) obj; - boolean result = true; - result = result && classificationType_ == other.classificationType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (classificationType_ != other.classificationType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata buildP @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 @@ -549,7 +548,7 @@ public Builder clearClassificationType() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java index 499e4db9c76e..8d9de6fcdf59 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java @@ -25,8 +25,6 @@ private ImageClassificationModelMetadata( private ImageClassificationModelMetadata() { baseModelId_ = ""; - trainBudget_ = 0L; - trainCost_ = 0L; stopReason_ = ""; } @@ -80,7 +78,7 @@ private ImageClassificationModelMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -302,13 +300,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata other = (com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata) obj; - boolean result = true; - result = result && getBaseModelId().equals(other.getBaseModelId()); - result = result && (getTrainBudget() == other.getTrainBudget()); - result = result && (getTrainCost() == other.getTrainCost()); - result = result && getStopReason().equals(other.getStopReason()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBaseModelId().equals(other.getBaseModelId())) return false; + if (getTrainBudget() != other.getTrainBudget()) return false; + if (getTrainCost() != other.getTrainCost()) return false; + if (!getStopReason().equals(other.getStopReason())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -518,35 +515,35 @@ public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata buildPar @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override 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 @@ -916,7 +913,7 @@ public Builder setStopReasonBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java index c7a26b7a3c56..421be2cbdb22 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java @@ -76,7 +76,7 @@ private ImportDataRequest( } 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) { com.google.cloud.automl.v1beta1.ImportDataRequest other = (com.google.cloud.automl.v1beta1.ImportDataRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasInputConfig() == other.hasInputConfig()); + if (!getName().equals(other.getName())) return false; + if (hasInputConfig() != other.hasInputConfig()) return false; if (hasInputConfig()) { - result = result && getInputConfig().equals(other.getInputConfig()); + if (!getInputConfig().equals(other.getInputConfig())) 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.cloud.automl.v1beta1.ImportDataRequest 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 @@ -641,7 +640,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.automl.v1beta1.InputConfig inputConfig_ = null; + private com.google.cloud.automl.v1beta1.InputConfig inputConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.InputConfig, com.google.cloud.automl.v1beta1.InputConfig.Builder, @@ -825,7 +824,7 @@ public com.google.cloud.automl.v1beta1.InputConfigOrBuilder getInputConfigOrBuil @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java index a2b44f3aaddb..92fc9220a63f 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java @@ -66,7 +66,7 @@ private InputConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -226,18 +226,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.InputConfig other = (com.google.cloud.automl.v1beta1.InputConfig) obj; - boolean result = true; - result = result && getSourceCase().equals(other.getSourceCase()); - if (!result) return false; + if (!getSourceCase().equals(other.getSourceCase())) return false; switch (sourceCase_) { case 1: - result = result && getGcsSource().equals(other.getGcsSource()); + if (!getGcsSource().equals(other.getGcsSource())) 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 @@ -443,35 +441,35 @@ public com.google.cloud.automl.v1beta1.InputConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -743,7 +741,7 @@ public com.google.cloud.automl.v1beta1.GcsSourceOrBuilder getGcsSourceOrBuilder( @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java index 4a58d7e17300..e1b63362c182 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java @@ -26,7 +26,6 @@ private ListDatasetsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ListDatasetsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListDatasetsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -340,13 +339,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListDatasetsRequest other = (com.google.cloud.automl.v1beta1.ListDatasetsRequest) 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 @@ -555,35 +553,35 @@ public com.google.cloud.automl.v1beta1.ListDatasetsRequest 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 @@ -1020,7 +1018,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java index ac7c0e0ccd3e..1f1135ac0685 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java @@ -54,7 +54,7 @@ private ListDatasetsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { datasets_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListDatasetsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListDatasetsResponse( } 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)) { datasets_ = java.util.Collections.unmodifiableList(datasets_); } this.unknownFields = unknownFields.build(); @@ -272,11 +272,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListDatasetsResponse other = (com.google.cloud.automl.v1beta1.ListDatasetsResponse) obj; - boolean result = true; - result = result && getDatasetsList().equals(other.getDatasetsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatasetsList().equals(other.getDatasetsList())) 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.cloud.automl.v1beta1.ListDatasetsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (datasetsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { datasets_ = java.util.Collections.unmodifiableList(datasets_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -494,35 +493,35 @@ public com.google.cloud.automl.v1beta1.ListDatasetsResponse 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 @@ -605,7 +604,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDatasetsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { datasets_ = new java.util.ArrayList(datasets_); bitField0_ |= 0x00000001; } @@ -944,10 +943,7 @@ public com.google.cloud.automl.v1beta1.Dataset.Builder addDatasetsBuilder(int in com.google.cloud.automl.v1beta1.Dataset, com.google.cloud.automl.v1beta1.Dataset.Builder, com.google.cloud.automl.v1beta1.DatasetOrBuilder>( - datasets_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + datasets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); datasets_ = null; } return datasetsBuilder_; @@ -1064,7 +1060,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java index 90123ca1aca6..e342e1380c6c 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java @@ -26,7 +26,6 @@ private ListModelEvaluationsRequest(com.google.protobuf.GeneratedMessageV3.Build private ListModelEvaluationsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListModelEvaluationsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -347,13 +346,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest other = (com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest) 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 @@ -563,35 +561,35 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest 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 @@ -1045,7 +1043,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java index 5fce80cc84ea..b17bcef44c79 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java @@ -54,7 +54,7 @@ private ListModelEvaluationsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { modelEvaluation_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListModelEvaluationsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListModelEvaluationsResponse( } 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)) { modelEvaluation_ = java.util.Collections.unmodifiableList(modelEvaluation_); } this.unknownFields = unknownFields.build(); @@ -270,11 +270,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse other = (com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse) obj; - boolean result = true; - result = result && getModelEvaluationList().equals(other.getModelEvaluationList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModelEvaluationList().equals(other.getModelEvaluationList())) 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.cloud.automl.v1beta1.ListModelEvaluationsResponse buildPartial int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (modelEvaluationBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { modelEvaluation_ = java.util.Collections.unmodifiableList(modelEvaluation_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -494,35 +493,35 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse 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 ensureModelEvaluationIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { modelEvaluation_ = new java.util.ArrayList( modelEvaluation_); @@ -955,7 +954,7 @@ public com.google.cloud.automl.v1beta1.ModelEvaluation.Builder addModelEvaluatio com.google.cloud.automl.v1beta1.ModelEvaluation.Builder, com.google.cloud.automl.v1beta1.ModelEvaluationOrBuilder>( modelEvaluation_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); modelEvaluation_ = null; @@ -1064,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java index a3d5b639da41..3046a374872f 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java @@ -26,7 +26,6 @@ private ListModelsRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private ListModelsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListModelsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -343,13 +342,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListModelsRequest other = (com.google.cloud.automl.v1beta1.ListModelsRequest) 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 @@ -558,35 +556,35 @@ public com.google.cloud.automl.v1beta1.ListModelsRequest 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 @@ -1030,7 +1028,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java index 509910b5da34..a62e4e7edd8b 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java @@ -54,7 +54,7 @@ private ListModelsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { model_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListModelsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListModelsResponse( } 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)) { model_ = java.util.Collections.unmodifiableList(model_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ListModelsResponse other = (com.google.cloud.automl.v1beta1.ListModelsResponse) obj; - boolean result = true; - result = result && getModelList().equals(other.getModelList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModelList().equals(other.getModelList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public com.google.cloud.automl.v1beta1.ListModelsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (modelBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { model_ = java.util.Collections.unmodifiableList(model_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -490,35 +489,35 @@ public com.google.cloud.automl.v1beta1.ListModelsResponse 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 @@ -601,7 +600,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureModelIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { model_ = new java.util.ArrayList(model_); bitField0_ |= 0x00000001; } @@ -939,10 +938,7 @@ public java.util.List getModelBui com.google.cloud.automl.v1beta1.Model, com.google.cloud.automl.v1beta1.Model.Builder, com.google.cloud.automl.v1beta1.ModelOrBuilder>( - model_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + model_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); model_ = null; } return modelBuilder_; @@ -1049,7 +1045,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java index 38b43dd330ba..66fe9ab9a55d 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java @@ -179,7 +179,7 @@ private Model( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -920,43 +920,37 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.automl.v1beta1.Model other = (com.google.cloud.automl.v1beta1.Model) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDatasetId().equals(other.getDatasetId()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDatasetId().equals(other.getDatasetId())) 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 && deploymentState_ == other.deploymentState_; - result = result && getModelMetadataCase().equals(other.getModelMetadataCase()); - if (!result) return false; + if (deploymentState_ != other.deploymentState_) return false; + if (!getModelMetadataCase().equals(other.getModelMetadataCase())) return false; switch (modelMetadataCase_) { case 13: - result = - result - && getImageClassificationModelMetadata() - .equals(other.getImageClassificationModelMetadata()); + if (!getImageClassificationModelMetadata() + .equals(other.getImageClassificationModelMetadata())) return false; break; case 14: - result = - result - && getTextClassificationModelMetadata() - .equals(other.getTextClassificationModelMetadata()); + if (!getTextClassificationModelMetadata() + .equals(other.getTextClassificationModelMetadata())) return false; break; case 15: - result = - result && getTranslationModelMetadata().equals(other.getTranslationModelMetadata()); + if (!getTranslationModelMetadata().equals(other.getTranslationModelMetadata())) + 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 @@ -1233,35 +1227,35 @@ public com.google.cloud.automl.v1beta1.Model 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 @@ -2361,7 +2355,7 @@ public Builder setDatasetIdBytes(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, @@ -2549,7 +2543,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, @@ -2817,7 +2811,7 @@ public Builder clearDeploymentState() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java index 8b1fcc08401b..5256e44e4080 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java @@ -25,7 +25,6 @@ private ModelEvaluation(com.google.protobuf.GeneratedMessageV3.Builder builde private ModelEvaluation() { name_ = ""; annotationSpecId_ = ""; - evaluatedExampleCount_ = 0; } @java.lang.Override @@ -136,7 +135,7 @@ private ModelEvaluation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -561,34 +560,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.ModelEvaluation other = (com.google.cloud.automl.v1beta1.ModelEvaluation) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getAnnotationSpecId().equals(other.getAnnotationSpecId()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getAnnotationSpecId().equals(other.getAnnotationSpecId())) 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 && (getEvaluatedExampleCount() == other.getEvaluatedExampleCount()); - result = result && getMetricsCase().equals(other.getMetricsCase()); - if (!result) return false; + if (getEvaluatedExampleCount() != other.getEvaluatedExampleCount()) return false; + if (!getMetricsCase().equals(other.getMetricsCase())) return false; switch (metricsCase_) { case 8: - result = - result - && getClassificationEvaluationMetrics() - .equals(other.getClassificationEvaluationMetrics()); + if (!getClassificationEvaluationMetrics() + .equals(other.getClassificationEvaluationMetrics())) return false; break; case 9: - result = - result - && getTranslationEvaluationMetrics() - .equals(other.getTranslationEvaluationMetrics()); + if (!getTranslationEvaluationMetrics().equals(other.getTranslationEvaluationMetrics())) + 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 @@ -835,35 +828,35 @@ public com.google.cloud.automl.v1beta1.ModelEvaluation 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 @@ -1658,7 +1651,7 @@ public Builder setAnnotationSpecIdBytes(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, @@ -1892,7 +1885,7 @@ public Builder clearEvaluatedExampleCount() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java index 570cb431e888..50d5a3c579b7 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java @@ -23,7 +23,6 @@ private OperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder buil } private OperationMetadata() { - progressPercent_ = 0; partialFailures_ = java.util.Collections.emptyList(); } @@ -53,7 +52,7 @@ private OperationMetadata( break; case 18: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { partialFailures_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -119,7 +118,7 @@ private OperationMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -131,7 +130,7 @@ private OperationMetadata( } 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)) { partialFailures_ = java.util.Collections.unmodifiableList(partialFailures_); } this.unknownFields = unknownFields.build(); @@ -484,28 +483,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.OperationMetadata other = (com.google.cloud.automl.v1beta1.OperationMetadata) obj; - boolean result = true; - result = result && (getProgressPercent() == other.getProgressPercent()); - result = result && getPartialFailuresList().equals(other.getPartialFailuresList()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (getProgressPercent() != other.getProgressPercent()) return false; + if (!getPartialFailuresList().equals(other.getPartialFailuresList())) 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 10: - result = result && getCreateModelDetails().equals(other.getCreateModelDetails()); + if (!getCreateModelDetails().equals(other.getCreateModelDetails())) 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 @@ -744,7 +741,7 @@ public com.google.cloud.automl.v1beta1.OperationMetadata buildPartial() { } result.progressPercent_ = progressPercent_; if (partialFailuresBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { partialFailures_ = java.util.Collections.unmodifiableList(partialFailures_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -770,35 +767,35 @@ public com.google.cloud.automl.v1beta1.OperationMetadata 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 @@ -1173,7 +1170,7 @@ public Builder clearProgressPercent() { java.util.Collections.emptyList(); private void ensurePartialFailuresIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { partialFailures_ = new java.util.ArrayList(partialFailures_); bitField0_ |= 0x00000004; } @@ -1560,7 +1557,7 @@ public java.util.List getPartialFailuresBuilderLi com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>( partialFailures_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); partialFailures_ = null; @@ -1568,7 +1565,7 @@ public java.util.List getPartialFailuresBuilderLi return partialFailuresBuilder_; } - 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, @@ -1747,7 +1744,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, @@ -1928,7 +1925,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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java index 46424fffe4a1..4aa5ce84704e 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/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.automl.v1beta1.OutputConfig other = (com.google.cloud.automl.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.automl.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 @@ -746,7 +744,7 @@ public com.google.cloud.automl.v1beta1.GcsDestinationOrBuilder getGcsDestination @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java index 301a8602bc8c..a98823a86861 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java @@ -76,7 +76,7 @@ private PredictRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { params_ = com.google.protobuf.MapField.newMapField(ParamsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000004; @@ -89,7 +89,7 @@ private PredictRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -403,15 +403,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.PredictRequest other = (com.google.cloud.automl.v1beta1.PredictRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasPayload() == other.hasPayload()); + if (!getName().equals(other.getName())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && internalGetParams().equals(other.internalGetParams()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetParams().equals(other.internalGetParams())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -650,35 +649,35 @@ public com.google.cloud.automl.v1beta1.PredictRequest 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 @@ -826,7 +825,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.automl.v1beta1.ExamplePayload payload_ = null; + private com.google.cloud.automl.v1beta1.ExamplePayload payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.ExamplePayload, com.google.cloud.automl.v1beta1.ExamplePayload.Builder, @@ -1222,7 +1221,7 @@ public Builder putAllParams(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java index a9dad4d8bcad..93603ada205d 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java @@ -56,7 +56,7 @@ private PredictResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { payload_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -69,7 +69,7 @@ private PredictResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { metadata_ = com.google.protobuf.MapField.newMapField( MetadataDefaultEntryHolder.defaultEntry); @@ -84,7 +84,7 @@ private PredictResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +96,7 @@ private PredictResponse( } 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)) { payload_ = java.util.Collections.unmodifiableList(payload_); } this.unknownFields = unknownFields.build(); @@ -345,11 +345,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.PredictResponse other = (com.google.cloud.automl.v1beta1.PredictResponse) obj; - boolean result = true; - result = result && getPayloadList().equals(other.getPayloadList()); - result = result && internalGetMetadata().equals(other.internalGetMetadata()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPayloadList().equals(other.getPayloadList())) return false; + if (!internalGetMetadata().equals(other.internalGetMetadata())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -574,7 +573,7 @@ public com.google.cloud.automl.v1beta1.PredictResponse buildPartial() { new com.google.cloud.automl.v1beta1.PredictResponse(this); int from_bitField0_ = bitField0_; if (payloadBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { payload_ = java.util.Collections.unmodifiableList(payload_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -590,35 +589,35 @@ public com.google.cloud.automl.v1beta1.PredictResponse 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 @@ -697,7 +696,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensurePayloadIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { payload_ = new java.util.ArrayList(payload_); bitField0_ |= 0x00000001; @@ -1040,10 +1039,7 @@ public com.google.cloud.automl.v1beta1.AnnotationPayload.Builder addPayloadBuild com.google.cloud.automl.v1beta1.AnnotationPayload, com.google.cloud.automl.v1beta1.AnnotationPayload.Builder, com.google.cloud.automl.v1beta1.AnnotationPayloadOrBuilder>( - payload_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + payload_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); payload_ = null; } return payloadBuilder_; @@ -1204,7 +1200,7 @@ public Builder putAllMetadata(java.util.Map @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java index c93dd37ee2e0..12852b7fdc6f 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java @@ -60,7 +60,7 @@ private TextClassificationDatasetMetadata( } 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) { com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata other = (com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata) obj; - boolean result = true; - result = result && classificationType_ == other.classificationType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (classificationType_ != other.classificationType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata buildPa @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 @@ -547,7 +546,7 @@ public Builder clearClassificationType() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java index 80e970d1dec4..587fdd95bdd8 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java @@ -50,7 +50,7 @@ private TextClassificationModelMetadata( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TextClassificationModelMetadata other = (com.google.cloud.automl.v1beta1.TextClassificationModelMetadata) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -313,35 +312,35 @@ public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata buildPart @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 @@ -392,7 +391,7 @@ public Builder mergeFrom( @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java index 647140035834..647dd8c314db 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java @@ -75,7 +75,7 @@ private TextSnippet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -301,12 +301,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TextSnippet other = (com.google.cloud.automl.v1beta1.TextSnippet) obj; - boolean result = true; - result = result && getContent().equals(other.getContent()); - result = result && getMimeType().equals(other.getMimeType()); - result = result && getContentUri().equals(other.getContentUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getContent().equals(other.getContent())) return false; + if (!getMimeType().equals(other.getMimeType())) return false; + if (!getContentUri().equals(other.getContentUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -509,35 +508,35 @@ public com.google.cloud.automl.v1beta1.TextSnippet 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 @@ -897,7 +896,7 @@ public Builder setContentUriBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java index 6e8c07b0b11a..1126a698639b 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java @@ -66,7 +66,7 @@ private TranslationAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,13 +184,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TranslationAnnotation other = (com.google.cloud.automl.v1beta1.TranslationAnnotation) obj; - boolean result = true; - result = result && (hasTranslatedContent() == other.hasTranslatedContent()); + if (hasTranslatedContent() != other.hasTranslatedContent()) return false; if (hasTranslatedContent()) { - result = result && getTranslatedContent().equals(other.getTranslatedContent()); + if (!getTranslatedContent().equals(other.getTranslatedContent())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -394,35 +393,35 @@ public com.google.cloud.automl.v1beta1.TranslationAnnotation 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 @@ -471,7 +470,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.automl.v1beta1.TextSnippet translatedContent_ = null; + private com.google.cloud.automl.v1beta1.TextSnippet translatedContent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.automl.v1beta1.TextSnippet, com.google.cloud.automl.v1beta1.TextSnippet.Builder, @@ -655,7 +654,7 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTranslatedContent @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java index 7e437b76dcde..0bcd4893f865 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java @@ -67,7 +67,7 @@ private TranslationDatasetMetadata( } 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) { com.google.cloud.automl.v1beta1.TranslationDatasetMetadata other = (com.google.cloud.automl.v1beta1.TranslationDatasetMetadata) obj; - boolean result = true; - result = result && getSourceLanguageCode().equals(other.getSourceLanguageCode()); - result = result && getTargetLanguageCode().equals(other.getTargetLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSourceLanguageCode().equals(other.getSourceLanguageCode())) return false; + if (!getTargetLanguageCode().equals(other.getTargetLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -439,35 +438,35 @@ public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata 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 setTargetLanguageCodeBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java index 169e66484eea..8cc1710583e3 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java @@ -22,10 +22,7 @@ private TranslationEvaluationMetrics(com.google.protobuf.GeneratedMessageV3.Buil super(builder); } - private TranslationEvaluationMetrics() { - bleuScore_ = 0D; - baseBleuScore_ = 0D; - } + private TranslationEvaluationMetrics() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private TranslationEvaluationMetrics( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -176,17 +173,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics other = (com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics) obj; - boolean result = true; - result = - result - && (java.lang.Double.doubleToLongBits(getBleuScore()) - == java.lang.Double.doubleToLongBits(other.getBleuScore())); - result = - result - && (java.lang.Double.doubleToLongBits(getBaseBleuScore()) - == java.lang.Double.doubleToLongBits(other.getBaseBleuScore())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Double.doubleToLongBits(getBleuScore()) + != java.lang.Double.doubleToLongBits(other.getBleuScore())) return false; + if (java.lang.Double.doubleToLongBits(getBaseBleuScore()) + != java.lang.Double.doubleToLongBits(other.getBaseBleuScore())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -392,35 +384,35 @@ public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics 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 +555,7 @@ public Builder clearBaseBleuScore() { @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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java index b31360d736f7..29cdf867a4fc 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java @@ -75,7 +75,7 @@ private TranslationModelMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -303,12 +303,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TranslationModelMetadata other = (com.google.cloud.automl.v1beta1.TranslationModelMetadata) obj; - boolean result = true; - result = result && getBaseModel().equals(other.getBaseModel()); - result = result && getSourceLanguageCode().equals(other.getSourceLanguageCode()); - result = result && getTargetLanguageCode().equals(other.getTargetLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBaseModel().equals(other.getBaseModel())) return false; + if (!getSourceLanguageCode().equals(other.getSourceLanguageCode())) return false; + if (!getTargetLanguageCode().equals(other.getTargetLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -512,35 +511,35 @@ public com.google.cloud.automl.v1beta1.TranslationModelMetadata 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 @@ -907,7 +906,7 @@ public Builder setTargetLanguageCodeBytes(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-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java index 9ae82011174d..ba666ecfaf87 100644 --- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java +++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java @@ -60,7 +60,7 @@ private UndeployModelRequest( } 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) { com.google.cloud.automl.v1beta1.UndeployModelRequest other = (com.google.cloud.automl.v1beta1.UndeployModelRequest) 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 com.google.cloud.automl.v1beta1.UndeployModelRequest 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 @@ -551,7 +550,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-automl/synth.metadata b/google-cloud-clients/google-cloud-automl/synth.metadata index 9b5b450d8b9e..0edc88b4991a 100644 --- a/google-cloud-clients/google-cloud-automl/synth.metadata +++ b/google-cloud-clients/google-cloud-automl/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:34:19.773920Z", + "updateTime": "2019-03-30T07:33:58.329407Z", "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": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],