diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java index c039b88be8e2..9831da6a2c7b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -430,7 +429,7 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoProgress buildPartial( new com.google.cloud.videointelligence.v1.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -444,35 +443,35 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoProgress 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 mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList( annotationProgress_); @@ -946,7 +945,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -956,7 +955,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java index 3556e77139a0..2ec57ad2f241 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -124,7 +124,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -549,18 +549,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -779,7 +778,7 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoRequest buildPartial() int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -798,35 +797,35 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoRequest 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 @@ -1097,7 +1096,7 @@ public Builder clearInputContent() { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1281,7 +1280,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.VideoContext, com.google.cloud.videointelligence.v1.VideoContext.Builder, @@ -1688,7 +1687,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java index e34d19baae61..08404b9a0da0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -430,7 +429,7 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoResponse buildPartial( new com.google.cloud.videointelligence.v1.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -444,35 +443,35 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoResponse 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 mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList( annotationResults_); @@ -946,7 +945,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -956,7 +955,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java index 6cf25f1dc17a..41fa5270dd03 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java @@ -75,7 +75,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,12 +297,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.Entity other = (com.google.cloud.videointelligence.v1.Entity) obj; - boolean result = true; - result = result && getEntityId().equals(other.getEntityId()); - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityId().equals(other.getEntityId())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,35 +504,35 @@ public com.google.cloud.videointelligence.v1.Entity 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 @@ -883,7 +882,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java index 5b40324d447e..c15e8a2fff83 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java @@ -54,7 +54,7 @@ private ExplicitContentAnnotation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.ExplicitContentFrame>(); @@ -68,7 +68,7 @@ private ExplicitContentAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private ExplicitContentAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -215,10 +215,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ExplicitContentAnnotation other = (com.google.cloud.videointelligence.v1.ExplicitContentAnnotation) obj; - boolean result = true; - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -418,7 +417,7 @@ public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation buildPart new com.google.cloud.videointelligence.v1.ExplicitContentAnnotation(this); int from_bitField0_ = bitField0_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -432,35 +431,35 @@ public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation 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 @@ -542,7 +541,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -897,10 +896,7 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame.Builder addFra com.google.cloud.videointelligence.v1.ExplicitContentFrame, com.google.cloud.videointelligence.v1.ExplicitContentFrame.Builder, com.google.cloud.videointelligence.v1.ExplicitContentFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -908,7 +904,7 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame.Builder addFra @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java index 1b5053676513..81fc28c5c164 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java @@ -60,7 +60,7 @@ private ExplicitContentDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -385,35 +384,35 @@ public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig buil @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 @@ -573,7 +572,7 @@ public Builder setModelBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java index f2b5b48a8a33..28b3e36b2db2 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java @@ -74,7 +74,7 @@ private ExplicitContentFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -231,14 +231,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ExplicitContentFrame other = (com.google.cloud.videointelligence.v1.ExplicitContentFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && pornographyLikelihood_ == other.pornographyLikelihood_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (pornographyLikelihood_ != other.pornographyLikelihood_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -447,35 +446,35 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -527,7 +526,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -796,7 +795,7 @@ public Builder clearPornographyLikelihood() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java index 34b950f50307..c9b5702544a7 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java @@ -59,7 +59,7 @@ private FaceAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -72,7 +72,7 @@ private FaceAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -84,7 +84,7 @@ private FaceAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,10 +96,10 @@ private FaceAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -324,12 +324,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.FaceAnnotation other = (com.google.cloud.videointelligence.v1.FaceAnnotation) obj; - boolean result = true; - result = result && getThumbnail().equals(other.getThumbnail()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getThumbnail().equals(other.getThumbnail())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -542,7 +541,7 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation buildPartial() { int to_bitField0_ = 0; result.thumbnail_ = thumbnail_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -551,7 +550,7 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation buildPartial() { result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -566,35 +565,35 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation 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 @@ -750,7 +749,7 @@ public Builder clearThumbnail() { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList(segments_); bitField0_ |= 0x00000002; @@ -1093,10 +1092,7 @@ public com.google.cloud.videointelligence.v1.FaceSegment.Builder addSegmentsBuil com.google.cloud.videointelligence.v1.FaceSegment, com.google.cloud.videointelligence.v1.FaceSegment.Builder, com.google.cloud.videointelligence.v1.FaceSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1106,7 +1102,7 @@ public com.google.cloud.videointelligence.v1.FaceSegment.Builder addSegmentsBuil java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(frames_); bitField0_ |= 0x00000004; } @@ -1446,10 +1442,7 @@ public com.google.cloud.videointelligence.v1.FaceFrame.Builder addFramesBuilder( com.google.cloud.videointelligence.v1.FaceFrame, com.google.cloud.videointelligence.v1.FaceFrame.Builder, com.google.cloud.videointelligence.v1.FaceFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1457,7 +1450,7 @@ public com.google.cloud.videointelligence.v1.FaceFrame.Builder addFramesBuilder( @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java index b2d743478a36..aef15bddf2f4 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java @@ -24,7 +24,6 @@ private FaceDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder bu private FaceDetectionConfig() { model_ = ""; - includeBoundingBoxes_ = false; } @java.lang.Override @@ -65,7 +64,7 @@ private FaceDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -210,11 +209,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.FaceDetectionConfig other = (com.google.cloud.videointelligence.v1.FaceDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && (getIncludeBoundingBoxes() == other.getIncludeBoundingBoxes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (getIncludeBoundingBoxes() != other.getIncludeBoundingBoxes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -413,35 +411,35 @@ public com.google.cloud.videointelligence.v1.FaceDetectionConfig 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 @@ -644,7 +642,7 @@ public Builder clearIncludeBoundingBoxes() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java index 7a0beda0912d..c11109cf6072 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java @@ -52,7 +52,7 @@ private FaceFrame( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.NormalizedBoundingBox>(); @@ -81,7 +81,7 @@ private FaceFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -93,7 +93,7 @@ private FaceFrame( } 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)) { normalizedBoundingBoxes_ = java.util.Collections.unmodifiableList(normalizedBoundingBoxes_); } this.unknownFields = unknownFields.build(); @@ -301,15 +301,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.FaceFrame other = (com.google.cloud.videointelligence.v1.FaceFrame) obj; - boolean result = true; - result = - result && getNormalizedBoundingBoxesList().equals(other.getNormalizedBoundingBoxesList()); - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (!getNormalizedBoundingBoxesList().equals(other.getNormalizedBoundingBoxesList())) + return false; + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -516,7 +515,7 @@ public com.google.cloud.videointelligence.v1.FaceFrame buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (normalizedBoundingBoxesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = java.util.Collections.unmodifiableList(normalizedBoundingBoxes_); bitField0_ = (bitField0_ & ~0x00000001); @@ -537,35 +536,35 @@ public com.google.cloud.videointelligence.v1.FaceFrame 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 @@ -646,7 +645,7 @@ public Builder mergeFrom( normalizedBoundingBoxes_ = java.util.Collections.emptyList(); private void ensureNormalizedBoundingBoxesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = new java.util.ArrayList( normalizedBoundingBoxes_); @@ -1077,7 +1076,7 @@ public Builder removeNormalizedBoundingBoxes(int index) { com.google.cloud.videointelligence.v1.NormalizedBoundingBox.Builder, com.google.cloud.videointelligence.v1.NormalizedBoundingBoxOrBuilder>( normalizedBoundingBoxes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); normalizedBoundingBoxes_ = null; @@ -1085,7 +1084,7 @@ public Builder removeNormalizedBoundingBoxes(int index) { return normalizedBoundingBoxesBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1275,7 +1274,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java index 8c1afb35f5cd..ba306328a4f0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java @@ -67,7 +67,7 @@ private FaceSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,13 +185,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.FaceSegment other = (com.google.cloud.videointelligence.v1.FaceSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) 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.videointelligence.v1.FaceSegment 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.videointelligence.v1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.VideoSegment, com.google.cloud.videointelligence.v1.VideoSegment.Builder, @@ -655,7 +654,7 @@ public com.google.cloud.videointelligence.v1.VideoSegmentOrBuilder getSegmentOrB @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java index 490ca323008c..a950a324a50b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java @@ -70,7 +70,7 @@ private LabelAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -82,7 +82,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -95,7 +95,7 @@ private LabelAnnotation( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -108,7 +108,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,13 +120,13 @@ private LabelAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -463,16 +463,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.LabelAnnotation other = (com.google.cloud.videointelligence.v1.LabelAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && getCategoryEntitiesList().equals(other.getCategoryEntitiesList()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCategoryEntitiesList().equals(other.getCategoryEntitiesList())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -707,7 +706,7 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation buildPartial() { result.entity_ = entityBuilder_.build(); } if (categoryEntitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -716,7 +715,7 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation buildPartial() { result.categoryEntities_ = categoryEntitiesBuilder_.build(); } if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -725,7 +724,7 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation buildPartial() { result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -740,35 +739,35 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation 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 @@ -900,7 +899,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.Entity, com.google.cloud.videointelligence.v1.Entity.Builder, @@ -1085,7 +1084,7 @@ public com.google.cloud.videointelligence.v1.EntityOrBuilder getEntityOrBuilder( java.util.Collections.emptyList(); private void ensureCategoryEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList( categoryEntities_); @@ -1487,7 +1486,7 @@ public com.google.cloud.videointelligence.v1.Entity.Builder addCategoryEntitiesB com.google.cloud.videointelligence.v1.Entity.Builder, com.google.cloud.videointelligence.v1.EntityOrBuilder>( categoryEntities_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); categoryEntities_ = null; @@ -1499,7 +1498,7 @@ public com.google.cloud.videointelligence.v1.Entity.Builder addCategoryEntitiesB java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList(segments_); bitField0_ |= 0x00000004; @@ -1846,10 +1845,7 @@ public com.google.cloud.videointelligence.v1.LabelSegment.Builder addSegmentsBui com.google.cloud.videointelligence.v1.LabelSegment, com.google.cloud.videointelligence.v1.LabelSegment.Builder, com.google.cloud.videointelligence.v1.LabelSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1859,7 +1855,7 @@ public com.google.cloud.videointelligence.v1.LabelSegment.Builder addSegmentsBui java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList(frames_); bitField0_ |= 0x00000008; @@ -2200,10 +2196,7 @@ public com.google.cloud.videointelligence.v1.LabelFrame.Builder addFramesBuilder com.google.cloud.videointelligence.v1.LabelFrame, com.google.cloud.videointelligence.v1.LabelFrame.Builder, com.google.cloud.videointelligence.v1.LabelFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -2211,7 +2204,7 @@ public com.google.cloud.videointelligence.v1.LabelFrame.Builder addFramesBuilder @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java index d5681f7a718e..f3b0f7152ba3 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java @@ -24,7 +24,6 @@ private LabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder b private LabelDetectionConfig() { labelDetectionMode_ = 0; - stationaryCamera_ = false; model_ = ""; } @@ -73,7 +72,7 @@ private LabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -266,12 +265,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.LabelDetectionConfig other = (com.google.cloud.videointelligence.v1.LabelDetectionConfig) obj; - boolean result = true; - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -475,35 +473,35 @@ public com.google.cloud.videointelligence.v1.LabelDetectionConfig 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 @@ -804,7 +802,7 @@ public Builder setModelBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java index 0ec0d8902e61..0badf6d42065 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java @@ -22,9 +22,7 @@ private LabelFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LabelFrame() { - confidence_ = 0F; - } + private LabelFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private LabelFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,17 +210,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.LabelFrame other = (com.google.cloud.videointelligence.v1.LabelFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -430,35 +425,35 @@ public com.google.cloud.videointelligence.v1.LabelFrame 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 @@ -509,7 +504,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -743,7 +738,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java index b7894871d45e..0a6e01788e41 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java @@ -22,9 +22,7 @@ private LabelSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private LabelSegment() { - confidence_ = 0F; - } + private LabelSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private LabelSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,17 +211,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.LabelSegment other = (com.google.cloud.videointelligence.v1.LabelSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,35 +426,35 @@ public com.google.cloud.videointelligence.v1.LabelSegment 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 @@ -511,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.VideoSegment, com.google.cloud.videointelligence.v1.VideoSegment.Builder, @@ -739,7 +734,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java index aea810cbe296..010e34eea80a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java @@ -24,12 +24,7 @@ private NormalizedBoundingBox(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private NormalizedBoundingBox() { - left_ = 0F; - top_ = 0F; - right_ = 0F; - bottom_ = 0F; - } + private NormalizedBoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -77,7 +72,7 @@ private NormalizedBoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -232,25 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.NormalizedBoundingBox other = (com.google.cloud.videointelligence.v1.NormalizedBoundingBox) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getLeft()) - == java.lang.Float.floatToIntBits(other.getLeft())); - result = - result - && (java.lang.Float.floatToIntBits(getTop()) - == java.lang.Float.floatToIntBits(other.getTop())); - result = - result - && (java.lang.Float.floatToIntBits(getRight()) - == java.lang.Float.floatToIntBits(other.getRight())); - result = - result - && (java.lang.Float.floatToIntBits(getBottom()) - == java.lang.Float.floatToIntBits(other.getBottom())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getLeft()) + != java.lang.Float.floatToIntBits(other.getLeft())) return false; + if (java.lang.Float.floatToIntBits(getTop()) != java.lang.Float.floatToIntBits(other.getTop())) + return false; + if (java.lang.Float.floatToIntBits(getRight()) + != java.lang.Float.floatToIntBits(other.getRight())) return false; + if (java.lang.Float.floatToIntBits(getBottom()) + != java.lang.Float.floatToIntBits(other.getBottom())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -461,35 +447,35 @@ public com.google.cloud.videointelligence.v1.NormalizedBoundingBox 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 @@ -725,7 +711,7 @@ public Builder clearBottom() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingPoly.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingPoly.java index 243db3ce6e4d..912462c9b013 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingPoly.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingPoly.java @@ -66,7 +66,7 @@ private NormalizedBoundingPoly( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.NormalizedVertex>(); @@ -80,7 +80,7 @@ private NormalizedBoundingPoly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +92,7 @@ private NormalizedBoundingPoly( } 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)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); } this.unknownFields = unknownFields.build(); @@ -225,10 +225,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.NormalizedBoundingPoly other = (com.google.cloud.videointelligence.v1.NormalizedBoundingPoly) obj; - boolean result = true; - result = result && getVerticesList().equals(other.getVerticesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getVerticesList().equals(other.getVerticesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -440,7 +439,7 @@ public com.google.cloud.videointelligence.v1.NormalizedBoundingPoly buildPartial new com.google.cloud.videointelligence.v1.NormalizedBoundingPoly(this); int from_bitField0_ = bitField0_; if (verticesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -454,35 +453,35 @@ public com.google.cloud.videointelligence.v1.NormalizedBoundingPoly 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 @@ -562,7 +561,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureVerticesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList( vertices_); @@ -912,10 +911,7 @@ public com.google.cloud.videointelligence.v1.NormalizedVertex.Builder addVertice com.google.cloud.videointelligence.v1.NormalizedVertex, com.google.cloud.videointelligence.v1.NormalizedVertex.Builder, com.google.cloud.videointelligence.v1.NormalizedVertexOrBuilder>( - vertices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + vertices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); vertices_ = null; } return verticesBuilder_; @@ -923,7 +919,7 @@ public com.google.cloud.videointelligence.v1.NormalizedVertex.Builder addVertice @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedVertex.java index 702d52c178b8..b6c29525eef9 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedVertex.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedVertex.java @@ -24,10 +24,7 @@ private NormalizedVertex(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private NormalizedVertex() { - x_ = 0F; - y_ = 0F; - } + private NormalizedVertex() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -65,7 +62,7 @@ private NormalizedVertex( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,17 +175,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.NormalizedVertex other = (com.google.cloud.videointelligence.v1.NormalizedVertex) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getX()) - == java.lang.Float.floatToIntBits(other.getX())); - result = - result - && (java.lang.Float.floatToIntBits(getY()) - == java.lang.Float.floatToIntBits(other.getY())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getX()) != java.lang.Float.floatToIntBits(other.getX())) + return false; + if (java.lang.Float.floatToIntBits(getY()) != java.lang.Float.floatToIntBits(other.getY())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +381,35 @@ public com.google.cloud.videointelligence.v1.NormalizedVertex 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 @@ -559,7 +551,7 @@ public Builder clearY() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingAnnotation.java index d62de0f8a9e4..cb16197cab18 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingAnnotation.java @@ -23,7 +23,6 @@ private ObjectTrackingAnnotation(com.google.protobuf.GeneratedMessageV3.Builder< } private ObjectTrackingAnnotation() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -69,7 +68,7 @@ private ObjectTrackingAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.ObjectTrackingFrame>(); @@ -113,7 +112,7 @@ private ObjectTrackingAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -125,7 +124,7 @@ private ObjectTrackingAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -468,30 +467,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation other = (com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && getTrackInfoCase().equals(other.getTrackInfoCase()); - if (!result) return false; + if (!getEntity().equals(other.getEntity())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!getTrackInfoCase().equals(other.getTrackInfoCase())) return false; switch (trackInfoCase_) { case 3: - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; break; case 5: - result = result && (getTrackId() == other.getTrackId()); + if (getTrackId() != other.getTrackId()) 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 @@ -734,7 +729,7 @@ public com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation buildParti } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -750,35 +745,35 @@ public com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation buildParti @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 @@ -1166,7 +1161,7 @@ public Builder clearTrackId() { return this; } - private com.google.cloud.videointelligence.v1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.Entity, com.google.cloud.videointelligence.v1.Entity.Builder, @@ -1395,7 +1390,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -1804,10 +1799,7 @@ public com.google.cloud.videointelligence.v1.ObjectTrackingFrame.Builder addFram com.google.cloud.videointelligence.v1.ObjectTrackingFrame, com.google.cloud.videointelligence.v1.ObjectTrackingFrame.Builder, com.google.cloud.videointelligence.v1.ObjectTrackingFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1815,7 +1807,7 @@ public com.google.cloud.videointelligence.v1.ObjectTrackingFrame.Builder addFram @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingFrame.java index 90c38769d66a..f02d9baffc2a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ObjectTrackingFrame.java @@ -83,7 +83,7 @@ private ObjectTrackingFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ObjectTrackingFrame other = (com.google.cloud.videointelligence.v1.ObjectTrackingFrame) obj; - boolean result = true; - result = result && (hasNormalizedBoundingBox() == other.hasNormalizedBoundingBox()); + if (hasNormalizedBoundingBox() != other.hasNormalizedBoundingBox()) return false; if (hasNormalizedBoundingBox()) { - result = result && getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox()); + if (!getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,35 +480,35 @@ public com.google.cloud.videointelligence.v1.ObjectTrackingFrame 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 @@ -561,8 +560,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1.NormalizedBoundingBox normalizedBoundingBox_ = - null; + private com.google.cloud.videointelligence.v1.NormalizedBoundingBox normalizedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.NormalizedBoundingBox, com.google.cloud.videointelligence.v1.NormalizedBoundingBox.Builder, @@ -758,7 +756,7 @@ public Builder clearNormalizedBoundingBox() { return normalizedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -939,7 +937,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java index 8f53e985dce6..ecbea517c48c 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java @@ -59,7 +59,7 @@ private ShotChangeDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -381,35 +380,35 @@ public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig 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 @@ -568,7 +567,7 @@ public Builder setModelBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechContext.java index c79ccfa3fe4d..ce2e2d417c8d 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechContext.java @@ -54,7 +54,7 @@ private SpeechContext( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { phrases_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private SpeechContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private SpeechContext( } 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)) { phrases_ = phrases_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -219,10 +219,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.SpeechContext other = (com.google.cloud.videointelligence.v1.SpeechContext) obj; - boolean result = true; - result = result && getPhrasesList().equals(other.getPhrasesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPhrasesList().equals(other.getPhrasesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -412,7 +411,7 @@ public com.google.cloud.videointelligence.v1.SpeechContext buildPartial() { com.google.cloud.videointelligence.v1.SpeechContext result = new com.google.cloud.videointelligence.v1.SpeechContext(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { phrases_ = phrases_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -423,35 +422,35 @@ public com.google.cloud.videointelligence.v1.SpeechContext 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 @@ -513,7 +512,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePhrasesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { phrases_ = new com.google.protobuf.LazyStringArrayList(phrases_); bitField0_ |= 0x00000001; } @@ -699,7 +698,7 @@ public Builder addPhrasesBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechRecognitionAlternative.java index af0856319b68..5bcea576b271 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechRecognitionAlternative.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechRecognitionAlternative.java @@ -24,7 +24,6 @@ private SpeechRecognitionAlternative(com.google.protobuf.GeneratedMessageV3.Buil private SpeechRecognitionAlternative() { transcript_ = ""; - confidence_ = 0F; words_ = java.util.Collections.emptyList(); } @@ -66,7 +65,7 @@ private SpeechRecognitionAlternative( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { words_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +76,7 @@ private SpeechRecognitionAlternative( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -89,7 +88,7 @@ private SpeechRecognitionAlternative( } 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)) { words_ = java.util.Collections.unmodifiableList(words_); } this.unknownFields = unknownFields.build(); @@ -297,15 +296,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative other = (com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative) obj; - boolean result = true; - result = result && getTranscript().equals(other.getTranscript()); - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getWordsList().equals(other.getWordsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTranscript().equals(other.getTranscript())) return false; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getWordsList().equals(other.getWordsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -517,7 +513,7 @@ public com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative buildP result.transcript_ = transcript_; result.confidence_ = confidence_; if (wordsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { words_ = java.util.Collections.unmodifiableList(words_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -532,35 +528,35 @@ public com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative 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 @@ -803,7 +799,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureWordsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { words_ = new java.util.ArrayList(words_); bitField0_ |= 0x00000004; } @@ -1143,10 +1139,7 @@ public com.google.cloud.videointelligence.v1.WordInfo.Builder addWordsBuilder(in com.google.cloud.videointelligence.v1.WordInfo, com.google.cloud.videointelligence.v1.WordInfo.Builder, com.google.cloud.videointelligence.v1.WordInfoOrBuilder>( - words_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + words_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); words_ = null; } return wordsBuilder_; @@ -1154,7 +1147,7 @@ public com.google.cloud.videointelligence.v1.WordInfo.Builder addWordsBuilder(in @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscription.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscription.java index 81f1fad45f4e..d0a2c1d0de54 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscription.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscription.java @@ -53,7 +53,7 @@ private SpeechTranscription( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative>(); @@ -74,7 +74,7 @@ private SpeechTranscription( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private SpeechTranscription( } 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)) { alternatives_ = java.util.Collections.unmodifiableList(alternatives_); } this.unknownFields = unknownFields.build(); @@ -304,11 +304,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.SpeechTranscription other = (com.google.cloud.videointelligence.v1.SpeechTranscription) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -510,7 +509,7 @@ public com.google.cloud.videointelligence.v1.SpeechTranscription buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (alternativesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { alternatives_ = java.util.Collections.unmodifiableList(alternatives_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -526,35 +525,35 @@ public com.google.cloud.videointelligence.v1.SpeechTranscription buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -637,7 +636,7 @@ public Builder mergeFrom( alternatives_ = java.util.Collections.emptyList(); private void ensureAlternativesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative>(alternatives_); @@ -1092,10 +1091,7 @@ public Builder removeAlternatives(int index) { com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative, com.google.cloud.videointelligence.v1.SpeechRecognitionAlternative.Builder, com.google.cloud.videointelligence.v1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1212,7 +1208,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscriptionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscriptionConfig.java index 5ed4f0252ca0..43f9881a62fc 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscriptionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/SpeechTranscriptionConfig.java @@ -24,14 +24,8 @@ private SpeechTranscriptionConfig(com.google.protobuf.GeneratedMessageV3.Builder private SpeechTranscriptionConfig() { languageCode_ = ""; - maxAlternatives_ = 0; - filterProfanity_ = false; speechContexts_ = java.util.Collections.emptyList(); - enableAutomaticPunctuation_ = false; - audioTracks_ = java.util.Collections.emptyList(); - enableSpeakerDiarization_ = false; - diarizationSpeakerCount_ = 0; - enableWordConfidence_ = false; + audioTracks_ = emptyIntList(); } @java.lang.Override @@ -77,7 +71,7 @@ private SpeechTranscriptionConfig( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { speechContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -95,24 +89,23 @@ private SpeechTranscriptionConfig( } case 48: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000020) != 0)) { + audioTracks_ = newIntList(); mutable_bitField0_ |= 0x00000020; } - audioTracks_.add(input.readInt32()); + audioTracks_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) - && input.getBytesUntilLimit() > 0) { - audioTracks_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) { + audioTracks_ = newIntList(); mutable_bitField0_ |= 0x00000020; } while (input.getBytesUntilLimit() > 0) { - audioTracks_.add(input.readInt32()); + audioTracks_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -134,7 +127,7 @@ private SpeechTranscriptionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -146,11 +139,11 @@ private SpeechTranscriptionConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = java.util.Collections.unmodifiableList(audioTracks_); + if (((mutable_bitField0_ & 0x00000020) != 0)) { + audioTracks_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -348,7 +341,7 @@ public boolean getEnableAutomaticPunctuation() { } public static final int AUDIO_TRACKS_FIELD_NUMBER = 6; - private java.util.List audioTracks_; + private com.google.protobuf.Internal.IntList audioTracks_; /** * * @@ -386,7 +379,7 @@ public int getAudioTracksCount() { * repeated int32 audio_tracks = 6; */ public int getAudioTracks(int index) { - return audioTracks_.get(index); + return audioTracks_.getInt(index); } private int audioTracksMemoizedSerializedSize = -1; @@ -482,7 +475,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(audioTracksMemoizedSerializedSize); } for (int i = 0; i < audioTracks_.size(); i++) { - output.writeInt32NoTag(audioTracks_.get(i)); + output.writeInt32NoTag(audioTracks_.getInt(i)); } if (enableSpeakerDiarization_ != false) { output.writeBool(7, enableSpeakerDiarization_); @@ -521,7 +514,7 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < audioTracks_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(audioTracks_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(audioTracks_.getInt(i)); } size += dataSize; if (!getAudioTracksList().isEmpty()) { @@ -555,18 +548,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig other = (com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (getMaxAlternatives() == other.getMaxAlternatives()); - result = result && (getFilterProfanity() == other.getFilterProfanity()); - result = result && getSpeechContextsList().equals(other.getSpeechContextsList()); - result = result && (getEnableAutomaticPunctuation() == other.getEnableAutomaticPunctuation()); - result = result && getAudioTracksList().equals(other.getAudioTracksList()); - result = result && (getEnableSpeakerDiarization() == other.getEnableSpeakerDiarization()); - result = result && (getDiarizationSpeakerCount() == other.getDiarizationSpeakerCount()); - result = result && (getEnableWordConfidence() == other.getEnableWordConfidence()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (getMaxAlternatives() != other.getMaxAlternatives()) return false; + if (getFilterProfanity() != other.getFilterProfanity()) return false; + if (!getSpeechContextsList().equals(other.getSpeechContextsList())) return false; + if (getEnableAutomaticPunctuation() != other.getEnableAutomaticPunctuation()) return false; + if (!getAudioTracksList().equals(other.getAudioTracksList())) return false; + if (getEnableSpeakerDiarization() != other.getEnableSpeakerDiarization()) return false; + if (getDiarizationSpeakerCount() != other.getDiarizationSpeakerCount()) return false; + if (getEnableWordConfidence() != other.getEnableWordConfidence()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -760,7 +752,7 @@ public Builder clear() { } enableAutomaticPunctuation_ = false; - audioTracks_ = java.util.Collections.emptyList(); + audioTracks_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000020); enableSpeakerDiarization_ = false; @@ -802,7 +794,7 @@ public com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig buildPart result.maxAlternatives_ = maxAlternatives_; result.filterProfanity_ = filterProfanity_; if (speechContextsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -811,8 +803,8 @@ public com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig buildPart result.speechContexts_ = speechContextsBuilder_.build(); } result.enableAutomaticPunctuation_ = enableAutomaticPunctuation_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = java.util.Collections.unmodifiableList(audioTracks_); + if (((bitField0_ & 0x00000020) != 0)) { + audioTracks_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000020); } result.audioTracks_ = audioTracks_; @@ -826,35 +818,35 @@ public com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig 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 @@ -1191,7 +1183,7 @@ public Builder clearFilterProfanity() { java.util.Collections.emptyList(); private void ensureSpeechContextsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { speechContexts_ = new java.util.ArrayList( speechContexts_); @@ -1541,7 +1533,7 @@ public com.google.cloud.videointelligence.v1.SpeechContext.Builder addSpeechCont com.google.cloud.videointelligence.v1.SpeechContext.Builder, com.google.cloud.videointelligence.v1.SpeechContextOrBuilder>( speechContexts_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); speechContexts_ = null; @@ -1608,11 +1600,11 @@ public Builder clearEnableAutomaticPunctuation() { return this; } - private java.util.List audioTracks_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList audioTracks_ = emptyIntList(); private void ensureAudioTracksIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = new java.util.ArrayList(audioTracks_); + if (!((bitField0_ & 0x00000020) != 0)) { + audioTracks_ = mutableCopy(audioTracks_); bitField0_ |= 0x00000020; } } @@ -1627,7 +1619,9 @@ private void ensureAudioTracksIsMutable() { * repeated int32 audio_tracks = 6; */ public java.util.List getAudioTracksList() { - return java.util.Collections.unmodifiableList(audioTracks_); + return ((bitField0_ & 0x00000020) != 0) + ? java.util.Collections.unmodifiableList(audioTracks_) + : audioTracks_; } /** * @@ -1653,7 +1647,7 @@ public int getAudioTracksCount() { * repeated int32 audio_tracks = 6; */ public int getAudioTracks(int index) { - return audioTracks_.get(index); + return audioTracks_.getInt(index); } /** * @@ -1667,7 +1661,7 @@ public int getAudioTracks(int index) { */ public Builder setAudioTracks(int index, int value) { ensureAudioTracksIsMutable(); - audioTracks_.set(index, value); + audioTracks_.setInt(index, value); onChanged(); return this; } @@ -1683,7 +1677,7 @@ public Builder setAudioTracks(int index, int value) { */ public Builder addAudioTracks(int value) { ensureAudioTracksIsMutable(); - audioTracks_.add(value); + audioTracks_.addInt(value); onChanged(); return this; } @@ -1714,7 +1708,7 @@ public Builder addAllAudioTracks(java.lang.Iterable * repeated int32 audio_tracks = 6; */ public Builder clearAudioTracks() { - audioTracks_ = java.util.Collections.emptyList(); + audioTracks_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; @@ -1887,7 +1881,7 @@ public Builder clearEnableWordConfidence() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextAnnotation.java index aa34458d6689..ab4bffa796e3 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextAnnotation.java @@ -62,7 +62,7 @@ private TextAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -75,7 +75,7 @@ private TextAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -87,7 +87,7 @@ private TextAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -270,11 +270,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.TextAnnotation other = (com.google.cloud.videointelligence.v1.TextAnnotation) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,7 +477,7 @@ public com.google.cloud.videointelligence.v1.TextAnnotation buildPartial() { int to_bitField0_ = 0; result.text_ = text_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -493,35 +492,35 @@ public com.google.cloud.videointelligence.v1.TextAnnotation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -698,7 +697,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList(segments_); bitField0_ |= 0x00000002; @@ -1041,10 +1040,7 @@ public com.google.cloud.videointelligence.v1.TextSegment.Builder addSegmentsBuil com.google.cloud.videointelligence.v1.TextSegment, com.google.cloud.videointelligence.v1.TextSegment.Builder, com.google.cloud.videointelligence.v1.TextSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1052,7 +1048,7 @@ public com.google.cloud.videointelligence.v1.TextSegment.Builder addSegmentsBuil @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextDetectionConfig.java index 3ad7b4a3c3aa..aff0c98b1b3c 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextDetectionConfig.java @@ -53,7 +53,7 @@ private TextDetectionConfig( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private TextDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private TextDetectionConfig( } 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)) { languageHints_ = languageHints_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -210,10 +210,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.TextDetectionConfig other = (com.google.cloud.videointelligence.v1.TextDetectionConfig) obj; - boolean result = true; - result = result && getLanguageHintsList().equals(other.getLanguageHintsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageHintsList().equals(other.getLanguageHintsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -403,7 +402,7 @@ public com.google.cloud.videointelligence.v1.TextDetectionConfig buildPartial() com.google.cloud.videointelligence.v1.TextDetectionConfig result = new com.google.cloud.videointelligence.v1.TextDetectionConfig(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { languageHints_ = languageHints_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -414,35 +413,35 @@ public com.google.cloud.videointelligence.v1.TextDetectionConfig 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 @@ -504,7 +503,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLanguageHintsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(languageHints_); bitField0_ |= 0x00000001; } @@ -672,7 +671,7 @@ public Builder addLanguageHintsBytes(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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextFrame.java index 73dbf86f637e..6f45afad386f 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextFrame.java @@ -85,7 +85,7 @@ private TextFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -252,17 +252,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.TextFrame other = (com.google.cloud.videointelligence.v1.TextFrame) obj; - boolean result = true; - result = result && (hasRotatedBoundingBox() == other.hasRotatedBoundingBox()); + if (hasRotatedBoundingBox() != other.hasRotatedBoundingBox()) return false; if (hasRotatedBoundingBox()) { - result = result && getRotatedBoundingBox().equals(other.getRotatedBoundingBox()); + if (!getRotatedBoundingBox().equals(other.getRotatedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,35 +481,35 @@ public com.google.cloud.videointelligence.v1.TextFrame 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 @@ -561,7 +560,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1.NormalizedBoundingPoly rotatedBoundingBox_ = null; + private com.google.cloud.videointelligence.v1.NormalizedBoundingPoly rotatedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.NormalizedBoundingPoly, com.google.cloud.videointelligence.v1.NormalizedBoundingPoly.Builder, @@ -757,7 +756,7 @@ public Builder clearRotatedBoundingBox() { return rotatedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -938,7 +937,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextSegment.java index 916e356f77b5..c5c08ccc2cfe 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/TextSegment.java @@ -23,7 +23,6 @@ private TextSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private TextSegment() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -75,7 +74,7 @@ private TextSegment( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -87,7 +86,7 @@ private TextSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -99,7 +98,7 @@ private TextSegment( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -301,18 +300,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.TextSegment other = (com.google.cloud.videointelligence.v1.TextSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSegment().equals(other.getSegment())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -529,7 +525,7 @@ public com.google.cloud.videointelligence.v1.TextSegment buildPartial() { } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -544,35 +540,35 @@ public com.google.cloud.videointelligence.v1.TextSegment 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 @@ -653,7 +649,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.VideoSegment, com.google.cloud.videointelligence.v1.VideoSegment.Builder, @@ -886,7 +882,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(frames_); bitField0_ |= 0x00000004; } @@ -1226,10 +1222,7 @@ public com.google.cloud.videointelligence.v1.TextFrame.Builder addFramesBuilder( com.google.cloud.videointelligence.v1.TextFrame, com.google.cloud.videointelligence.v1.TextFrame.Builder, com.google.cloud.videointelligence.v1.TextFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1237,7 +1230,7 @@ public com.google.cloud.videointelligence.v1.TextFrame.Builder addFramesBuilder( @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java index e96113a7788a..ef19895e0b80 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -81,7 +81,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.LabelAnnotation>(); @@ -95,7 +95,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.LabelAnnotation>(); @@ -109,7 +109,7 @@ private VideoAnnotationResults( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; @@ -122,7 +122,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; @@ -167,7 +167,7 @@ private VideoAnnotationResults( } case 90: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { speechTranscriptions_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.SpeechTranscription>(); @@ -181,7 +181,7 @@ private VideoAnnotationResults( } case 98: { - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { textAnnotations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; @@ -194,7 +194,7 @@ private VideoAnnotationResults( } case 114: { - if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (!((mutable_bitField0_ & 0x00000200) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation>(); @@ -208,7 +208,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -220,28 +220,28 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { speechTranscriptions_ = java.util.Collections.unmodifiableList(speechTranscriptions_); } - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (((mutable_bitField0_ & 0x00000100) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); } - if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (((mutable_bitField0_ & 0x00000200) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); } this.unknownFields = unknownFields.build(); @@ -1113,27 +1113,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = - result && getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList()); - result = result && getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList()); - result = result && getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList()); - result = result && getFaceAnnotationsList().equals(other.getFaceAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList())) + return false; + if (!getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList())) return false; + if (!getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList())) return false; + if (!getFaceAnnotationsList().equals(other.getFaceAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && getSpeechTranscriptionsList().equals(other.getSpeechTranscriptionsList()); - result = result && getTextAnnotationsList().equals(other.getTextAnnotationsList()); - result = result && getObjectAnnotationsList().equals(other.getObjectAnnotationsList()); - result = result && (hasError() == other.hasError()); + if (!getSpeechTranscriptionsList().equals(other.getSpeechTranscriptionsList())) return false; + if (!getTextAnnotationsList().equals(other.getTextAnnotationsList())) return false; + if (!getObjectAnnotationsList().equals(other.getObjectAnnotationsList())) return false; + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1434,7 +1433,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (segmentLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); @@ -1444,7 +1443,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.segmentLabelAnnotations_ = segmentLabelAnnotationsBuilder_.build(); } if (shotLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1453,7 +1452,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.shotLabelAnnotations_ = shotLabelAnnotationsBuilder_.build(); } if (frameLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1462,7 +1461,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.frameLabelAnnotations_ = frameLabelAnnotationsBuilder_.build(); } if (faceAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1471,7 +1470,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.faceAnnotations_ = faceAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -1485,7 +1484,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.explicitAnnotation_ = explicitAnnotationBuilder_.build(); } if (speechTranscriptionsBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { speechTranscriptions_ = java.util.Collections.unmodifiableList(speechTranscriptions_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1494,7 +1493,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.speechTranscriptions_ = speechTranscriptionsBuilder_.build(); } if (textAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); bitField0_ = (bitField0_ & ~0x00000100); } @@ -1503,7 +1502,7 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial result.textAnnotations_ = textAnnotationsBuilder_.build(); } if (objectAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000200) == 0x00000200)) { + if (((bitField0_ & 0x00000200) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); bitField0_ = (bitField0_ & ~0x00000200); } @@ -1523,35 +1522,35 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults 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 @@ -1929,7 +1928,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { segmentLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureSegmentLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = new java.util.ArrayList( segmentLabelAnnotations_); @@ -2337,7 +2336,7 @@ public Builder removeSegmentLabelAnnotations(int index) { com.google.cloud.videointelligence.v1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1.LabelAnnotationOrBuilder>( segmentLabelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segmentLabelAnnotations_ = null; @@ -2349,7 +2348,7 @@ public Builder removeSegmentLabelAnnotations(int index) { shotLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureShotLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList( shotLabelAnnotations_); @@ -2739,7 +2738,7 @@ public Builder removeShotLabelAnnotations(int index) { com.google.cloud.videointelligence.v1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1.LabelAnnotationOrBuilder>( shotLabelAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); shotLabelAnnotations_ = null; @@ -2751,7 +2750,7 @@ public Builder removeShotLabelAnnotations(int index) { frameLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureFrameLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList( frameLabelAnnotations_); @@ -3159,7 +3158,7 @@ public Builder removeFrameLabelAnnotations(int index) { com.google.cloud.videointelligence.v1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1.LabelAnnotationOrBuilder>( frameLabelAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frameLabelAnnotations_ = null; @@ -3171,7 +3170,7 @@ public Builder removeFrameLabelAnnotations(int index) { java.util.Collections.emptyList(); private void ensureFaceAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = new java.util.ArrayList( faceAnnotations_); @@ -3522,7 +3521,7 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation.Builder addFaceAnnot com.google.cloud.videointelligence.v1.FaceAnnotation.Builder, com.google.cloud.videointelligence.v1.FaceAnnotationOrBuilder>( faceAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); faceAnnotations_ = null; @@ -3534,7 +3533,7 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation.Builder addFaceAnnot java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -3884,7 +3883,7 @@ public com.google.cloud.videointelligence.v1.VideoSegment.Builder addShotAnnotat com.google.cloud.videointelligence.v1.VideoSegment.Builder, com.google.cloud.videointelligence.v1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000020) == 0x00000020), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -3892,8 +3891,7 @@ public com.google.cloud.videointelligence.v1.VideoSegment.Builder addShotAnnotat return shotAnnotationsBuilder_; } - private com.google.cloud.videointelligence.v1.ExplicitContentAnnotation explicitAnnotation_ = - null; + private com.google.cloud.videointelligence.v1.ExplicitContentAnnotation explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1.ExplicitContentAnnotation.Builder, @@ -4093,7 +4091,7 @@ public Builder clearExplicitAnnotation() { speechTranscriptions_ = java.util.Collections.emptyList(); private void ensureSpeechTranscriptionsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { speechTranscriptions_ = new java.util.ArrayList( speechTranscriptions_); @@ -4488,7 +4486,7 @@ public Builder removeSpeechTranscriptions(int index) { com.google.cloud.videointelligence.v1.SpeechTranscription.Builder, com.google.cloud.videointelligence.v1.SpeechTranscriptionOrBuilder>( speechTranscriptions_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); speechTranscriptions_ = null; @@ -4500,7 +4498,7 @@ public Builder removeSpeechTranscriptions(int index) { java.util.Collections.emptyList(); private void ensureTextAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { textAnnotations_ = new java.util.ArrayList( textAnnotations_); @@ -4905,7 +4903,7 @@ public com.google.cloud.videointelligence.v1.TextAnnotation.Builder addTextAnnot com.google.cloud.videointelligence.v1.TextAnnotation.Builder, com.google.cloud.videointelligence.v1.TextAnnotationOrBuilder>( textAnnotations_, - ((bitField0_ & 0x00000100) == 0x00000100), + ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean()); textAnnotations_ = null; @@ -4917,7 +4915,7 @@ public com.google.cloud.videointelligence.v1.TextAnnotation.Builder addTextAnnot objectAnnotations_ = java.util.Collections.emptyList(); private void ensureObjectAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000200) == 0x00000200)) { + if (!((bitField0_ & 0x00000200) != 0)) { objectAnnotations_ = new java.util.ArrayList( objectAnnotations_); @@ -5312,7 +5310,7 @@ public Builder removeObjectAnnotations(int index) { com.google.cloud.videointelligence.v1.ObjectTrackingAnnotation.Builder, com.google.cloud.videointelligence.v1.ObjectTrackingAnnotationOrBuilder>( objectAnnotations_, - ((bitField0_ & 0x00000200) == 0x00000200), + ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean()); objectAnnotations_ = null; @@ -5320,7 +5318,7 @@ public Builder removeObjectAnnotations(int index) { return objectAnnotationsBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -5500,7 +5498,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java index 811656b4f2fc..b299e8358fcd 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java @@ -52,7 +52,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -170,7 +170,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,7 +182,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -648,41 +648,37 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.VideoContext other = (com.google.cloud.videointelligence.v1.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && (hasLabelDetectionConfig() == other.hasLabelDetectionConfig()); + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (hasLabelDetectionConfig() != other.hasLabelDetectionConfig()) return false; if (hasLabelDetectionConfig()) { - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; } - result = result && (hasShotChangeDetectionConfig() == other.hasShotChangeDetectionConfig()); + if (hasShotChangeDetectionConfig() != other.hasShotChangeDetectionConfig()) return false; if (hasShotChangeDetectionConfig()) { - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; } - result = - result - && (hasExplicitContentDetectionConfig() == other.hasExplicitContentDetectionConfig()); + if (hasExplicitContentDetectionConfig() != other.hasExplicitContentDetectionConfig()) + return false; if (hasExplicitContentDetectionConfig()) { - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; } - result = result && (hasFaceDetectionConfig() == other.hasFaceDetectionConfig()); + if (hasFaceDetectionConfig() != other.hasFaceDetectionConfig()) return false; if (hasFaceDetectionConfig()) { - result = result && getFaceDetectionConfig().equals(other.getFaceDetectionConfig()); + if (!getFaceDetectionConfig().equals(other.getFaceDetectionConfig())) return false; } - result = result && (hasSpeechTranscriptionConfig() == other.hasSpeechTranscriptionConfig()); + if (hasSpeechTranscriptionConfig() != other.hasSpeechTranscriptionConfig()) return false; if (hasSpeechTranscriptionConfig()) { - result = - result && getSpeechTranscriptionConfig().equals(other.getSpeechTranscriptionConfig()); + if (!getSpeechTranscriptionConfig().equals(other.getSpeechTranscriptionConfig())) + return false; } - result = result && (hasTextDetectionConfig() == other.hasTextDetectionConfig()); + if (hasTextDetectionConfig() != other.hasTextDetectionConfig()) return false; if (hasTextDetectionConfig()) { - result = result && getTextDetectionConfig().equals(other.getTextDetectionConfig()); + if (!getTextDetectionConfig().equals(other.getTextDetectionConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -939,7 +935,7 @@ public com.google.cloud.videointelligence.v1.VideoContext buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -984,35 +980,35 @@ public com.google.cloud.videointelligence.v1.VideoContext 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 @@ -1109,7 +1105,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList(segments_); bitField0_ |= 0x00000001; @@ -1492,16 +1488,13 @@ public com.google.cloud.videointelligence.v1.VideoSegment.Builder addSegmentsBui com.google.cloud.videointelligence.v1.VideoSegment, com.google.cloud.videointelligence.v1.VideoSegment.Builder, com.google.cloud.videointelligence.v1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } - private com.google.cloud.videointelligence.v1.LabelDetectionConfig labelDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1.LabelDetectionConfig labelDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.LabelDetectionConfig, com.google.cloud.videointelligence.v1.LabelDetectionConfig.Builder, @@ -1698,7 +1691,7 @@ public Builder clearLabelDetectionConfig() { } private com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig - shotChangeDetectionConfig_ = null; + shotChangeDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig, com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig.Builder, @@ -1905,7 +1898,7 @@ public Builder clearShotChangeDetectionConfig() { } private com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig - explicitContentDetectionConfig_ = null; + explicitContentDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig, com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig.Builder, @@ -2115,7 +2108,7 @@ public Builder clearExplicitContentDetectionConfig() { return explicitContentDetectionConfigBuilder_; } - private com.google.cloud.videointelligence.v1.FaceDetectionConfig faceDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1.FaceDetectionConfig faceDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.FaceDetectionConfig, com.google.cloud.videointelligence.v1.FaceDetectionConfig.Builder, @@ -2312,7 +2305,7 @@ public Builder clearFaceDetectionConfig() { } private com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig - speechTranscriptionConfig_ = null; + speechTranscriptionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig, com.google.cloud.videointelligence.v1.SpeechTranscriptionConfig.Builder, @@ -2518,7 +2511,7 @@ public Builder clearSpeechTranscriptionConfig() { return speechTranscriptionConfigBuilder_; } - private com.google.cloud.videointelligence.v1.TextDetectionConfig textDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1.TextDetectionConfig textDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1.TextDetectionConfig, com.google.cloud.videointelligence.v1.TextDetectionConfig.Builder, @@ -2716,7 +2709,7 @@ public Builder clearTextDetectionConfig() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java index e90029c61c82..ee599f5f1f1a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java @@ -80,7 +80,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.VideoSegment other = (com.google.cloud.videointelligence.v1.VideoSegment) obj; - boolean result = true; - result = result && (hasStartTimeOffset() == other.hasStartTimeOffset()); + if (hasStartTimeOffset() != other.hasStartTimeOffset()) return false; if (hasStartTimeOffset()) { - result = result && getStartTimeOffset().equals(other.getStartTimeOffset()); + if (!getStartTimeOffset().equals(other.getStartTimeOffset())) return false; } - result = result && (hasEndTimeOffset() == other.hasEndTimeOffset()); + if (hasEndTimeOffset() != other.hasEndTimeOffset()) return false; if (hasEndTimeOffset()) { - result = result && getEndTimeOffset().equals(other.getEndTimeOffset()); + if (!getEndTimeOffset().equals(other.getEndTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,35 +478,35 @@ public com.google.cloud.videointelligence.v1.VideoSegment 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTimeOffset_ = null; + private com.google.protobuf.Duration startTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -749,7 +748,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOffsetOrBuilder() { return startTimeOffsetBuilder_; } - private com.google.protobuf.Duration endTimeOffset_ = null; + private com.google.protobuf.Duration endTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -941,7 +940,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() { @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-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/WordInfo.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/WordInfo.java index 654a5208dcdf..b815ba93ee02 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/WordInfo.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/WordInfo.java @@ -26,8 +26,6 @@ private WordInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { private WordInfo() { word_ = ""; - confidence_ = 0F; - speakerTag_ = 0; } @java.lang.Override @@ -103,7 +101,7 @@ private WordInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -381,23 +379,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1.WordInfo other = (com.google.cloud.videointelligence.v1.WordInfo) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); - } - result = result && getWord().equals(other.getWord()); - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && (getSpeakerTag() == other.getSpeakerTag()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEndTime().equals(other.getEndTime())) return false; + } + if (!getWord().equals(other.getWord())) return false; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (getSpeakerTag() != other.getSpeakerTag()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -632,35 +627,35 @@ public com.google.cloud.videointelligence.v1.WordInfo buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -720,7 +715,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTime_ = null; + private com.google.protobuf.Duration startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -922,7 +917,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Duration endTime_ = null; + private com.google.protobuf.Duration endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1332,7 +1327,7 @@ public Builder clearSpeakerTag() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java index 052a9c8ca85e..4d47c2215337 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,7 +430,7 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress buildPar new com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -445,35 +444,35 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress 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 @@ -555,7 +554,7 @@ public Builder mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress>( @@ -958,7 +957,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -968,7 +967,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java index 950ea818b6ac..b90cde3ebc4c 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -126,7 +126,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -138,7 +138,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -581,18 +581,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -812,7 +811,7 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest buildPart int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -831,35 +830,35 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest 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 @@ -1180,7 +1179,7 @@ public Builder setInputContentBytes(com.google.protobuf.ByteString value) { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1365,7 +1364,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1beta1.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1beta1.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta1.VideoContext, com.google.cloud.videointelligence.v1beta1.VideoContext.Builder, @@ -1775,7 +1774,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java index 7a518c64a156..d27de5ef5001 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,7 +430,7 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse buildPar new com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -445,35 +444,35 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse 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 @@ -555,7 +554,7 @@ public Builder mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults>( @@ -954,7 +953,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1beta1.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -964,7 +963,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java index f8ef8c5596be..8c9250c5d06a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java @@ -22,12 +22,7 @@ private BoundingBox(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private BoundingBox() { - left_ = 0; - right_ = 0; - bottom_ = 0; - top_ = 0; - } + private BoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -75,7 +70,7 @@ private BoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -230,13 +225,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.BoundingBox other = (com.google.cloud.videointelligence.v1beta1.BoundingBox) obj; - boolean result = true; - result = result && (getLeft() == other.getLeft()); - result = result && (getRight() == other.getRight()); - result = result && (getBottom() == other.getBottom()); - result = result && (getTop() == other.getTop()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getLeft() != other.getLeft()) return false; + if (getRight() != other.getRight()) return false; + if (getBottom() != other.getBottom()) return false; + if (getTop() != other.getTop()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -445,35 +439,35 @@ public com.google.cloud.videointelligence.v1beta1.BoundingBox buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -709,7 +703,7 @@ public Builder clearTop() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java index 651b645bb19a..8f11b22560fd 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java @@ -61,7 +61,7 @@ private FaceAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoSegment>(); @@ -75,7 +75,7 @@ private FaceAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { locations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.FaceLocation>(); @@ -89,7 +89,7 @@ private FaceAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -101,10 +101,10 @@ private FaceAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { locations_ = java.util.Collections.unmodifiableList(locations_); } this.unknownFields = unknownFields.build(); @@ -369,12 +369,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.FaceAnnotation other = (com.google.cloud.videointelligence.v1beta1.FaceAnnotation) obj; - boolean result = true; - result = result && getThumbnail().equals(other.getThumbnail()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getLocationsList().equals(other.getLocationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getThumbnail().equals(other.getThumbnail())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getLocationsList().equals(other.getLocationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -588,7 +587,7 @@ public com.google.cloud.videointelligence.v1beta1.FaceAnnotation buildPartial() int to_bitField0_ = 0; result.thumbnail_ = thumbnail_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -597,7 +596,7 @@ public com.google.cloud.videointelligence.v1beta1.FaceAnnotation buildPartial() result.segments_ = segmentsBuilder_.build(); } if (locationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { locations_ = java.util.Collections.unmodifiableList(locations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -612,35 +611,35 @@ public com.google.cloud.videointelligence.v1beta1.FaceAnnotation buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -844,7 +843,7 @@ public Builder setThumbnailBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1233,10 +1232,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder addSegmen com.google.cloud.videointelligence.v1beta1.VideoSegment, com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1beta1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1246,7 +1242,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder addSegmen java.util.Collections.emptyList(); private void ensureLocationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { locations_ = new java.util.ArrayList( locations_); @@ -1599,10 +1595,7 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation.Builder addLocati com.google.cloud.videointelligence.v1beta1.FaceLocation, com.google.cloud.videointelligence.v1beta1.FaceLocation.Builder, com.google.cloud.videointelligence.v1beta1.FaceLocationOrBuilder>( - locations_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + locations_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); locations_ = null; } return locationsBuilder_; @@ -1610,7 +1603,7 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation.Builder addLocati @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java index 5cb866a65fe1..5725dbda98bc 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java @@ -22,9 +22,7 @@ private FaceLocation(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private FaceLocation() { - timeOffset_ = 0L; - } + private FaceLocation() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private FaceLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,14 +211,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.FaceLocation other = (com.google.cloud.videointelligence.v1beta1.FaceLocation) obj; - boolean result = true; - result = result && (hasBoundingBox() == other.hasBoundingBox()); + if (hasBoundingBox() != other.hasBoundingBox()) return false; if (hasBoundingBox()) { - result = result && getBoundingBox().equals(other.getBoundingBox()); + if (!getBoundingBox().equals(other.getBoundingBox())) return false; } - result = result && (getTimeOffset() == other.getTimeOffset()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTimeOffset() != other.getTimeOffset()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -429,35 +426,35 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation 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 @@ -509,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1beta1.BoundingBox boundingBox_ = null; + private com.google.cloud.videointelligence.v1beta1.BoundingBox boundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta1.BoundingBox, com.google.cloud.videointelligence.v1beta1.BoundingBox.Builder, @@ -738,7 +735,7 @@ public Builder clearTimeOffset() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java index 0fcca8f94a02..17d6e3acb6e0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java @@ -68,7 +68,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { locations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.LabelLocation>(); @@ -82,7 +82,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,7 +94,7 @@ private LabelAnnotation( } 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)) { locations_ = java.util.Collections.unmodifiableList(locations_); } this.unknownFields = unknownFields.build(); @@ -327,12 +327,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.LabelAnnotation other = (com.google.cloud.videointelligence.v1beta1.LabelAnnotation) obj; - boolean result = true; - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getLocationsList().equals(other.getLocationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getLocationsList().equals(other.getLocationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -540,7 +539,7 @@ public com.google.cloud.videointelligence.v1beta1.LabelAnnotation buildPartial() result.description_ = description_; result.languageCode_ = languageCode_; if (locationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { locations_ = java.util.Collections.unmodifiableList(locations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -555,35 +554,35 @@ public com.google.cloud.videointelligence.v1beta1.LabelAnnotation 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 @@ -858,7 +857,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureLocationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { locations_ = new java.util.ArrayList( locations_); @@ -1212,10 +1211,7 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation.Builder addLocat com.google.cloud.videointelligence.v1beta1.LabelLocation, com.google.cloud.videointelligence.v1beta1.LabelLocation.Builder, com.google.cloud.videointelligence.v1beta1.LabelLocationOrBuilder>( - locations_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + locations_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); locations_ = null; } return locationsBuilder_; @@ -1223,7 +1219,7 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation.Builder addLocat @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java index cbfb0c2fd75d..d28b834d6be8 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java @@ -23,7 +23,6 @@ private LabelLocation(com.google.protobuf.GeneratedMessageV3.Builder builder) } private LabelLocation() { - confidence_ = 0F; level_ = 0; } @@ -82,7 +81,7 @@ private LabelLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,18 +271,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.LabelLocation other = (com.google.cloud.videointelligence.v1beta1.LabelLocation) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && level_ == other.level_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (level_ != other.level_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -497,35 +493,35 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation 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 @@ -580,7 +576,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta1.VideoSegment, com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder, @@ -913,7 +909,7 @@ public Builder clearLevel() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java index 67c579743a68..f7ac6966e568 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java @@ -32,7 +32,6 @@ private SafeSearchAnnotation() { medical_ = 0; violent_ = 0; racy_ = 0; - timeOffset_ = 0L; } @java.lang.Override @@ -101,7 +100,7 @@ private SafeSearchAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -385,15 +384,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation other = (com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation) obj; - boolean result = true; - result = result && adult_ == other.adult_; - result = result && spoof_ == other.spoof_; - result = result && medical_ == other.medical_; - result = result && violent_ == other.violent_; - result = result && racy_ == other.racy_; - result = result && (getTimeOffset() == other.getTimeOffset()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (adult_ != other.adult_) return false; + if (spoof_ != other.spoof_) return false; + if (medical_ != other.medical_) return false; + if (violent_ != other.violent_) return false; + if (racy_ != other.racy_) return false; + if (getTimeOffset() != other.getTimeOffset()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -617,35 +615,35 @@ public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation 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 @@ -1153,7 +1151,7 @@ public Builder clearTimeOffset() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java index f650f40dc348..e539cab8cfd8 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -77,7 +77,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { faceAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.FaceAnnotation>(); @@ -91,7 +91,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoSegment>(); @@ -119,7 +119,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { safeSearchAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation>(); @@ -133,7 +133,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -145,16 +145,16 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = java.util.Collections.unmodifiableList(labelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { safeSearchAnnotations_ = java.util.Collections.unmodifiableList(safeSearchAnnotations_); } this.unknownFields = unknownFields.build(); @@ -638,18 +638,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getLabelAnnotationsList().equals(other.getLabelAnnotationsList()); - result = result && getFaceAnnotationsList().equals(other.getFaceAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && getSafeSearchAnnotationsList().equals(other.getSafeSearchAnnotationsList()); - result = result && (hasError() == other.hasError()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getLabelAnnotationsList().equals(other.getLabelAnnotationsList())) return false; + if (!getFaceAnnotationsList().equals(other.getFaceAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (!getSafeSearchAnnotationsList().equals(other.getSafeSearchAnnotationsList())) return false; + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -898,7 +897,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPa int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (labelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = java.util.Collections.unmodifiableList(labelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -907,7 +906,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPa result.labelAnnotations_ = labelAnnotationsBuilder_.build(); } if (faceAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -916,7 +915,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPa result.faceAnnotations_ = faceAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -925,7 +924,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPa result.shotAnnotations_ = shotAnnotationsBuilder_.build(); } if (safeSearchAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { safeSearchAnnotations_ = java.util.Collections.unmodifiableList(safeSearchAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -945,35 +944,35 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults 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 @@ -1242,7 +1241,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { labelAnnotations_ = java.util.Collections.emptyList(); private void ensureLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = new java.util.ArrayList( labelAnnotations_); @@ -1619,7 +1618,7 @@ public Builder removeLabelAnnotations(int index) { com.google.cloud.videointelligence.v1beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1beta1.LabelAnnotationOrBuilder>( labelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); labelAnnotations_ = null; @@ -1631,7 +1630,7 @@ public Builder removeLabelAnnotations(int index) { faceAnnotations_ = java.util.Collections.emptyList(); private void ensureFaceAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { faceAnnotations_ = new java.util.ArrayList( faceAnnotations_); @@ -2007,7 +2006,7 @@ public Builder removeFaceAnnotations(int index) { com.google.cloud.videointelligence.v1beta1.FaceAnnotation.Builder, com.google.cloud.videointelligence.v1beta1.FaceAnnotationOrBuilder>( faceAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); faceAnnotations_ = null; @@ -2019,7 +2018,7 @@ public Builder removeFaceAnnotations(int index) { shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -2393,7 +2392,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1beta1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -2405,7 +2404,7 @@ public Builder removeShotAnnotations(int index) { safeSearchAnnotations_ = java.util.Collections.emptyList(); private void ensureSafeSearchAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { safeSearchAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation>( @@ -2802,7 +2801,7 @@ public Builder removeSafeSearchAnnotations(int index) { com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation.Builder, com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotationOrBuilder>( safeSearchAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); safeSearchAnnotations_ = null; @@ -2810,7 +2809,7 @@ public Builder removeSafeSearchAnnotations(int index) { return safeSearchAnnotationsBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -2990,7 +2989,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java index 403210632a10..ed9c518ceef2 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java @@ -25,7 +25,6 @@ private VideoContext(com.google.protobuf.GeneratedMessageV3.Builder builder) private VideoContext() { segments_ = java.util.Collections.emptyList(); labelDetectionMode_ = 0; - stationaryCamera_ = false; labelDetectionModel_ = ""; faceDetectionModel_ = ""; shotChangeDetectionModel_ = ""; @@ -58,7 +57,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta1.VideoSegment>(); @@ -112,7 +111,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,7 +123,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -546,16 +545,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.VideoContext other = (com.google.cloud.videointelligence.v1beta1.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getLabelDetectionModel().equals(other.getLabelDetectionModel()); - result = result && getFaceDetectionModel().equals(other.getFaceDetectionModel()); - result = result && getShotChangeDetectionModel().equals(other.getShotChangeDetectionModel()); - result = result && getSafeSearchDetectionModel().equals(other.getSafeSearchDetectionModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getLabelDetectionModel().equals(other.getLabelDetectionModel())) return false; + if (!getFaceDetectionModel().equals(other.getFaceDetectionModel())) return false; + if (!getShotChangeDetectionModel().equals(other.getShotChangeDetectionModel())) return false; + if (!getSafeSearchDetectionModel().equals(other.getSafeSearchDetectionModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -777,7 +775,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoContext buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -798,35 +796,35 @@ public com.google.cloud.videointelligence.v1beta1.VideoContext buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -927,7 +925,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1316,10 +1314,7 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder addSegmen com.google.cloud.videointelligence.v1beta1.VideoSegment, com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1beta1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1865,7 +1860,7 @@ public Builder setSafeSearchDetectionModelBytes(com.google.protobuf.ByteString v @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-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java index a5d5487afdc1..cec8cb6f1903 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java @@ -22,10 +22,7 @@ private VideoSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private VideoSegment() { - startTimeOffset_ = 0L; - endTimeOffset_ = 0L; - } + private VideoSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -176,11 +173,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta1.VideoSegment other = (com.google.cloud.videointelligence.v1beta1.VideoSegment) obj; - boolean result = true; - result = result && (getStartTimeOffset() == other.getStartTimeOffset()); - result = result && (getEndTimeOffset() == other.getEndTimeOffset()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getStartTimeOffset() != other.getStartTimeOffset()) return false; + if (getEndTimeOffset() != other.getEndTimeOffset()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +375,35 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment 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 @@ -549,7 +545,7 @@ public Builder clearEndTimeOffset() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java index b6d55cce0638..5c60a9a1c665 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,7 +430,7 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress buildPar new com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -445,35 +444,35 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress 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 @@ -555,7 +554,7 @@ public Builder mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress>( @@ -958,7 +957,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -968,7 +967,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java index ad15e10c0d91..641a23967c90 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -124,7 +124,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -551,18 +551,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -782,7 +781,7 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest buildPart int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -801,35 +800,35 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest 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 @@ -1103,7 +1102,7 @@ public Builder clearInputContent() { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1288,7 +1287,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1beta2.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1beta2.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.VideoContext, com.google.cloud.videointelligence.v1beta2.VideoContext.Builder, @@ -1698,7 +1697,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java index 28847fa43854..3cfc50962257 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,7 +430,7 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse buildPar new com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -445,35 +444,35 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse 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 @@ -555,7 +554,7 @@ public Builder mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults>( @@ -954,7 +953,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1beta2.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -964,7 +963,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java index 1bb2023ee1c0..079ab5ca5bf5 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java @@ -75,7 +75,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,12 +297,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.Entity other = (com.google.cloud.videointelligence.v1beta2.Entity) obj; - boolean result = true; - result = result && getEntityId().equals(other.getEntityId()); - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityId().equals(other.getEntityId())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,35 +504,35 @@ public com.google.cloud.videointelligence.v1beta2.Entity 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 @@ -885,7 +884,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java index 53f2c3c114b5..8aa3367b69b6 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java @@ -54,7 +54,7 @@ private ExplicitContentAnnotation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame>(); @@ -68,7 +68,7 @@ private ExplicitContentAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private ExplicitContentAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -215,10 +215,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation other = (com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation) obj; - boolean result = true; - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -421,7 +420,7 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation buil new com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation(this); int from_bitField0_ = bitField0_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -435,35 +434,35 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation buil @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 @@ -546,7 +545,7 @@ public Builder mergeFrom( frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame>(frames_); @@ -922,10 +921,7 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.Builder a com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame, com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.Builder, com.google.cloud.videointelligence.v1beta2.ExplicitContentFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -933,7 +929,7 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.Builder a @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java index 09b4a9c449b6..20a3b31bee3d 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java @@ -60,7 +60,7 @@ private ExplicitContentDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,10 +186,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +389,35 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig @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 @@ -580,7 +579,7 @@ public Builder setModelBytes(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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java index 09ff4cb79dc7..e286a7699422 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java @@ -74,7 +74,7 @@ private ExplicitContentFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -235,14 +235,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame other = (com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && pornographyLikelihood_ == other.pornographyLikelihood_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (pornographyLikelihood_ != other.pornographyLikelihood_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -452,35 +451,35 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame 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 @@ -535,7 +534,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -804,7 +803,7 @@ public Builder clearPornographyLikelihood() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java index b91597c9dfac..02555adc8f5b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java @@ -59,7 +59,7 @@ private FaceAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.FaceSegment>(); @@ -73,7 +73,7 @@ private FaceAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -86,7 +86,7 @@ private FaceAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -98,10 +98,10 @@ private FaceAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -327,12 +327,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.FaceAnnotation other = (com.google.cloud.videointelligence.v1beta2.FaceAnnotation) obj; - boolean result = true; - result = result && getThumbnail().equals(other.getThumbnail()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getThumbnail().equals(other.getThumbnail())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -546,7 +545,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceAnnotation buildPartial() int to_bitField0_ = 0; result.thumbnail_ = thumbnail_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -555,7 +554,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceAnnotation buildPartial() result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -570,35 +569,35 @@ public com.google.cloud.videointelligence.v1beta2.FaceAnnotation 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 @@ -754,7 +753,7 @@ public Builder clearThumbnail() { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1104,10 +1103,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceSegment.Builder addSegment com.google.cloud.videointelligence.v1beta2.FaceSegment, com.google.cloud.videointelligence.v1beta2.FaceSegment.Builder, com.google.cloud.videointelligence.v1beta2.FaceSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1117,7 +1113,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceSegment.Builder addSegment java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList(frames_); bitField0_ |= 0x00000004; @@ -1464,10 +1460,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame.Builder addFramesBui com.google.cloud.videointelligence.v1beta2.FaceFrame, com.google.cloud.videointelligence.v1beta2.FaceFrame.Builder, com.google.cloud.videointelligence.v1beta2.FaceFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1475,7 +1468,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame.Builder addFramesBui @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java index 8e906517b4bf..0abc502ad4a0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java @@ -24,7 +24,6 @@ private FaceDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder bu private FaceDetectionConfig() { model_ = ""; - includeBoundingBoxes_ = false; } @java.lang.Override @@ -65,7 +64,7 @@ private FaceDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -210,11 +209,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig other = (com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && (getIncludeBoundingBoxes() == other.getIncludeBoundingBoxes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (getIncludeBoundingBoxes() != other.getIncludeBoundingBoxes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -414,35 +412,35 @@ public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig buildParti @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 @@ -647,7 +645,7 @@ public Builder clearIncludeBoundingBoxes() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java index b2562f200bea..2c9c421ea251 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java @@ -52,7 +52,7 @@ private FaceFrame( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox>(); @@ -81,7 +81,7 @@ private FaceFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -93,7 +93,7 @@ private FaceFrame( } 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)) { normalizedBoundingBoxes_ = java.util.Collections.unmodifiableList(normalizedBoundingBoxes_); } this.unknownFields = unknownFields.build(); @@ -301,15 +301,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.FaceFrame other = (com.google.cloud.videointelligence.v1beta2.FaceFrame) obj; - boolean result = true; - result = - result && getNormalizedBoundingBoxesList().equals(other.getNormalizedBoundingBoxesList()); - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (!getNormalizedBoundingBoxesList().equals(other.getNormalizedBoundingBoxesList())) + return false; + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -516,7 +515,7 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (normalizedBoundingBoxesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = java.util.Collections.unmodifiableList(normalizedBoundingBoxes_); bitField0_ = (bitField0_ & ~0x00000001); @@ -537,35 +536,35 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame 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 @@ -647,7 +646,7 @@ public Builder mergeFrom( normalizedBoundingBoxes_ = java.util.Collections.emptyList(); private void ensureNormalizedBoundingBoxesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { normalizedBoundingBoxes_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox>( @@ -1082,7 +1081,7 @@ public Builder removeNormalizedBoundingBoxes(int index) { com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox.Builder, com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBoxOrBuilder>( normalizedBoundingBoxes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); normalizedBoundingBoxes_ = null; @@ -1090,7 +1089,7 @@ public Builder removeNormalizedBoundingBoxes(int index) { return normalizedBoundingBoxesBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1280,7 +1279,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java index deec025e18fb..a8bd29a48b91 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java @@ -67,7 +67,7 @@ private FaceSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,13 +185,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.FaceSegment other = (com.google.cloud.videointelligence.v1beta2.FaceSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -395,35 +394,35 @@ public com.google.cloud.videointelligence.v1beta2.FaceSegment 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 @@ -472,7 +471,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1beta2.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1beta2.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.VideoSegment, com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder, @@ -656,7 +655,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegmentOrBuilder getSegme @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java index 7b6aa73c2bda..5db8d17af897 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java @@ -71,7 +71,7 @@ private LabelAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -84,7 +84,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.LabelSegment>(); @@ -98,7 +98,7 @@ private LabelAnnotation( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.LabelFrame>(); @@ -112,7 +112,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,13 +124,13 @@ private LabelAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -469,16 +469,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.LabelAnnotation other = (com.google.cloud.videointelligence.v1beta2.LabelAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && getCategoryEntitiesList().equals(other.getCategoryEntitiesList()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCategoryEntitiesList().equals(other.getCategoryEntitiesList())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -713,7 +712,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation buildPartial() result.entity_ = entityBuilder_.build(); } if (categoryEntitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -722,7 +721,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation buildPartial() result.categoryEntities_ = categoryEntitiesBuilder_.build(); } if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -731,7 +730,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation buildPartial() result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -746,35 +745,35 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation 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 @@ -906,7 +905,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1beta2.Entity entity_ = null; + private com.google.cloud.videointelligence.v1beta2.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.Entity, com.google.cloud.videointelligence.v1beta2.Entity.Builder, @@ -1092,7 +1091,7 @@ public com.google.cloud.videointelligence.v1beta2.EntityOrBuilder getEntityOrBui java.util.Collections.emptyList(); private void ensureCategoryEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList( categoryEntities_); @@ -1496,7 +1495,7 @@ public com.google.cloud.videointelligence.v1beta2.Entity.Builder addCategoryEnti com.google.cloud.videointelligence.v1beta2.Entity.Builder, com.google.cloud.videointelligence.v1beta2.EntityOrBuilder>( categoryEntities_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); categoryEntities_ = null; @@ -1508,7 +1507,7 @@ public com.google.cloud.videointelligence.v1beta2.Entity.Builder addCategoryEnti java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1861,10 +1860,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelSegment.Builder addSegmen com.google.cloud.videointelligence.v1beta2.LabelSegment, com.google.cloud.videointelligence.v1beta2.LabelSegment.Builder, com.google.cloud.videointelligence.v1beta2.LabelSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1874,7 +1870,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelSegment.Builder addSegmen java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList(frames_); bitField0_ |= 0x00000008; @@ -2222,10 +2218,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame.Builder addFramesBu com.google.cloud.videointelligence.v1beta2.LabelFrame, com.google.cloud.videointelligence.v1beta2.LabelFrame.Builder, com.google.cloud.videointelligence.v1beta2.LabelFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -2233,7 +2226,7 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame.Builder addFramesBu @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java index 3d182b67272c..f0f4573bfaad 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java @@ -24,7 +24,6 @@ private LabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder b private LabelDetectionConfig() { labelDetectionMode_ = 0; - stationaryCamera_ = false; model_ = ""; } @@ -73,7 +72,7 @@ private LabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -270,12 +269,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig other = (com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig) obj; - boolean result = true; - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +478,35 @@ public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig 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 @@ -818,7 +816,7 @@ public Builder setModelBytes(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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java index 34e2ab6e3fe0..4931e487e912 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java @@ -22,9 +22,7 @@ private LabelFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LabelFrame() { - confidence_ = 0F; - } + private LabelFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private LabelFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,17 +210,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.LabelFrame other = (com.google.cloud.videointelligence.v1beta2.LabelFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,35 +426,35 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame 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 @@ -511,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -745,7 +740,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java index 8c07dc52a0bd..776f7828692d 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java @@ -22,9 +22,7 @@ private LabelSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private LabelSegment() { - confidence_ = 0F; - } + private LabelSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private LabelSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,17 +211,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.LabelSegment other = (com.google.cloud.videointelligence.v1beta2.LabelSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -432,35 +427,35 @@ public com.google.cloud.videointelligence.v1beta2.LabelSegment 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 @@ -512,7 +507,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1beta2.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1beta2.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.VideoSegment, com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder, @@ -740,7 +735,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java index 8d0074dce519..3b750c75cccc 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java @@ -24,12 +24,7 @@ private NormalizedBoundingBox(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private NormalizedBoundingBox() { - left_ = 0F; - top_ = 0F; - right_ = 0F; - bottom_ = 0F; - } + private NormalizedBoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -77,7 +72,7 @@ private NormalizedBoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -232,25 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox other = (com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getLeft()) - == java.lang.Float.floatToIntBits(other.getLeft())); - result = - result - && (java.lang.Float.floatToIntBits(getTop()) - == java.lang.Float.floatToIntBits(other.getTop())); - result = - result - && (java.lang.Float.floatToIntBits(getRight()) - == java.lang.Float.floatToIntBits(other.getRight())); - result = - result - && (java.lang.Float.floatToIntBits(getBottom()) - == java.lang.Float.floatToIntBits(other.getBottom())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getLeft()) + != java.lang.Float.floatToIntBits(other.getLeft())) return false; + if (java.lang.Float.floatToIntBits(getTop()) != java.lang.Float.floatToIntBits(other.getTop())) + return false; + if (java.lang.Float.floatToIntBits(getRight()) + != java.lang.Float.floatToIntBits(other.getRight())) return false; + if (java.lang.Float.floatToIntBits(getBottom()) + != java.lang.Float.floatToIntBits(other.getBottom())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +448,35 @@ public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox 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 @@ -729,7 +715,7 @@ public Builder clearBottom() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java index 7530891b8a09..7c99fd4c8a3a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java @@ -59,7 +59,7 @@ private ShotChangeDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -384,35 +383,35 @@ public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig buil @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 @@ -572,7 +571,7 @@ public Builder setModelBytes(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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java index 03fcd66c6892..260fd64b8dd5 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -78,7 +78,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.LabelAnnotation>(); @@ -92,7 +92,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.LabelAnnotation>(); @@ -106,7 +106,7 @@ private VideoAnnotationResults( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.FaceAnnotation>(); @@ -120,7 +120,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoSegment>(); @@ -166,7 +166,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,19 +178,19 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } this.unknownFields = unknownFields.build(); @@ -838,24 +838,23 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = - result && getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList()); - result = result && getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList()); - result = result && getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList()); - result = result && getFaceAnnotationsList().equals(other.getFaceAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList())) + return false; + if (!getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList())) return false; + if (!getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList())) return false; + if (!getFaceAnnotationsList().equals(other.getFaceAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && (hasError() == other.hasError()); + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1125,7 +1124,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (segmentLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); @@ -1135,7 +1134,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa result.segmentLabelAnnotations_ = segmentLabelAnnotationsBuilder_.build(); } if (shotLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1144,7 +1143,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa result.shotLabelAnnotations_ = shotLabelAnnotationsBuilder_.build(); } if (frameLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1153,7 +1152,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa result.frameLabelAnnotations_ = frameLabelAnnotationsBuilder_.build(); } if (faceAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = java.util.Collections.unmodifiableList(faceAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1162,7 +1161,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa result.faceAnnotations_ = faceAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -1187,35 +1186,35 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults 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 @@ -1514,7 +1513,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { segmentLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureSegmentLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = new java.util.ArrayList( segmentLabelAnnotations_); @@ -1927,7 +1926,7 @@ public Builder removeSegmentLabelAnnotations(int index) { com.google.cloud.videointelligence.v1beta2.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1beta2.LabelAnnotationOrBuilder>( segmentLabelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segmentLabelAnnotations_ = null; @@ -1939,7 +1938,7 @@ public Builder removeSegmentLabelAnnotations(int index) { shotLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureShotLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList( shotLabelAnnotations_); @@ -2352,7 +2351,7 @@ public Builder removeShotLabelAnnotations(int index) { com.google.cloud.videointelligence.v1beta2.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1beta2.LabelAnnotationOrBuilder>( shotLabelAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); shotLabelAnnotations_ = null; @@ -2364,7 +2363,7 @@ public Builder removeShotLabelAnnotations(int index) { frameLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureFrameLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList( frameLabelAnnotations_); @@ -2777,7 +2776,7 @@ public Builder removeFrameLabelAnnotations(int index) { com.google.cloud.videointelligence.v1beta2.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1beta2.LabelAnnotationOrBuilder>( frameLabelAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frameLabelAnnotations_ = null; @@ -2789,7 +2788,7 @@ public Builder removeFrameLabelAnnotations(int index) { faceAnnotations_ = java.util.Collections.emptyList(); private void ensureFaceAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { faceAnnotations_ = new java.util.ArrayList( faceAnnotations_); @@ -3165,7 +3164,7 @@ public Builder removeFaceAnnotations(int index) { com.google.cloud.videointelligence.v1beta2.FaceAnnotation.Builder, com.google.cloud.videointelligence.v1beta2.FaceAnnotationOrBuilder>( faceAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); faceAnnotations_ = null; @@ -3177,7 +3176,7 @@ public Builder removeFaceAnnotations(int index) { shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -3551,7 +3550,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder, com.google.cloud.videointelligence.v1beta2.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000020) == 0x00000020), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -3560,7 +3559,7 @@ public Builder removeShotAnnotations(int index) { } private com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation - explicitAnnotation_ = null; + explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation.Builder, @@ -3769,7 +3768,7 @@ public Builder clearExplicitAnnotation() { return explicitAnnotationBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -3949,7 +3948,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java index 4f4079b1b443..182962c2712e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java @@ -52,7 +52,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1beta2.VideoSegment>(); @@ -139,7 +139,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -151,7 +151,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -515,32 +515,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.VideoContext other = (com.google.cloud.videointelligence.v1beta2.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && (hasLabelDetectionConfig() == other.hasLabelDetectionConfig()); + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (hasLabelDetectionConfig() != other.hasLabelDetectionConfig()) return false; if (hasLabelDetectionConfig()) { - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; } - result = result && (hasShotChangeDetectionConfig() == other.hasShotChangeDetectionConfig()); + if (hasShotChangeDetectionConfig() != other.hasShotChangeDetectionConfig()) return false; if (hasShotChangeDetectionConfig()) { - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; } - result = - result - && (hasExplicitContentDetectionConfig() == other.hasExplicitContentDetectionConfig()); + if (hasExplicitContentDetectionConfig() != other.hasExplicitContentDetectionConfig()) + return false; if (hasExplicitContentDetectionConfig()) { - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; } - result = result && (hasFaceDetectionConfig() == other.hasFaceDetectionConfig()); + if (hasFaceDetectionConfig() != other.hasFaceDetectionConfig()) return false; if (hasFaceDetectionConfig()) { - result = result && getFaceDetectionConfig().equals(other.getFaceDetectionConfig()); + if (!getFaceDetectionConfig().equals(other.getFaceDetectionConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -778,7 +774,7 @@ public com.google.cloud.videointelligence.v1beta2.VideoContext buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -813,35 +809,35 @@ public com.google.cloud.videointelligence.v1beta2.VideoContext buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -932,7 +928,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1321,17 +1317,13 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder addSegmen com.google.cloud.videointelligence.v1beta2.VideoSegment, com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder, com.google.cloud.videointelligence.v1beta2.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } - private com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig labelDetectionConfig_ = - null; + private com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig labelDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig, com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig.Builder, @@ -1538,7 +1530,7 @@ public Builder clearLabelDetectionConfig() { } private com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig - shotChangeDetectionConfig_ = null; + shotChangeDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig, com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig.Builder, @@ -1748,7 +1740,7 @@ public Builder clearShotChangeDetectionConfig() { } private com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig - explicitContentDetectionConfig_ = null; + explicitContentDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig, com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig.Builder, @@ -1958,8 +1950,7 @@ public Builder clearExplicitContentDetectionConfig() { return explicitContentDetectionConfigBuilder_; } - private com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig faceDetectionConfig_ = - null; + private com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig faceDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig, com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig.Builder, @@ -2157,7 +2148,7 @@ public Builder clearFaceDetectionConfig() { @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-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java index 33d077394f06..dc2acd0c5161 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java @@ -80,7 +80,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1beta2.VideoSegment other = (com.google.cloud.videointelligence.v1beta2.VideoSegment) obj; - boolean result = true; - result = result && (hasStartTimeOffset() == other.hasStartTimeOffset()); + if (hasStartTimeOffset() != other.hasStartTimeOffset()) return false; if (hasStartTimeOffset()) { - result = result && getStartTimeOffset().equals(other.getStartTimeOffset()); + if (!getStartTimeOffset().equals(other.getStartTimeOffset())) return false; } - result = result && (hasEndTimeOffset() == other.hasEndTimeOffset()); + if (hasEndTimeOffset() != other.hasEndTimeOffset()) return false; if (hasEndTimeOffset()) { - result = result && getEndTimeOffset().equals(other.getEndTimeOffset()); + if (!getEndTimeOffset().equals(other.getEndTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +479,35 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegment 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 @@ -560,7 +559,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTimeOffset_ = null; + private com.google.protobuf.Duration startTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -750,7 +749,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOffsetOrBuilder() { return startTimeOffsetBuilder_; } - private com.google.protobuf.Duration endTimeOffset_ = null; + private com.google.protobuf.Duration endTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -942,7 +941,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java index 8524ba710156..96f70a8c5ecc 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress buildP new com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress>( @@ -962,7 +961,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java index c83de22cf13e..2a20603f7721 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -124,7 +124,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -551,18 +551,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -784,7 +783,7 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest buildPa int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -803,35 +802,35 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest 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 @@ -1105,7 +1104,7 @@ public Builder clearInputContent() { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1290,7 +1289,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1p1beta1.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1p1beta1.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.VideoContext, com.google.cloud.videointelligence.v1p1beta1.VideoContext.Builder, @@ -1701,7 +1700,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java index 88fabbe969cc..26ece2a44c58 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse buildP new com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults>( @@ -962,7 +961,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java index 33f14c51e41f..71381abffa9e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java @@ -75,7 +75,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,12 +297,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.Entity other = (com.google.cloud.videointelligence.v1p1beta1.Entity) obj; - boolean result = true; - result = result && getEntityId().equals(other.getEntityId()); - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityId().equals(other.getEntityId())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,35 +504,35 @@ public com.google.cloud.videointelligence.v1p1beta1.Entity 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 @@ -885,7 +884,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java index 0b90c3667793..b21fdd977808 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java @@ -54,7 +54,7 @@ private ExplicitContentAnnotation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame>(); @@ -68,7 +68,7 @@ private ExplicitContentAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private ExplicitContentAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -220,10 +220,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation other = (com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation) obj; - boolean result = true; - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -427,7 +426,7 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation bu new com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation(this); int from_bitField0_ = bitField0_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -441,35 +440,35 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation bu @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 mergeFrom( frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame>(frames_); @@ -930,10 +929,7 @@ public Builder removeFrames(int index) { com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame, com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame.Builder, com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -941,7 +937,7 @@ public Builder removeFrames(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java index d892d2ab68c2..dd45585435c9 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java @@ -60,7 +60,7 @@ private ExplicitContentDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,10 +186,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -395,35 +394,35 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConf @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 @@ -585,7 +584,7 @@ public Builder setModelBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java index a27f22c24346..dc4b7f8a7907 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java @@ -74,7 +74,7 @@ private ExplicitContentFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -235,14 +235,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame other = (com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && pornographyLikelihood_ == other.pornographyLikelihood_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (pornographyLikelihood_ != other.pornographyLikelihood_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,35 +453,35 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame 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 @@ -537,7 +536,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -806,7 +805,7 @@ public Builder clearPornographyLikelihood() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java index a3f1f46c3a73..c0149958c9ae 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java @@ -71,7 +71,7 @@ private LabelAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -84,7 +84,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.LabelSegment>(); @@ -98,7 +98,7 @@ private LabelAnnotation( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.LabelFrame>(); @@ -112,7 +112,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,13 +124,13 @@ private LabelAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -471,16 +471,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation other = (com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && getCategoryEntitiesList().equals(other.getCategoryEntitiesList()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCategoryEntitiesList().equals(other.getCategoryEntitiesList())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -716,7 +715,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation buildPartial result.entity_ = entityBuilder_.build(); } if (categoryEntitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -725,7 +724,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation buildPartial result.categoryEntities_ = categoryEntitiesBuilder_.build(); } if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -734,7 +733,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation buildPartial result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -749,35 +748,35 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation 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 @@ -910,7 +909,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p1beta1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1p1beta1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.Entity, com.google.cloud.videointelligence.v1p1beta1.Entity.Builder, @@ -1096,7 +1095,7 @@ public com.google.cloud.videointelligence.v1p1beta1.EntityOrBuilder getEntityOrB java.util.Collections.emptyList(); private void ensureCategoryEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList( categoryEntities_); @@ -1501,7 +1500,7 @@ public com.google.cloud.videointelligence.v1p1beta1.Entity.Builder addCategoryEn com.google.cloud.videointelligence.v1p1beta1.Entity.Builder, com.google.cloud.videointelligence.v1p1beta1.EntityOrBuilder>( categoryEntities_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); categoryEntities_ = null; @@ -1513,7 +1512,7 @@ public com.google.cloud.videointelligence.v1p1beta1.Entity.Builder addCategoryEn java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1868,10 +1867,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelSegment.Builder addSegm com.google.cloud.videointelligence.v1p1beta1.LabelSegment, com.google.cloud.videointelligence.v1p1beta1.LabelSegment.Builder, com.google.cloud.videointelligence.v1p1beta1.LabelSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1881,7 +1877,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelSegment.Builder addSegm java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -2233,10 +2229,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame.Builder addFrames com.google.cloud.videointelligence.v1p1beta1.LabelFrame, com.google.cloud.videointelligence.v1p1beta1.LabelFrame.Builder, com.google.cloud.videointelligence.v1p1beta1.LabelFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -2244,7 +2237,7 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame.Builder addFrames @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java index 7f7d780021d4..ba1839f2210e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java @@ -24,7 +24,6 @@ private LabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder b private LabelDetectionConfig() { labelDetectionMode_ = 0; - stationaryCamera_ = false; model_ = ""; } @@ -73,7 +72,7 @@ private LabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,12 +270,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig other = (com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig) obj; - boolean result = true; - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig 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 @@ -821,7 +819,7 @@ public Builder setModelBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java index 129a115f70a3..70f490b51d79 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java @@ -22,9 +22,7 @@ private LabelFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LabelFrame() { - confidence_ = 0F; - } + private LabelFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private LabelFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,17 +210,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.LabelFrame other = (com.google.cloud.videointelligence.v1p1beta1.LabelFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,35 +426,35 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame 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 @@ -511,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -745,7 +740,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java index 2f6b85e91eba..0805efd8d1bb 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java @@ -22,9 +22,7 @@ private LabelSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private LabelSegment() { - confidence_ = 0F; - } + private LabelSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private LabelSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,17 +211,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.LabelSegment other = (com.google.cloud.videointelligence.v1p1beta1.LabelSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -432,35 +427,35 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelSegment 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 @@ -512,7 +507,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1p1beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p1beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.VideoSegment, com.google.cloud.videointelligence.v1p1beta1.VideoSegment.Builder, @@ -741,7 +736,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java index c3df2335bdb1..1e326a51afa8 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java @@ -59,7 +59,7 @@ private ShotChangeDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -385,35 +384,35 @@ public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig bu @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 @@ -573,7 +572,7 @@ public Builder setModelBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java index 0447edb328c0..76b045de304c 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java @@ -54,7 +54,7 @@ private SpeechContext( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { phrases_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private SpeechContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private SpeechContext( } 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)) { phrases_ = phrases_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -219,10 +219,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.SpeechContext other = (com.google.cloud.videointelligence.v1p1beta1.SpeechContext) obj; - boolean result = true; - result = result && getPhrasesList().equals(other.getPhrasesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPhrasesList().equals(other.getPhrasesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -413,7 +412,7 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechContext buildPartial() com.google.cloud.videointelligence.v1p1beta1.SpeechContext result = new com.google.cloud.videointelligence.v1p1beta1.SpeechContext(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { phrases_ = phrases_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -424,35 +423,35 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechContext 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 @@ -514,7 +513,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePhrasesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { phrases_ = new com.google.protobuf.LazyStringArrayList(phrases_); bitField0_ |= 0x00000001; } @@ -700,7 +699,7 @@ public Builder addPhrasesBytes(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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java index c3e88e8e3f9d..c858a11b600e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java @@ -24,7 +24,6 @@ private SpeechRecognitionAlternative(com.google.protobuf.GeneratedMessageV3.Buil private SpeechRecognitionAlternative() { transcript_ = ""; - confidence_ = 0F; words_ = java.util.Collections.emptyList(); } @@ -66,7 +65,7 @@ private SpeechRecognitionAlternative( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { words_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.WordInfo>(); @@ -80,7 +79,7 @@ private SpeechRecognitionAlternative( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +91,7 @@ private SpeechRecognitionAlternative( } 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)) { words_ = java.util.Collections.unmodifiableList(words_); } this.unknownFields = unknownFields.build(); @@ -303,15 +302,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative other = (com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative) obj; - boolean result = true; - result = result && getTranscript().equals(other.getTranscript()); - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getWordsList().equals(other.getWordsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTranscript().equals(other.getTranscript())) return false; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getWordsList().equals(other.getWordsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -526,7 +522,7 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative result.transcript_ = transcript_; result.confidence_ = confidence_; if (wordsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { words_ = java.util.Collections.unmodifiableList(words_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -541,35 +537,35 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative @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 @@ -814,7 +810,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureWordsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { words_ = new java.util.ArrayList(words_); bitField0_ |= 0x00000004; @@ -1162,10 +1158,7 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo.Builder addWordsBui com.google.cloud.videointelligence.v1p1beta1.WordInfo, com.google.cloud.videointelligence.v1p1beta1.WordInfo.Builder, com.google.cloud.videointelligence.v1p1beta1.WordInfoOrBuilder>( - words_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + words_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); words_ = null; } return wordsBuilder_; @@ -1173,7 +1166,7 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo.Builder addWordsBui @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java index 82100979dae8..3ffb77c8be67 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java @@ -52,7 +52,7 @@ private SpeechTranscription( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1 @@ -68,7 +68,7 @@ private SpeechTranscription( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private SpeechTranscription( } 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)) { alternatives_ = java.util.Collections.unmodifiableList(alternatives_); } this.unknownFields = unknownFields.build(); @@ -243,10 +243,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription other = (com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,7 +443,7 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription buildPar new com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription(this); int from_bitField0_ = bitField0_; if (alternativesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { alternatives_ = java.util.Collections.unmodifiableList(alternatives_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -458,35 +457,35 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription 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 @@ -569,7 +568,7 @@ public Builder mergeFrom( alternatives_ = java.util.Collections.emptyList(); private void ensureAlternativesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative>( @@ -1028,10 +1027,7 @@ public Builder removeAlternatives(int index) { com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative, com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative.Builder, com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1039,7 +1035,7 @@ public Builder removeAlternatives(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java index 7e3290b9f48e..917a55672001 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java @@ -24,11 +24,8 @@ private SpeechTranscriptionConfig(com.google.protobuf.GeneratedMessageV3.Builder private SpeechTranscriptionConfig() { languageCode_ = ""; - maxAlternatives_ = 0; - filterProfanity_ = false; speechContexts_ = java.util.Collections.emptyList(); - enableAutomaticPunctuation_ = false; - audioTracks_ = java.util.Collections.emptyList(); + audioTracks_ = emptyIntList(); } @java.lang.Override @@ -74,7 +71,7 @@ private SpeechTranscriptionConfig( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { speechContexts_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.SpeechContext>(); @@ -93,31 +90,30 @@ private SpeechTranscriptionConfig( } case 48: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000020) != 0)) { + audioTracks_ = newIntList(); mutable_bitField0_ |= 0x00000020; } - audioTracks_.add(input.readInt32()); + audioTracks_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) - && input.getBytesUntilLimit() > 0) { - audioTracks_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) { + audioTracks_ = newIntList(); mutable_bitField0_ |= 0x00000020; } while (input.getBytesUntilLimit() > 0) { - audioTracks_.add(input.readInt32()); + audioTracks_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -129,11 +125,11 @@ private SpeechTranscriptionConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = java.util.Collections.unmodifiableList(audioTracks_); + if (((mutable_bitField0_ & 0x00000020) != 0)) { + audioTracks_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -338,7 +334,7 @@ public boolean getEnableAutomaticPunctuation() { } public static final int AUDIO_TRACKS_FIELD_NUMBER = 6; - private java.util.List audioTracks_; + private com.google.protobuf.Internal.IntList audioTracks_; /** * * @@ -376,7 +372,7 @@ public int getAudioTracksCount() { * repeated int32 audio_tracks = 6; */ public int getAudioTracks(int index) { - return audioTracks_.get(index); + return audioTracks_.getInt(index); } private int audioTracksMemoizedSerializedSize = -1; @@ -416,7 +412,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(audioTracksMemoizedSerializedSize); } for (int i = 0; i < audioTracks_.size(); i++) { - output.writeInt32NoTag(audioTracks_.get(i)); + output.writeInt32NoTag(audioTracks_.getInt(i)); } unknownFields.writeTo(output); } @@ -446,7 +442,7 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < audioTracks_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(audioTracks_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(audioTracks_.getInt(i)); } size += dataSize; if (!getAudioTracksList().isEmpty()) { @@ -471,15 +467,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig other = (com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (getMaxAlternatives() == other.getMaxAlternatives()); - result = result && (getFilterProfanity() == other.getFilterProfanity()); - result = result && getSpeechContextsList().equals(other.getSpeechContextsList()); - result = result && (getEnableAutomaticPunctuation() == other.getEnableAutomaticPunctuation()); - result = result && getAudioTracksList().equals(other.getAudioTracksList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (getMaxAlternatives() != other.getMaxAlternatives()) return false; + if (getFilterProfanity() != other.getFilterProfanity()) return false; + if (!getSpeechContextsList().equals(other.getSpeechContextsList())) return false; + if (getEnableAutomaticPunctuation() != other.getEnableAutomaticPunctuation()) return false; + if (!getAudioTracksList().equals(other.getAudioTracksList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -669,7 +664,7 @@ public Builder clear() { } enableAutomaticPunctuation_ = false; - audioTracks_ = java.util.Collections.emptyList(); + audioTracks_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -707,7 +702,7 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig bu result.maxAlternatives_ = maxAlternatives_; result.filterProfanity_ = filterProfanity_; if (speechContextsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -716,8 +711,8 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig bu result.speechContexts_ = speechContextsBuilder_.build(); } result.enableAutomaticPunctuation_ = enableAutomaticPunctuation_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = java.util.Collections.unmodifiableList(audioTracks_); + if (((bitField0_ & 0x00000020) != 0)) { + audioTracks_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000020); } result.audioTracks_ = audioTracks_; @@ -728,35 +723,35 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig bu @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1085,7 +1080,7 @@ public Builder clearFilterProfanity() { speechContexts_ = java.util.Collections.emptyList(); private void ensureSpeechContextsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { speechContexts_ = new java.util.ArrayList( speechContexts_); @@ -1461,7 +1456,7 @@ public Builder removeSpeechContexts(int index) { com.google.cloud.videointelligence.v1p1beta1.SpeechContext.Builder, com.google.cloud.videointelligence.v1p1beta1.SpeechContextOrBuilder>( speechContexts_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); speechContexts_ = null; @@ -1528,11 +1523,11 @@ public Builder clearEnableAutomaticPunctuation() { return this; } - private java.util.List audioTracks_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList audioTracks_ = emptyIntList(); private void ensureAudioTracksIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { - audioTracks_ = new java.util.ArrayList(audioTracks_); + if (!((bitField0_ & 0x00000020) != 0)) { + audioTracks_ = mutableCopy(audioTracks_); bitField0_ |= 0x00000020; } } @@ -1547,7 +1542,9 @@ private void ensureAudioTracksIsMutable() { * repeated int32 audio_tracks = 6; */ public java.util.List getAudioTracksList() { - return java.util.Collections.unmodifiableList(audioTracks_); + return ((bitField0_ & 0x00000020) != 0) + ? java.util.Collections.unmodifiableList(audioTracks_) + : audioTracks_; } /** * @@ -1573,7 +1570,7 @@ public int getAudioTracksCount() { * repeated int32 audio_tracks = 6; */ public int getAudioTracks(int index) { - return audioTracks_.get(index); + return audioTracks_.getInt(index); } /** * @@ -1587,7 +1584,7 @@ public int getAudioTracks(int index) { */ public Builder setAudioTracks(int index, int value) { ensureAudioTracksIsMutable(); - audioTracks_.set(index, value); + audioTracks_.setInt(index, value); onChanged(); return this; } @@ -1603,7 +1600,7 @@ public Builder setAudioTracks(int index, int value) { */ public Builder addAudioTracks(int value) { ensureAudioTracksIsMutable(); - audioTracks_.add(value); + audioTracks_.addInt(value); onChanged(); return this; } @@ -1634,7 +1631,7 @@ public Builder addAllAudioTracks(java.lang.Iterable * repeated int32 audio_tracks = 6; */ public Builder clearAudioTracks() { - audioTracks_ = java.util.Collections.emptyList(); + audioTracks_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; @@ -1642,7 +1639,7 @@ public Builder clearAudioTracks() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java index 88bdf87f33c4..11e568f972a5 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -78,7 +78,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation>(); @@ -92,7 +92,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation>(); @@ -106,7 +106,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoSegment>(); @@ -153,7 +153,7 @@ private VideoAnnotationResults( } case 90: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { speechTranscriptions_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription>(); @@ -167,7 +167,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,19 +179,19 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { speechTranscriptions_ = java.util.Collections.unmodifiableList(speechTranscriptions_); } this.unknownFields = unknownFields.build(); @@ -851,24 +851,23 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = - result && getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList()); - result = result && getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList()); - result = result && getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList())) + return false; + if (!getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList())) return false; + if (!getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && getSpeechTranscriptionsList().equals(other.getSpeechTranscriptionsList()); - result = result && (hasError() == other.hasError()); + if (!getSpeechTranscriptionsList().equals(other.getSpeechTranscriptionsList())) return false; + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1139,7 +1138,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (segmentLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); @@ -1149,7 +1148,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build result.segmentLabelAnnotations_ = segmentLabelAnnotationsBuilder_.build(); } if (shotLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1158,7 +1157,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build result.shotLabelAnnotations_ = shotLabelAnnotationsBuilder_.build(); } if (frameLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1167,7 +1166,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build result.frameLabelAnnotations_ = frameLabelAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1181,7 +1180,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build result.explicitAnnotation_ = explicitAnnotationBuilder_.build(); } if (speechTranscriptionsBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { speechTranscriptions_ = java.util.Collections.unmodifiableList(speechTranscriptions_); bitField0_ = (bitField0_ & ~0x00000040); } @@ -1201,35 +1200,35 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build @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 @@ -1529,7 +1528,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { segmentLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureSegmentLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = new java.util.ArrayList( segmentLabelAnnotations_); @@ -1942,7 +1941,7 @@ public Builder removeSegmentLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p1beta1.LabelAnnotationOrBuilder>( segmentLabelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segmentLabelAnnotations_ = null; @@ -1954,7 +1953,7 @@ public Builder removeSegmentLabelAnnotations(int index) { shotLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureShotLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList( shotLabelAnnotations_); @@ -2367,7 +2366,7 @@ public Builder removeShotLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p1beta1.LabelAnnotationOrBuilder>( shotLabelAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); shotLabelAnnotations_ = null; @@ -2379,7 +2378,7 @@ public Builder removeShotLabelAnnotations(int index) { frameLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureFrameLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList( frameLabelAnnotations_); @@ -2792,7 +2791,7 @@ public Builder removeFrameLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p1beta1.LabelAnnotationOrBuilder>( frameLabelAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frameLabelAnnotations_ = null; @@ -2804,7 +2803,7 @@ public Builder removeFrameLabelAnnotations(int index) { shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -3180,7 +3179,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1p1beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p1beta1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -3189,7 +3188,7 @@ public Builder removeShotAnnotations(int index) { } private com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation - explicitAnnotation_ = null; + explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation.Builder, @@ -3402,7 +3401,7 @@ public Builder clearExplicitAnnotation() { speechTranscriptions_ = java.util.Collections.emptyList(); private void ensureSpeechTranscriptionsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { speechTranscriptions_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription>( @@ -3801,7 +3800,7 @@ public Builder removeSpeechTranscriptions(int index) { com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription.Builder, com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionOrBuilder>( speechTranscriptions_, - ((bitField0_ & 0x00000040) == 0x00000040), + ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); speechTranscriptions_ = null; @@ -3809,7 +3808,7 @@ public Builder removeSpeechTranscriptions(int index) { return speechTranscriptionsBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -3989,7 +3988,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java index 3e321f13d897..8a21632fc29a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java @@ -52,7 +52,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p1beta1.VideoSegment>(); @@ -141,7 +141,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -153,7 +153,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -532,33 +532,29 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.VideoContext other = (com.google.cloud.videointelligence.v1p1beta1.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && (hasLabelDetectionConfig() == other.hasLabelDetectionConfig()); + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (hasLabelDetectionConfig() != other.hasLabelDetectionConfig()) return false; if (hasLabelDetectionConfig()) { - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; } - result = result && (hasShotChangeDetectionConfig() == other.hasShotChangeDetectionConfig()); + if (hasShotChangeDetectionConfig() != other.hasShotChangeDetectionConfig()) return false; if (hasShotChangeDetectionConfig()) { - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; } - result = - result - && (hasExplicitContentDetectionConfig() == other.hasExplicitContentDetectionConfig()); + if (hasExplicitContentDetectionConfig() != other.hasExplicitContentDetectionConfig()) + return false; if (hasExplicitContentDetectionConfig()) { - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; } - result = result && (hasSpeechTranscriptionConfig() == other.hasSpeechTranscriptionConfig()); + if (hasSpeechTranscriptionConfig() != other.hasSpeechTranscriptionConfig()) return false; if (hasSpeechTranscriptionConfig()) { - result = - result && getSpeechTranscriptionConfig().equals(other.getSpeechTranscriptionConfig()); + if (!getSpeechTranscriptionConfig().equals(other.getSpeechTranscriptionConfig())) + return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -796,7 +792,7 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoContext buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -831,35 +827,35 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoContext buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -950,7 +946,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1341,17 +1337,13 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoSegment.Builder addSegm com.google.cloud.videointelligence.v1p1beta1.VideoSegment, com.google.cloud.videointelligence.v1p1beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p1beta1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } - private com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig - labelDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig labelDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig, com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig.Builder, @@ -1558,7 +1550,7 @@ public Builder clearLabelDetectionConfig() { } private com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig - shotChangeDetectionConfig_ = null; + shotChangeDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig, com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig.Builder, @@ -1768,7 +1760,7 @@ public Builder clearShotChangeDetectionConfig() { } private com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig - explicitContentDetectionConfig_ = null; + explicitContentDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig, com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig.Builder, @@ -1980,7 +1972,7 @@ public Builder clearExplicitContentDetectionConfig() { } private com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig - speechTranscriptionConfig_ = null; + speechTranscriptionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig, com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig.Builder, @@ -2191,7 +2183,7 @@ public Builder clearSpeechTranscriptionConfig() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java index 3b047bab9221..cdacad681a09 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java @@ -80,7 +80,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.VideoSegment other = (com.google.cloud.videointelligence.v1p1beta1.VideoSegment) obj; - boolean result = true; - result = result && (hasStartTimeOffset() == other.hasStartTimeOffset()); + if (hasStartTimeOffset() != other.hasStartTimeOffset()) return false; if (hasStartTimeOffset()) { - result = result && getStartTimeOffset().equals(other.getStartTimeOffset()); + if (!getStartTimeOffset().equals(other.getStartTimeOffset())) return false; } - result = result && (hasEndTimeOffset() == other.hasEndTimeOffset()); + if (hasEndTimeOffset() != other.hasEndTimeOffset()) return false; if (hasEndTimeOffset()) { - result = result && getEndTimeOffset().equals(other.getEndTimeOffset()); + if (!getEndTimeOffset().equals(other.getEndTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +479,35 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoSegment 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 @@ -560,7 +559,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTimeOffset_ = null; + private com.google.protobuf.Duration startTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -750,7 +749,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOffsetOrBuilder() { return startTimeOffsetBuilder_; } - private com.google.protobuf.Duration endTimeOffset_ = null; + private com.google.protobuf.Duration endTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -942,7 +941,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() { @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-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java index d8afd4351287..8b7260f46a08 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java @@ -91,7 +91,7 @@ private WordInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -319,18 +319,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p1beta1.WordInfo other = (com.google.cloud.videointelligence.v1p1beta1.WordInfo) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && getWord().equals(other.getWord()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getWord().equals(other.getWord())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -556,35 +555,35 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo 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 @@ -640,7 +639,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTime_ = null; + private com.google.protobuf.Duration startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -842,7 +841,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Duration endTime_ = null; + private com.google.protobuf.Duration endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1140,7 +1139,7 @@ public Builder setWordBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoProgress.java index 489325ec7848..c43f72668f60 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoProgress buildP new com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoProgress 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationProgress>( @@ -962,7 +961,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoRequest.java index 45b6f421fd98..4a4cfb43321b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -124,7 +124,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -551,18 +551,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -784,7 +783,7 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoRequest buildPa int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -803,35 +802,35 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoRequest 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 @@ -1105,7 +1104,7 @@ public Builder clearInputContent() { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1290,7 +1289,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1p2beta1.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1p2beta1.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.VideoContext, com.google.cloud.videointelligence.v1p2beta1.VideoContext.Builder, @@ -1701,7 +1700,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoResponse.java index 7ce43009d4ed..34e23fc3135e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoResponse buildP new com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p2beta1.AnnotateVideoResponse 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults>( @@ -962,7 +961,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/Entity.java index a3c291ff6643..7c4fec410969 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/Entity.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/Entity.java @@ -75,7 +75,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,12 +297,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.Entity other = (com.google.cloud.videointelligence.v1p2beta1.Entity) obj; - boolean result = true; - result = result && getEntityId().equals(other.getEntityId()); - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityId().equals(other.getEntityId())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,35 +504,35 @@ public com.google.cloud.videointelligence.v1p2beta1.Entity 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 @@ -885,7 +884,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentAnnotation.java index 708be9b8dcbb..5ea7386073df 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentAnnotation.java @@ -54,7 +54,7 @@ private ExplicitContentAnnotation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame>(); @@ -68,7 +68,7 @@ private ExplicitContentAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private ExplicitContentAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -220,10 +220,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation other = (com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation) obj; - boolean result = true; - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -427,7 +426,7 @@ public com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation bu new com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation(this); int from_bitField0_ = bitField0_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -441,35 +440,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation bu @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 mergeFrom( frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame>(frames_); @@ -930,10 +929,7 @@ public Builder removeFrames(int index) { com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame, com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame.Builder, com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -941,7 +937,7 @@ public Builder removeFrames(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentDetectionConfig.java index 02fe6bcfc81f..811300c9d386 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentDetectionConfig.java @@ -60,7 +60,7 @@ private ExplicitContentDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,10 +186,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -395,35 +394,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConf @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 @@ -585,7 +584,7 @@ public Builder setModelBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentFrame.java index cc760f54dd51..689ef8518d77 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ExplicitContentFrame.java @@ -74,7 +74,7 @@ private ExplicitContentFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -235,14 +235,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame other = (com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && pornographyLikelihood_ == other.pornographyLikelihood_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (pornographyLikelihood_ != other.pornographyLikelihood_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,35 +453,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ExplicitContentFrame 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 @@ -537,7 +536,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -806,7 +805,7 @@ public Builder clearPornographyLikelihood() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelAnnotation.java index d7648ff0a7a8..a554544d4beb 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelAnnotation.java @@ -71,7 +71,7 @@ private LabelAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -84,7 +84,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.LabelSegment>(); @@ -98,7 +98,7 @@ private LabelAnnotation( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.LabelFrame>(); @@ -112,7 +112,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,13 +124,13 @@ private LabelAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -471,16 +471,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation other = (com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && getCategoryEntitiesList().equals(other.getCategoryEntitiesList()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCategoryEntitiesList().equals(other.getCategoryEntitiesList())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -716,7 +715,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation buildPartial result.entity_ = entityBuilder_.build(); } if (categoryEntitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -725,7 +724,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation buildPartial result.categoryEntities_ = categoryEntitiesBuilder_.build(); } if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -734,7 +733,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation buildPartial result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -749,35 +748,35 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation 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 @@ -910,7 +909,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p2beta1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1p2beta1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.Entity, com.google.cloud.videointelligence.v1p2beta1.Entity.Builder, @@ -1096,7 +1095,7 @@ public com.google.cloud.videointelligence.v1p2beta1.EntityOrBuilder getEntityOrB java.util.Collections.emptyList(); private void ensureCategoryEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList( categoryEntities_); @@ -1501,7 +1500,7 @@ public com.google.cloud.videointelligence.v1p2beta1.Entity.Builder addCategoryEn com.google.cloud.videointelligence.v1p2beta1.Entity.Builder, com.google.cloud.videointelligence.v1p2beta1.EntityOrBuilder>( categoryEntities_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); categoryEntities_ = null; @@ -1513,7 +1512,7 @@ public com.google.cloud.videointelligence.v1p2beta1.Entity.Builder addCategoryEn java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1868,10 +1867,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelSegment.Builder addSegm com.google.cloud.videointelligence.v1p2beta1.LabelSegment, com.google.cloud.videointelligence.v1p2beta1.LabelSegment.Builder, com.google.cloud.videointelligence.v1p2beta1.LabelSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1881,7 +1877,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelSegment.Builder addSegm java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -2233,10 +2229,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelFrame.Builder addFrames com.google.cloud.videointelligence.v1p2beta1.LabelFrame, com.google.cloud.videointelligence.v1p2beta1.LabelFrame.Builder, com.google.cloud.videointelligence.v1p2beta1.LabelFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -2244,7 +2237,7 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelFrame.Builder addFrames @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelDetectionConfig.java index d834c3730e9c..a402a8678fc8 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelDetectionConfig.java @@ -24,7 +24,6 @@ private LabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder b private LabelDetectionConfig() { labelDetectionMode_ = 0; - stationaryCamera_ = false; model_ = ""; } @@ -73,7 +72,7 @@ private LabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,12 +270,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig other = (com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig) obj; - boolean result = true; - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig 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 @@ -821,7 +819,7 @@ public Builder setModelBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelFrame.java index b20ac691dc33..cb34de2dc522 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelFrame.java @@ -22,9 +22,7 @@ private LabelFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LabelFrame() { - confidence_ = 0F; - } + private LabelFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private LabelFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,17 +210,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.LabelFrame other = (com.google.cloud.videointelligence.v1p2beta1.LabelFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,35 +426,35 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelFrame 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 @@ -511,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -745,7 +740,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelSegment.java index eff0c45f80c8..96345eb2f783 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/LabelSegment.java @@ -22,9 +22,7 @@ private LabelSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private LabelSegment() { - confidence_ = 0F; - } + private LabelSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private LabelSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,17 +211,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.LabelSegment other = (com.google.cloud.videointelligence.v1p2beta1.LabelSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -432,35 +427,35 @@ public com.google.cloud.videointelligence.v1p2beta1.LabelSegment 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 @@ -512,7 +507,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.VideoSegment, com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder, @@ -741,7 +736,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingBox.java index 5b7f717a86d6..69cd1eb839c2 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingBox.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingBox.java @@ -24,12 +24,7 @@ private NormalizedBoundingBox(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private NormalizedBoundingBox() { - left_ = 0F; - top_ = 0F; - right_ = 0F; - bottom_ = 0F; - } + private NormalizedBoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -77,7 +72,7 @@ private NormalizedBoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -232,25 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox other = (com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getLeft()) - == java.lang.Float.floatToIntBits(other.getLeft())); - result = - result - && (java.lang.Float.floatToIntBits(getTop()) - == java.lang.Float.floatToIntBits(other.getTop())); - result = - result - && (java.lang.Float.floatToIntBits(getRight()) - == java.lang.Float.floatToIntBits(other.getRight())); - result = - result - && (java.lang.Float.floatToIntBits(getBottom()) - == java.lang.Float.floatToIntBits(other.getBottom())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getLeft()) + != java.lang.Float.floatToIntBits(other.getLeft())) return false; + if (java.lang.Float.floatToIntBits(getTop()) != java.lang.Float.floatToIntBits(other.getTop())) + return false; + if (java.lang.Float.floatToIntBits(getRight()) + != java.lang.Float.floatToIntBits(other.getRight())) return false; + if (java.lang.Float.floatToIntBits(getBottom()) + != java.lang.Float.floatToIntBits(other.getBottom())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,35 +451,35 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox 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 @@ -733,7 +719,7 @@ public Builder clearBottom() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingPoly.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingPoly.java index ba4c764038e2..b110f42f6dde 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingPoly.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedBoundingPoly.java @@ -66,7 +66,7 @@ private NormalizedBoundingPoly( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex>(); @@ -80,7 +80,7 @@ private NormalizedBoundingPoly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +92,7 @@ private NormalizedBoundingPoly( } 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)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); } this.unknownFields = unknownFields.build(); @@ -227,10 +227,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly other = (com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly) obj; - boolean result = true; - result = result && getVerticesList().equals(other.getVerticesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getVerticesList().equals(other.getVerticesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -445,7 +444,7 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly build new com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly(this); int from_bitField0_ = bitField0_; if (verticesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -459,35 +458,35 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly build @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 @@ -570,7 +569,7 @@ public Builder mergeFrom( vertices_ = java.util.Collections.emptyList(); private void ensureVerticesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList( vertices_); @@ -945,10 +944,7 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex.Builder add com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex, com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex.Builder, com.google.cloud.videointelligence.v1p2beta1.NormalizedVertexOrBuilder>( - vertices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + vertices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); vertices_ = null; } return verticesBuilder_; @@ -956,7 +952,7 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex.Builder add @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedVertex.java index 99a93335680b..cff70c0c7bce 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedVertex.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/NormalizedVertex.java @@ -24,10 +24,7 @@ private NormalizedVertex(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private NormalizedVertex() { - x_ = 0F; - y_ = 0F; - } + private NormalizedVertex() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -65,7 +62,7 @@ private NormalizedVertex( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,17 +175,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex other = (com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getX()) - == java.lang.Float.floatToIntBits(other.getX())); - result = - result - && (java.lang.Float.floatToIntBits(getY()) - == java.lang.Float.floatToIntBits(other.getY())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getX()) != java.lang.Float.floatToIntBits(other.getX())) + return false; + if (java.lang.Float.floatToIntBits(getY()) != java.lang.Float.floatToIntBits(other.getY())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +382,35 @@ public com.google.cloud.videointelligence.v1p2beta1.NormalizedVertex buildPartia @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 @@ -562,7 +554,7 @@ public Builder clearY() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingAnnotation.java index e62dcaa44d69..90dbf29d891e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingAnnotation.java @@ -23,7 +23,6 @@ private ObjectTrackingAnnotation(com.google.protobuf.GeneratedMessageV3.Builder< } private ObjectTrackingAnnotation() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -70,7 +69,7 @@ private ObjectTrackingAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame>(); @@ -106,7 +105,7 @@ private ObjectTrackingAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -118,7 +117,7 @@ private ObjectTrackingAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -369,22 +368,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation other = (com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && (hasSegment() == other.hasSegment()); + if (!getEntity().equals(other.getEntity())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -616,7 +612,7 @@ public com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation bui } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -636,35 +632,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation bui @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 @@ -752,7 +748,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p2beta1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1p2beta1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.Entity, com.google.cloud.videointelligence.v1p2beta1.Entity.Builder, @@ -982,7 +978,7 @@ public Builder clearConfidence() { frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame>(frames_); @@ -1360,16 +1356,13 @@ public Builder removeFrames(int index) { com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame, com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame.Builder, com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; } - private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.VideoSegment, com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder, @@ -1554,7 +1547,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder getSegm @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingFrame.java index 7c97b2497451..52d15542b678 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ObjectTrackingFrame.java @@ -84,7 +84,7 @@ private ObjectTrackingFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,17 +256,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame other = (com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame) obj; - boolean result = true; - result = result && (hasNormalizedBoundingBox() == other.hasNormalizedBoundingBox()); + if (hasNormalizedBoundingBox() != other.hasNormalizedBoundingBox()) return false; if (hasNormalizedBoundingBox()) { - result = result && getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox()); + if (!getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,35 +486,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingFrame 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 @@ -571,7 +570,7 @@ public Builder mergeFrom( } private com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox - normalizedBoundingBox_ = null; + normalizedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox, com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingBox.Builder, @@ -780,7 +779,7 @@ public Builder clearNormalizedBoundingBox() { return normalizedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -961,7 +960,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ShotChangeDetectionConfig.java index 4522f4eee313..629bb9ee11d0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/ShotChangeDetectionConfig.java @@ -59,7 +59,7 @@ private ShotChangeDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -385,35 +384,35 @@ public com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig bu @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 @@ -573,7 +572,7 @@ public Builder setModelBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextAnnotation.java index d15e3b9db9b4..b1fd66400ef5 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextAnnotation.java @@ -62,7 +62,7 @@ private TextAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.TextSegment>(); @@ -76,7 +76,7 @@ private TextAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private TextAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -272,11 +272,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.TextAnnotation other = (com.google.cloud.videointelligence.v1p2beta1.TextAnnotation) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,7 +480,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextAnnotation buildPartial( int to_bitField0_ = 0; result.text_ = text_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -496,35 +495,35 @@ public com.google.cloud.videointelligence.v1p2beta1.TextAnnotation 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 @@ -701,7 +700,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1055,10 +1054,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextSegment.Builder addSegme com.google.cloud.videointelligence.v1p2beta1.TextSegment, com.google.cloud.videointelligence.v1p2beta1.TextSegment.Builder, com.google.cloud.videointelligence.v1p2beta1.TextSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1066,7 +1062,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextSegment.Builder addSegme @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextDetectionConfig.java index d7299a11a1ec..41b14ef7c943 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextDetectionConfig.java @@ -53,7 +53,7 @@ private TextDetectionConfig( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private TextDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private TextDetectionConfig( } 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)) { languageHints_ = languageHints_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -210,10 +210,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig other = (com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig) obj; - boolean result = true; - result = result && getLanguageHintsList().equals(other.getLanguageHintsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageHintsList().equals(other.getLanguageHintsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -404,7 +403,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig buildPar com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig result = new com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { languageHints_ = languageHints_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -415,35 +414,35 @@ public com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig 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 @@ -508,7 +507,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLanguageHintsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(languageHints_); bitField0_ |= 0x00000001; } @@ -676,7 +675,7 @@ public Builder addLanguageHintsBytes(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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextFrame.java index e89eec003242..b7f287069896 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextFrame.java @@ -85,7 +85,7 @@ private TextFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,17 +256,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.TextFrame other = (com.google.cloud.videointelligence.v1p2beta1.TextFrame) obj; - boolean result = true; - result = result && (hasRotatedBoundingBox() == other.hasRotatedBoundingBox()); + if (hasRotatedBoundingBox() != other.hasRotatedBoundingBox()) return false; if (hasRotatedBoundingBox()) { - result = result && getRotatedBoundingBox().equals(other.getRotatedBoundingBox()); + if (!getRotatedBoundingBox().equals(other.getRotatedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,35 +486,35 @@ public com.google.cloud.videointelligence.v1p2beta1.TextFrame 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 @@ -567,8 +566,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly - rotatedBoundingBox_ = null; + private com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly rotatedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly, com.google.cloud.videointelligence.v1p2beta1.NormalizedBoundingPoly.Builder, @@ -777,7 +775,7 @@ public Builder clearRotatedBoundingBox() { return rotatedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -958,7 +956,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextSegment.java index 23a8bbb7434e..b71a36112894 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/TextSegment.java @@ -23,7 +23,6 @@ private TextSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private TextSegment() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -75,7 +74,7 @@ private TextSegment( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.TextFrame>(); @@ -89,7 +88,7 @@ private TextSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -101,7 +100,7 @@ private TextSegment( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -304,18 +303,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.TextSegment other = (com.google.cloud.videointelligence.v1p2beta1.TextSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSegment().equals(other.getSegment())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -533,7 +529,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextSegment buildPartial() { } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -548,35 +544,35 @@ public com.google.cloud.videointelligence.v1p2beta1.TextSegment 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 @@ -657,7 +653,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p2beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.VideoSegment, com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder, @@ -891,7 +887,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -1240,10 +1236,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextFrame.Builder addFramesB com.google.cloud.videointelligence.v1p2beta1.TextFrame, com.google.cloud.videointelligence.v1p2beta1.TextFrame.Builder, com.google.cloud.videointelligence.v1p2beta1.TextFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1251,7 +1244,7 @@ public com.google.cloud.videointelligence.v1p2beta1.TextFrame.Builder addFramesB @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoAnnotationProgress.java index 1e6c19ff207e..fe0afa47bfdd 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -79,7 +79,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation>(); @@ -93,7 +93,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation>(); @@ -107,7 +107,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoSegment>(); @@ -154,7 +154,7 @@ private VideoAnnotationResults( } case 98: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { textAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.TextAnnotation>(); @@ -168,7 +168,7 @@ private VideoAnnotationResults( } case 114: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation>(); @@ -183,7 +183,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -195,22 +195,22 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); } this.unknownFields = unknownFields.build(); @@ -958,25 +958,24 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = - result && getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList()); - result = result && getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList()); - result = result && getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList())) + return false; + if (!getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList())) return false; + if (!getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && getTextAnnotationsList().equals(other.getTextAnnotationsList()); - result = result && getObjectAnnotationsList().equals(other.getObjectAnnotationsList()); - result = result && (hasError() == other.hasError()); + if (!getTextAnnotationsList().equals(other.getTextAnnotationsList())) return false; + if (!getObjectAnnotationsList().equals(other.getObjectAnnotationsList())) return false; + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1258,7 +1257,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (segmentLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); @@ -1268,7 +1267,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build result.segmentLabelAnnotations_ = segmentLabelAnnotationsBuilder_.build(); } if (shotLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1277,7 +1276,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build result.shotLabelAnnotations_ = shotLabelAnnotationsBuilder_.build(); } if (frameLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1286,7 +1285,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build result.frameLabelAnnotations_ = frameLabelAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1300,7 +1299,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build result.explicitAnnotation_ = explicitAnnotationBuilder_.build(); } if (textAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); bitField0_ = (bitField0_ & ~0x00000040); } @@ -1309,7 +1308,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build result.textAnnotations_ = textAnnotationsBuilder_.build(); } if (objectAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1329,35 +1328,35 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoAnnotationResults build @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 @@ -1684,7 +1683,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { segmentLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureSegmentLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = new java.util.ArrayList( segmentLabelAnnotations_); @@ -2097,7 +2096,7 @@ public Builder removeSegmentLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p2beta1.LabelAnnotationOrBuilder>( segmentLabelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segmentLabelAnnotations_ = null; @@ -2109,7 +2108,7 @@ public Builder removeSegmentLabelAnnotations(int index) { shotLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureShotLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList( shotLabelAnnotations_); @@ -2522,7 +2521,7 @@ public Builder removeShotLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p2beta1.LabelAnnotationOrBuilder>( shotLabelAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); shotLabelAnnotations_ = null; @@ -2534,7 +2533,7 @@ public Builder removeShotLabelAnnotations(int index) { frameLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureFrameLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList( frameLabelAnnotations_); @@ -2947,7 +2946,7 @@ public Builder removeFrameLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p2beta1.LabelAnnotationOrBuilder>( frameLabelAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frameLabelAnnotations_ = null; @@ -2959,7 +2958,7 @@ public Builder removeFrameLabelAnnotations(int index) { shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -3335,7 +3334,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p2beta1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -3344,7 +3343,7 @@ public Builder removeShotAnnotations(int index) { } private com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation - explicitAnnotation_ = null; + explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1p2beta1.ExplicitContentAnnotation.Builder, @@ -3557,7 +3556,7 @@ public Builder clearExplicitAnnotation() { textAnnotations_ = java.util.Collections.emptyList(); private void ensureTextAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { textAnnotations_ = new java.util.ArrayList( textAnnotations_); @@ -3988,7 +3987,7 @@ public Builder removeTextAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.TextAnnotation.Builder, com.google.cloud.videointelligence.v1p2beta1.TextAnnotationOrBuilder>( textAnnotations_, - ((bitField0_ & 0x00000040) == 0x00000040), + ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); textAnnotations_ = null; @@ -4000,7 +3999,7 @@ public Builder removeTextAnnotations(int index) { objectAnnotations_ = java.util.Collections.emptyList(); private void ensureObjectAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation>( @@ -4404,7 +4403,7 @@ public Builder removeObjectAnnotations(int index) { com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotation.Builder, com.google.cloud.videointelligence.v1p2beta1.ObjectTrackingAnnotationOrBuilder>( objectAnnotations_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); objectAnnotations_ = null; @@ -4412,7 +4411,7 @@ public Builder removeObjectAnnotations(int index) { return objectAnnotationsBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -4592,7 +4591,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoContext.java index 8a12ada07fb3..50a5726d0327 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoContext.java @@ -52,7 +52,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p2beta1.VideoSegment>(); @@ -140,7 +140,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,7 +152,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -523,32 +523,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.VideoContext other = (com.google.cloud.videointelligence.v1p2beta1.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && (hasLabelDetectionConfig() == other.hasLabelDetectionConfig()); + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (hasLabelDetectionConfig() != other.hasLabelDetectionConfig()) return false; if (hasLabelDetectionConfig()) { - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; } - result = result && (hasShotChangeDetectionConfig() == other.hasShotChangeDetectionConfig()); + if (hasShotChangeDetectionConfig() != other.hasShotChangeDetectionConfig()) return false; if (hasShotChangeDetectionConfig()) { - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; } - result = - result - && (hasExplicitContentDetectionConfig() == other.hasExplicitContentDetectionConfig()); + if (hasExplicitContentDetectionConfig() != other.hasExplicitContentDetectionConfig()) + return false; if (hasExplicitContentDetectionConfig()) { - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; } - result = result && (hasTextDetectionConfig() == other.hasTextDetectionConfig()); + if (hasTextDetectionConfig() != other.hasTextDetectionConfig()) return false; if (hasTextDetectionConfig()) { - result = result && getTextDetectionConfig().equals(other.getTextDetectionConfig()); + if (!getTextDetectionConfig().equals(other.getTextDetectionConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -786,7 +782,7 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoContext buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -821,35 +817,35 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoContext 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 @@ -940,7 +936,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1331,17 +1327,13 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder addSegm com.google.cloud.videointelligence.v1p2beta1.VideoSegment, com.google.cloud.videointelligence.v1p2beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p2beta1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } - private com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig - labelDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig labelDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig, com.google.cloud.videointelligence.v1p2beta1.LabelDetectionConfig.Builder, @@ -1548,7 +1540,7 @@ public Builder clearLabelDetectionConfig() { } private com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig - shotChangeDetectionConfig_ = null; + shotChangeDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig, com.google.cloud.videointelligence.v1p2beta1.ShotChangeDetectionConfig.Builder, @@ -1758,7 +1750,7 @@ public Builder clearShotChangeDetectionConfig() { } private com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConfig - explicitContentDetectionConfig_ = null; + explicitContentDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConfig, com.google.cloud.videointelligence.v1p2beta1.ExplicitContentDetectionConfig.Builder, @@ -1969,8 +1961,7 @@ public Builder clearExplicitContentDetectionConfig() { return explicitContentDetectionConfigBuilder_; } - private com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig textDetectionConfig_ = - null; + private com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig textDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig, com.google.cloud.videointelligence.v1p2beta1.TextDetectionConfig.Builder, @@ -2178,7 +2169,7 @@ public Builder clearTextDetectionConfig() { @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-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoSegment.java index 6d213151393c..6628ef629e6b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p2beta1/src/main/java/com/google/cloud/videointelligence/v1p2beta1/VideoSegment.java @@ -80,7 +80,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p2beta1.VideoSegment other = (com.google.cloud.videointelligence.v1p2beta1.VideoSegment) obj; - boolean result = true; - result = result && (hasStartTimeOffset() == other.hasStartTimeOffset()); + if (hasStartTimeOffset() != other.hasStartTimeOffset()) return false; if (hasStartTimeOffset()) { - result = result && getStartTimeOffset().equals(other.getStartTimeOffset()); + if (!getStartTimeOffset().equals(other.getStartTimeOffset())) return false; } - result = result && (hasEndTimeOffset() == other.hasEndTimeOffset()); + if (hasEndTimeOffset() != other.hasEndTimeOffset()) return false; if (hasEndTimeOffset()) { - result = result && getEndTimeOffset().equals(other.getEndTimeOffset()); + if (!getEndTimeOffset().equals(other.getEndTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +479,35 @@ public com.google.cloud.videointelligence.v1p2beta1.VideoSegment 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 @@ -560,7 +559,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTimeOffset_ = null; + private com.google.protobuf.Duration startTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -750,7 +749,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOffsetOrBuilder() { return startTimeOffsetBuilder_; } - private com.google.protobuf.Duration endTimeOffset_ = null; + private com.google.protobuf.Duration endTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -942,7 +941,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoProgress.java index 5d4dd05b7f93..95b633a2a043 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoProgress.java @@ -54,7 +54,7 @@ private AnnotateVideoProgress( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationProgress>(); @@ -68,7 +68,7 @@ private AnnotateVideoProgress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoProgress( } 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)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress other = (com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress) obj; - boolean result = true; - result = result && getAnnotationProgressList().equals(other.getAnnotationProgressList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationProgressList().equals(other.getAnnotationProgressList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress buildP new com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress(this); int from_bitField0_ = bitField0_; if (annotationProgressBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = java.util.Collections.unmodifiableList(annotationProgress_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoProgress 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationProgress_ = java.util.Collections.emptyList(); private void ensureAnnotationProgressIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationProgress_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationProgress>( @@ -962,7 +961,7 @@ public Builder removeAnnotationProgress(int index) { com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationProgress.Builder, com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationProgressOrBuilder>( annotationProgress_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationProgress_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationProgress(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoRequest.java index fd0bc4192263..aa77202a5d06 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoRequest.java @@ -64,7 +64,7 @@ private AnnotateVideoRequest( case 16: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -77,7 +77,7 @@ private AnnotateVideoRequest( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -124,7 +124,7 @@ private AnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -136,7 +136,7 @@ private AnnotateVideoRequest( } 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)) { features_ = java.util.Collections.unmodifiableList(features_); } this.unknownFields = unknownFields.build(); @@ -551,18 +551,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest other = (com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = result && getInputContent().equals(other.getInputContent()); - result = result && features_.equals(other.features_); - result = result && (hasVideoContext() == other.hasVideoContext()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getInputContent().equals(other.getInputContent())) return false; + if (!features_.equals(other.features_)) return false; + if (hasVideoContext() != other.hasVideoContext()) return false; if (hasVideoContext()) { - result = result && getVideoContext().equals(other.getVideoContext()); + if (!getVideoContext().equals(other.getVideoContext())) return false; } - result = result && getOutputUri().equals(other.getOutputUri()); - result = result && getLocationId().equals(other.getLocationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUri().equals(other.getOutputUri())) return false; + if (!getLocationId().equals(other.getLocationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -784,7 +783,7 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest buildPa int to_bitField0_ = 0; result.inputUri_ = inputUri_; result.inputContent_ = inputContent_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { features_ = java.util.Collections.unmodifiableList(features_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -803,35 +802,35 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoRequest 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 @@ -1105,7 +1104,7 @@ public Builder clearInputContent() { private java.util.List features_ = java.util.Collections.emptyList(); private void ensureFeaturesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { features_ = new java.util.ArrayList(features_); bitField0_ |= 0x00000004; } @@ -1290,7 +1289,7 @@ public Builder addAllFeaturesValue(java.lang.Iterable values) return this; } - private com.google.cloud.videointelligence.v1p3beta1.VideoContext videoContext_ = null; + private com.google.cloud.videointelligence.v1p3beta1.VideoContext videoContext_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.VideoContext, com.google.cloud.videointelligence.v1p3beta1.VideoContext.Builder, @@ -1701,7 +1700,7 @@ public Builder setLocationIdBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoResponse.java index 6589d08cc00c..a818da38a924 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/AnnotateVideoResponse.java @@ -54,7 +54,7 @@ private AnnotateVideoResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults>(); @@ -68,7 +68,7 @@ private AnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private AnnotateVideoResponse( } 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)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); } this.unknownFields = unknownFields.build(); @@ -228,10 +228,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse other = (com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse) obj; - boolean result = true; - result = result && getAnnotationResultsList().equals(other.getAnnotationResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsList().equals(other.getAnnotationResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -434,7 +433,7 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse buildP new com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse(this); int from_bitField0_ = bitField0_; if (annotationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { annotationResults_ = java.util.Collections.unmodifiableList(annotationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -448,35 +447,35 @@ public com.google.cloud.videointelligence.v1p3beta1.AnnotateVideoResponse 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 @@ -559,7 +558,7 @@ public Builder mergeFrom( annotationResults_ = java.util.Collections.emptyList(); private void ensureAnnotationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { annotationResults_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults>( @@ -962,7 +961,7 @@ public Builder removeAnnotationResults(int index) { com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults.Builder, com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResultsOrBuilder>( annotationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); annotationResults_ = null; @@ -972,7 +971,7 @@ public Builder removeAnnotationResults(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/Entity.java index 088bf998db2e..f4df7045c238 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/Entity.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/Entity.java @@ -75,7 +75,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -297,12 +297,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.Entity other = (com.google.cloud.videointelligence.v1p3beta1.Entity) obj; - boolean result = true; - result = result && getEntityId().equals(other.getEntityId()); - result = result && getDescription().equals(other.getDescription()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityId().equals(other.getEntityId())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,35 +504,35 @@ public com.google.cloud.videointelligence.v1p3beta1.Entity 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 @@ -885,7 +884,7 @@ public Builder setLanguageCodeBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentAnnotation.java index 66997b5cba0f..3eedb52eccc7 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentAnnotation.java @@ -54,7 +54,7 @@ private ExplicitContentAnnotation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame>(); @@ -68,7 +68,7 @@ private ExplicitContentAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private ExplicitContentAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -220,10 +220,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation other = (com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation) obj; - boolean result = true; - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -427,7 +426,7 @@ public com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation bu new com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation(this); int from_bitField0_ = bitField0_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -441,35 +440,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation bu @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 mergeFrom( frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame>(frames_); @@ -930,10 +929,7 @@ public Builder removeFrames(int index) { com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame, com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame.Builder, com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -941,7 +937,7 @@ public Builder removeFrames(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentDetectionConfig.java index e56643658a02..d407e06dbc13 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentDetectionConfig.java @@ -60,7 +60,7 @@ private ExplicitContentDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,10 +186,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -395,35 +394,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConf @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 @@ -585,7 +584,7 @@ public Builder setModelBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentFrame.java index eacb4d53b3f6..0733217dec4b 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ExplicitContentFrame.java @@ -74,7 +74,7 @@ private ExplicitContentFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -235,14 +235,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame other = (com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && pornographyLikelihood_ == other.pornographyLikelihood_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (pornographyLikelihood_ != other.pornographyLikelihood_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,35 +453,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ExplicitContentFrame 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 @@ -537,7 +536,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -806,7 +805,7 @@ public Builder clearPornographyLikelihood() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelAnnotation.java index 8210f5edc2e8..a9cb7911c211 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelAnnotation.java @@ -71,7 +71,7 @@ private LabelAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -84,7 +84,7 @@ private LabelAnnotation( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.LabelSegment>(); @@ -98,7 +98,7 @@ private LabelAnnotation( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.LabelFrame>(); @@ -112,7 +112,7 @@ private LabelAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,13 +124,13 @@ private LabelAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -471,16 +471,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation other = (com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && getCategoryEntitiesList().equals(other.getCategoryEntitiesList()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCategoryEntitiesList().equals(other.getCategoryEntitiesList())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -716,7 +715,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation buildPartial result.entity_ = entityBuilder_.build(); } if (categoryEntitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = java.util.Collections.unmodifiableList(categoryEntities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -725,7 +724,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation buildPartial result.categoryEntities_ = categoryEntitiesBuilder_.build(); } if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -734,7 +733,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation buildPartial result.segments_ = segmentsBuilder_.build(); } if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -749,35 +748,35 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation 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 @@ -910,7 +909,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p3beta1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1p3beta1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.Entity, com.google.cloud.videointelligence.v1p3beta1.Entity.Builder, @@ -1096,7 +1095,7 @@ public com.google.cloud.videointelligence.v1p3beta1.EntityOrBuilder getEntityOrB java.util.Collections.emptyList(); private void ensureCategoryEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { categoryEntities_ = new java.util.ArrayList( categoryEntities_); @@ -1501,7 +1500,7 @@ public com.google.cloud.videointelligence.v1p3beta1.Entity.Builder addCategoryEn com.google.cloud.videointelligence.v1p3beta1.Entity.Builder, com.google.cloud.videointelligence.v1p3beta1.EntityOrBuilder>( categoryEntities_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); categoryEntities_ = null; @@ -1513,7 +1512,7 @@ public com.google.cloud.videointelligence.v1p3beta1.Entity.Builder addCategoryEn java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1868,10 +1867,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelSegment.Builder addSegm com.google.cloud.videointelligence.v1p3beta1.LabelSegment, com.google.cloud.videointelligence.v1p3beta1.LabelSegment.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1881,7 +1877,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelSegment.Builder addSegm java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -2233,10 +2229,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelFrame.Builder addFrames com.google.cloud.videointelligence.v1p3beta1.LabelFrame, com.google.cloud.videointelligence.v1p3beta1.LabelFrame.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -2244,7 +2237,7 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelFrame.Builder addFrames @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelDetectionConfig.java index 290baa79ad98..286541e229ef 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelDetectionConfig.java @@ -24,7 +24,6 @@ private LabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Builder b private LabelDetectionConfig() { labelDetectionMode_ = 0; - stationaryCamera_ = false; model_ = ""; } @@ -73,7 +72,7 @@ private LabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,12 +270,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig) obj; - boolean result = true; - result = result && labelDetectionMode_ == other.labelDetectionMode_; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (labelDetectionMode_ != other.labelDetectionMode_) return false; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig 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 @@ -821,7 +819,7 @@ public Builder setModelBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelFrame.java index af457047bd8c..05975216e6c2 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelFrame.java @@ -22,9 +22,7 @@ private LabelFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private LabelFrame() { - confidence_ = 0F; - } + private LabelFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private LabelFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,17 +210,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.LabelFrame other = (com.google.cloud.videointelligence.v1p3beta1.LabelFrame) obj; - boolean result = true; - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -431,35 +426,35 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelFrame 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 @@ -511,7 +506,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -745,7 +740,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelSegment.java index 0869f023e290..9490b2fb7373 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/LabelSegment.java @@ -22,9 +22,7 @@ private LabelSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private LabelSegment() { - confidence_ = 0F; - } + private LabelSegment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private LabelSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,17 +211,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.LabelSegment other = (com.google.cloud.videointelligence.v1p3beta1.LabelSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -432,35 +427,35 @@ public com.google.cloud.videointelligence.v1p3beta1.LabelSegment 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 @@ -512,7 +507,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1p3beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p3beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.VideoSegment, com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder, @@ -741,7 +736,7 @@ public Builder clearConfidence() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingBox.java index cbb0e2b0ab0f..b65bb8e3256c 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingBox.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingBox.java @@ -24,12 +24,7 @@ private NormalizedBoundingBox(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private NormalizedBoundingBox() { - left_ = 0F; - top_ = 0F; - right_ = 0F; - bottom_ = 0F; - } + private NormalizedBoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -77,7 +72,7 @@ private NormalizedBoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -232,25 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox other = (com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getLeft()) - == java.lang.Float.floatToIntBits(other.getLeft())); - result = - result - && (java.lang.Float.floatToIntBits(getTop()) - == java.lang.Float.floatToIntBits(other.getTop())); - result = - result - && (java.lang.Float.floatToIntBits(getRight()) - == java.lang.Float.floatToIntBits(other.getRight())); - result = - result - && (java.lang.Float.floatToIntBits(getBottom()) - == java.lang.Float.floatToIntBits(other.getBottom())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getLeft()) + != java.lang.Float.floatToIntBits(other.getLeft())) return false; + if (java.lang.Float.floatToIntBits(getTop()) != java.lang.Float.floatToIntBits(other.getTop())) + return false; + if (java.lang.Float.floatToIntBits(getRight()) + != java.lang.Float.floatToIntBits(other.getRight())) return false; + if (java.lang.Float.floatToIntBits(getBottom()) + != java.lang.Float.floatToIntBits(other.getBottom())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,35 +451,35 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox 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 @@ -733,7 +719,7 @@ public Builder clearBottom() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingPoly.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingPoly.java index 3529ba0b3c75..a5718a5ed2ab 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingPoly.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedBoundingPoly.java @@ -66,7 +66,7 @@ private NormalizedBoundingPoly( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex>(); @@ -80,7 +80,7 @@ private NormalizedBoundingPoly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +92,7 @@ private NormalizedBoundingPoly( } 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)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); } this.unknownFields = unknownFields.build(); @@ -227,10 +227,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly other = (com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly) obj; - boolean result = true; - result = result && getVerticesList().equals(other.getVerticesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getVerticesList().equals(other.getVerticesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -445,7 +444,7 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly build new com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly(this); int from_bitField0_ = bitField0_; if (verticesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { vertices_ = java.util.Collections.unmodifiableList(vertices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -459,35 +458,35 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly build @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 @@ -570,7 +569,7 @@ public Builder mergeFrom( vertices_ = java.util.Collections.emptyList(); private void ensureVerticesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { vertices_ = new java.util.ArrayList( vertices_); @@ -945,10 +944,7 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex.Builder add com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex, com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex.Builder, com.google.cloud.videointelligence.v1p3beta1.NormalizedVertexOrBuilder>( - vertices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + vertices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); vertices_ = null; } return verticesBuilder_; @@ -956,7 +952,7 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex.Builder add @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedVertex.java index 9dc80bce9e23..f1976324c7c5 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedVertex.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/NormalizedVertex.java @@ -24,10 +24,7 @@ private NormalizedVertex(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private NormalizedVertex() { - x_ = 0F; - y_ = 0F; - } + private NormalizedVertex() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -65,7 +62,7 @@ private NormalizedVertex( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,17 +175,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex other = (com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getX()) - == java.lang.Float.floatToIntBits(other.getX())); - result = - result - && (java.lang.Float.floatToIntBits(getY()) - == java.lang.Float.floatToIntBits(other.getY())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getX()) != java.lang.Float.floatToIntBits(other.getX())) + return false; + if (java.lang.Float.floatToIntBits(getY()) != java.lang.Float.floatToIntBits(other.getY())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +382,35 @@ public com.google.cloud.videointelligence.v1p3beta1.NormalizedVertex buildPartia @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 @@ -562,7 +554,7 @@ public Builder clearY() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingAnnotation.java index 5a80eda4f7b7..780e050fc763 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingAnnotation.java @@ -23,7 +23,6 @@ private ObjectTrackingAnnotation(com.google.protobuf.GeneratedMessageV3.Builder< } private ObjectTrackingAnnotation() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -70,7 +69,7 @@ private ObjectTrackingAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame>(); @@ -115,7 +114,7 @@ private ObjectTrackingAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -127,7 +126,7 @@ private ObjectTrackingAnnotation( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -472,30 +471,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation other = (com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && getTrackInfoCase().equals(other.getTrackInfoCase()); - if (!result) return false; + if (!getEntity().equals(other.getEntity())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!getTrackInfoCase().equals(other.getTrackInfoCase())) return false; switch (trackInfoCase_) { case 3: - result = result && getSegment().equals(other.getSegment()); + if (!getSegment().equals(other.getSegment())) return false; break; case 5: - result = result && (getTrackId() == other.getTrackId()); + if (getTrackId() != other.getTrackId()) 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 @@ -731,7 +726,7 @@ public com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation bui } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -757,35 +752,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation bui @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 @@ -900,7 +895,7 @@ public Builder clearTrackInfo() { private int bitField0_; - private com.google.cloud.videointelligence.v1p3beta1.Entity entity_ = null; + private com.google.cloud.videointelligence.v1p3beta1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.Entity, com.google.cloud.videointelligence.v1p3beta1.Entity.Builder, @@ -1130,7 +1125,7 @@ public Builder clearConfidence() { frames_ = java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame>(frames_); @@ -1562,10 +1557,7 @@ public Builder removeFrames(int index) { com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame, com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame.Builder, com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1850,7 +1842,7 @@ public Builder clearTrackId() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingFrame.java index f293e743dc87..d9577d591d41 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ObjectTrackingFrame.java @@ -84,7 +84,7 @@ private ObjectTrackingFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,17 +256,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame other = (com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame) obj; - boolean result = true; - result = result && (hasNormalizedBoundingBox() == other.hasNormalizedBoundingBox()); + if (hasNormalizedBoundingBox() != other.hasNormalizedBoundingBox()) return false; if (hasNormalizedBoundingBox()) { - result = result && getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox()); + if (!getNormalizedBoundingBox().equals(other.getNormalizedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,35 +486,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingFrame 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 @@ -571,7 +570,7 @@ public Builder mergeFrom( } private com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox - normalizedBoundingBox_ = null; + normalizedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox, com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingBox.Builder, @@ -780,7 +779,7 @@ public Builder clearNormalizedBoundingBox() { return normalizedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -961,7 +960,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ShotChangeDetectionConfig.java index f1181ed136dc..5cee5fed0f86 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/ShotChangeDetectionConfig.java @@ -59,7 +59,7 @@ private ShotChangeDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig) obj; - boolean result = true; - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -385,35 +384,35 @@ public com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig bu @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 @@ -573,7 +572,7 @@ public Builder setModelBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoRequest.java index 800c6b5d47cf..f8a4adb332d8 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoRequest.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoRequest.java @@ -82,7 +82,7 @@ private StreamingAnnotateVideoRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -286,21 +286,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoRequest other = (com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoRequest) obj; - boolean result = true; - result = result && getStreamingRequestCase().equals(other.getStreamingRequestCase()); - if (!result) return false; + if (!getStreamingRequestCase().equals(other.getStreamingRequestCase())) return false; switch (streamingRequestCase_) { case 1: - result = result && getVideoConfig().equals(other.getVideoConfig()); + if (!getVideoConfig().equals(other.getVideoConfig())) return false; break; case 2: - result = result && getInputContent().equals(other.getInputContent()); + if (!getInputContent().equals(other.getInputContent())) 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 @@ -529,35 +527,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoReques @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 @@ -939,7 +937,7 @@ public Builder clearInputContent() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoResponse.java index 729773262d45..b276aee40e2e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoResponse.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingAnnotateVideoResponse.java @@ -95,7 +95,7 @@ private StreamingAnnotateVideoResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -328,18 +328,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoResponse other = (com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoResponse) obj; - boolean result = true; - result = result && (hasError() == other.hasError()); + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && (hasAnnotationResults() == other.hasAnnotationResults()); + if (hasAnnotationResults() != other.hasAnnotationResults()) return false; if (hasAnnotationResults()) { - result = result && getAnnotationResults().equals(other.getAnnotationResults()); + if (!getAnnotationResults().equals(other.getAnnotationResults())) return false; } - result = result && getAnnotationResultsUri().equals(other.getAnnotationResultsUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnnotationResultsUri().equals(other.getAnnotationResultsUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -577,35 +576,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingAnnotateVideoRespon @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 @@ -667,7 +666,7 @@ public Builder mergeFrom( return this; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -846,7 +845,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { } private com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults - annotationResults_ = null; + annotationResults_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults, com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults.Builder, @@ -1168,7 +1167,7 @@ public Builder setAnnotationResultsUriBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingExplicitContentDetectionConfig.java index af2d93c9fc76..642f492f111e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingExplicitContentDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingExplicitContentDetectionConfig.java @@ -52,7 +52,7 @@ private StreamingExplicitContentDetectionConfig( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -127,9 +127,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingExplicitContentDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingExplicitContentDetectionConfig) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -336,35 +335,35 @@ 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 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 @@ -421,7 +420,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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingLabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingLabelDetectionConfig.java index 4f6d70570350..361a2b0e187e 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingLabelDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingLabelDetectionConfig.java @@ -22,9 +22,7 @@ private StreamingLabelDetectionConfig(com.google.protobuf.GeneratedMessageV3.Bui super(builder); } - private StreamingLabelDetectionConfig() { - stationaryCamera_ = false; - } + private StreamingLabelDetectionConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -57,7 +55,7 @@ private StreamingLabelDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -153,10 +151,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingLabelDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingLabelDetectionConfig) obj; - boolean result = true; - result = result && (getStationaryCamera() == other.getStationaryCamera()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getStationaryCamera() != other.getStationaryCamera()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -362,35 +359,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingLabelDetectionConfi @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 +494,7 @@ public Builder clearStationaryCamera() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingObjectTrackingConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingObjectTrackingConfig.java index 70742a3d15f7..ab8fe6ff7ce6 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingObjectTrackingConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingObjectTrackingConfig.java @@ -49,7 +49,7 @@ private StreamingObjectTrackingConfig( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -122,9 +122,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingObjectTrackingConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingObjectTrackingConfig) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -325,35 +324,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingObjectTrackingConfi @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 @@ -407,7 +406,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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingShotChangeDetectionConfig.java index 1f4ea411fac1..388897b2f7b3 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingShotChangeDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingShotChangeDetectionConfig.java @@ -50,7 +50,7 @@ private StreamingShotChangeDetectionConfig( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -124,9 +124,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingShotChangeDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingShotChangeDetectionConfig) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -328,35 +327,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingShotChangeDetection @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 @@ -412,7 +411,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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingStorageConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingStorageConfig.java index bc9126724cff..c90e431920df 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingStorageConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingStorageConfig.java @@ -23,7 +23,6 @@ private StreamingStorageConfig(com.google.protobuf.GeneratedMessageV3.Builder } private StreamingStorageConfig() { - enableStorageAnnotationResult_ = false; annotationResultStorageDirectory_ = ""; } @@ -65,7 +64,7 @@ private StreamingStorageConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -228,15 +227,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig) obj; - boolean result = true; - result = - result && (getEnableStorageAnnotationResult() == other.getEnableStorageAnnotationResult()); - result = - result - && getAnnotationResultStorageDirectory() - .equals(other.getAnnotationResultStorageDirectory()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnableStorageAnnotationResult() != other.getEnableStorageAnnotationResult()) + return false; + if (!getAnnotationResultStorageDirectory().equals(other.getAnnotationResultStorageDirectory())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -440,35 +436,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig build @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 +707,7 @@ public Builder setAnnotationResultStorageDirectoryBytes(com.google.protobuf.Byte @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoAnnotationResults.java index d04db2fc740f..f57327a3564f 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoAnnotationResults.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoAnnotationResults.java @@ -56,7 +56,7 @@ private StreamingVideoAnnotationResults( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoSegment>(); @@ -70,7 +70,7 @@ private StreamingVideoAnnotationResults( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation>(); @@ -103,7 +103,7 @@ private StreamingVideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation>(); @@ -118,7 +118,7 @@ private StreamingVideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -130,13 +130,13 @@ private StreamingVideoAnnotationResults( } 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)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = java.util.Collections.unmodifiableList(labelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); } this.unknownFields = unknownFields.build(); @@ -503,16 +503,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults other = (com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResults) obj; - boolean result = true; - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && getLabelAnnotationsList().equals(other.getLabelAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (!getLabelAnnotationsList().equals(other.getLabelAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && getObjectAnnotationsList().equals(other.getObjectAnnotationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getObjectAnnotationsList().equals(other.getObjectAnnotationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -755,7 +754,7 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResu int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -764,7 +763,7 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResu result.shotAnnotations_ = shotAnnotationsBuilder_.build(); } if (labelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = java.util.Collections.unmodifiableList(labelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -778,7 +777,7 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResu result.explicitAnnotation_ = explicitAnnotationBuilder_.build(); } if (objectAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -793,35 +792,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingVideoAnnotationResu @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 @@ -963,7 +962,7 @@ public Builder mergeFrom( shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -1339,7 +1338,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p3beta1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -1351,7 +1350,7 @@ public Builder removeShotAnnotations(int index) { labelAnnotations_ = java.util.Collections.emptyList(); private void ensureLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { labelAnnotations_ = new java.util.ArrayList( labelAnnotations_); @@ -1746,7 +1745,7 @@ public Builder removeLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelAnnotationOrBuilder>( labelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); labelAnnotations_ = null; @@ -1755,7 +1754,7 @@ public Builder removeLabelAnnotations(int index) { } private com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation - explicitAnnotation_ = null; + explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation.Builder, @@ -1968,7 +1967,7 @@ public Builder clearExplicitAnnotation() { objectAnnotations_ = java.util.Collections.emptyList(); private void ensureObjectAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation>( @@ -2372,7 +2371,7 @@ public Builder removeObjectAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotationOrBuilder>( objectAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); objectAnnotations_ = null; @@ -2382,7 +2381,7 @@ public Builder removeObjectAnnotations(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoConfig.java index 797bee67af74..62a8aac0c58a 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/StreamingVideoConfig.java @@ -180,7 +180,7 @@ private StreamingVideoConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -669,36 +669,32 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.StreamingVideoConfig other = (com.google.cloud.videointelligence.v1p3beta1.StreamingVideoConfig) obj; - boolean result = true; - result = result && feature_ == other.feature_; - result = result && (hasStorageConfig() == other.hasStorageConfig()); + if (feature_ != other.feature_) return false; + if (hasStorageConfig() != other.hasStorageConfig()) return false; if (hasStorageConfig()) { - result = result && getStorageConfig().equals(other.getStorageConfig()); + if (!getStorageConfig().equals(other.getStorageConfig())) return false; } - result = result && getStreamingConfigCase().equals(other.getStreamingConfigCase()); - if (!result) return false; + if (!getStreamingConfigCase().equals(other.getStreamingConfigCase())) return false; switch (streamingConfigCase_) { case 2: - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; break; case 3: - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; break; case 4: - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; break; case 5: - result = result && getObjectTrackingConfig().equals(other.getObjectTrackingConfig()); + if (!getObjectTrackingConfig().equals(other.getObjectTrackingConfig())) 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 @@ -962,35 +958,35 @@ public com.google.cloud.videointelligence.v1p3beta1.StreamingVideoConfig 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 @@ -2135,8 +2131,7 @@ public Builder clearObjectTrackingConfig() { return objectTrackingConfigBuilder_; } - private com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig storageConfig_ = - null; + private com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig storageConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig, com.google.cloud.videointelligence.v1p3beta1.StreamingStorageConfig.Builder, @@ -2337,7 +2332,7 @@ public Builder clearStorageConfig() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextAnnotation.java index a9097a4ed6a8..570a34815b05 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextAnnotation.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextAnnotation.java @@ -62,7 +62,7 @@ private TextAnnotation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.TextSegment>(); @@ -76,7 +76,7 @@ private TextAnnotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private TextAnnotation( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -272,11 +272,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.TextAnnotation other = (com.google.cloud.videointelligence.v1p3beta1.TextAnnotation) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,7 +480,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextAnnotation buildPartial( int to_bitField0_ = 0; result.text_ = text_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -496,35 +495,35 @@ public com.google.cloud.videointelligence.v1p3beta1.TextAnnotation 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 @@ -701,7 +700,7 @@ public Builder setTextBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1055,10 +1054,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextSegment.Builder addSegme com.google.cloud.videointelligence.v1p3beta1.TextSegment, com.google.cloud.videointelligence.v1p3beta1.TextSegment.Builder, com.google.cloud.videointelligence.v1p3beta1.TextSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; @@ -1066,7 +1062,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextSegment.Builder addSegme @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextDetectionConfig.java index c34fb19b4410..fb3dd0396471 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextDetectionConfig.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextDetectionConfig.java @@ -53,7 +53,7 @@ private TextDetectionConfig( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private TextDetectionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private TextDetectionConfig( } 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)) { languageHints_ = languageHints_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -210,10 +210,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig other = (com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig) obj; - boolean result = true; - result = result && getLanguageHintsList().equals(other.getLanguageHintsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageHintsList().equals(other.getLanguageHintsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -404,7 +403,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig buildPar com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig result = new com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { languageHints_ = languageHints_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -415,35 +414,35 @@ public com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig 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 @@ -508,7 +507,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLanguageHintsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { languageHints_ = new com.google.protobuf.LazyStringArrayList(languageHints_); bitField0_ |= 0x00000001; } @@ -676,7 +675,7 @@ public Builder addLanguageHintsBytes(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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextFrame.java index 38a046ea72d5..a6111c98ea10 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextFrame.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextFrame.java @@ -85,7 +85,7 @@ private TextFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,17 +256,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.TextFrame other = (com.google.cloud.videointelligence.v1p3beta1.TextFrame) obj; - boolean result = true; - result = result && (hasRotatedBoundingBox() == other.hasRotatedBoundingBox()); + if (hasRotatedBoundingBox() != other.hasRotatedBoundingBox()) return false; if (hasRotatedBoundingBox()) { - result = result && getRotatedBoundingBox().equals(other.getRotatedBoundingBox()); + if (!getRotatedBoundingBox().equals(other.getRotatedBoundingBox())) return false; } - result = result && (hasTimeOffset() == other.hasTimeOffset()); + if (hasTimeOffset() != other.hasTimeOffset()) return false; if (hasTimeOffset()) { - result = result && getTimeOffset().equals(other.getTimeOffset()); + if (!getTimeOffset().equals(other.getTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,35 +486,35 @@ public com.google.cloud.videointelligence.v1p3beta1.TextFrame 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 @@ -567,8 +566,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly - rotatedBoundingBox_ = null; + private com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly rotatedBoundingBox_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly, com.google.cloud.videointelligence.v1p3beta1.NormalizedBoundingPoly.Builder, @@ -777,7 +775,7 @@ public Builder clearRotatedBoundingBox() { return rotatedBoundingBoxBuilder_; } - private com.google.protobuf.Duration timeOffset_ = null; + private com.google.protobuf.Duration timeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -958,7 +956,7 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextSegment.java index 742e55514d6c..b038698562d0 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/TextSegment.java @@ -23,7 +23,6 @@ private TextSegment(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private TextSegment() { - confidence_ = 0F; frames_ = java.util.Collections.emptyList(); } @@ -75,7 +74,7 @@ private TextSegment( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.TextFrame>(); @@ -89,7 +88,7 @@ private TextSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -101,7 +100,7 @@ private TextSegment( } 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)) { frames_ = java.util.Collections.unmodifiableList(frames_); } this.unknownFields = unknownFields.build(); @@ -304,18 +303,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.TextSegment other = (com.google.cloud.videointelligence.v1p3beta1.TextSegment) obj; - boolean result = true; - result = result && (hasSegment() == other.hasSegment()); + if (hasSegment() != other.hasSegment()) return false; if (hasSegment()) { - result = result && getSegment().equals(other.getSegment()); - } - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && getFramesList().equals(other.getFramesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSegment().equals(other.getSegment())) return false; + } + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!getFramesList().equals(other.getFramesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -533,7 +529,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextSegment buildPartial() { } result.confidence_ = confidence_; if (framesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { frames_ = java.util.Collections.unmodifiableList(frames_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -548,35 +544,35 @@ public com.google.cloud.videointelligence.v1p3beta1.TextSegment 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 @@ -657,7 +653,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.cloud.videointelligence.v1p3beta1.VideoSegment segment_ = null; + private com.google.cloud.videointelligence.v1p3beta1.VideoSegment segment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.VideoSegment, com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder, @@ -891,7 +887,7 @@ public Builder clearConfidence() { java.util.Collections.emptyList(); private void ensureFramesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { frames_ = new java.util.ArrayList( frames_); @@ -1240,10 +1236,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextFrame.Builder addFramesB com.google.cloud.videointelligence.v1p3beta1.TextFrame, com.google.cloud.videointelligence.v1p3beta1.TextFrame.Builder, com.google.cloud.videointelligence.v1p3beta1.TextFrameOrBuilder>( - frames_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + frames_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); frames_ = null; } return framesBuilder_; @@ -1251,7 +1244,7 @@ public com.google.cloud.videointelligence.v1p3beta1.TextFrame.Builder addFramesB @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoAnnotationProgress.java index 4ae3f57419d5..5e6ed5504e11 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoAnnotationProgress.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoAnnotationProgress.java @@ -24,7 +24,6 @@ private VideoAnnotationProgress(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -79,7 +79,7 @@ private VideoAnnotationResults( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation>(); @@ -93,7 +93,7 @@ private VideoAnnotationResults( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation>(); @@ -107,7 +107,7 @@ private VideoAnnotationResults( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoSegment>(); @@ -154,7 +154,7 @@ private VideoAnnotationResults( } case 98: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { textAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.TextAnnotation>(); @@ -168,7 +168,7 @@ private VideoAnnotationResults( } case 114: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation>(); @@ -183,7 +183,7 @@ private VideoAnnotationResults( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -195,22 +195,22 @@ private VideoAnnotationResults( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); } this.unknownFields = unknownFields.build(); @@ -958,25 +958,24 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults other = (com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults) obj; - boolean result = true; - result = result && getInputUri().equals(other.getInputUri()); - result = - result && getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList()); - result = result && getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList()); - result = result && getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList()); - result = result && getShotAnnotationsList().equals(other.getShotAnnotationsList()); - result = result && (hasExplicitAnnotation() == other.hasExplicitAnnotation()); + if (!getInputUri().equals(other.getInputUri())) return false; + if (!getSegmentLabelAnnotationsList().equals(other.getSegmentLabelAnnotationsList())) + return false; + if (!getShotLabelAnnotationsList().equals(other.getShotLabelAnnotationsList())) return false; + if (!getFrameLabelAnnotationsList().equals(other.getFrameLabelAnnotationsList())) return false; + if (!getShotAnnotationsList().equals(other.getShotAnnotationsList())) return false; + if (hasExplicitAnnotation() != other.hasExplicitAnnotation()) return false; if (hasExplicitAnnotation()) { - result = result && getExplicitAnnotation().equals(other.getExplicitAnnotation()); + if (!getExplicitAnnotation().equals(other.getExplicitAnnotation())) return false; } - result = result && getTextAnnotationsList().equals(other.getTextAnnotationsList()); - result = result && getObjectAnnotationsList().equals(other.getObjectAnnotationsList()); - result = result && (hasError() == other.hasError()); + if (!getTextAnnotationsList().equals(other.getTextAnnotationsList())) return false; + if (!getObjectAnnotationsList().equals(other.getObjectAnnotationsList())) return false; + if (hasError() != other.hasError()) return false; if (hasError()) { - result = result && getError().equals(other.getError()); + if (!getError().equals(other.getError())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1258,7 +1257,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build int to_bitField0_ = 0; result.inputUri_ = inputUri_; if (segmentLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = java.util.Collections.unmodifiableList(segmentLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000002); @@ -1268,7 +1267,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build result.segmentLabelAnnotations_ = segmentLabelAnnotationsBuilder_.build(); } if (shotLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = java.util.Collections.unmodifiableList(shotLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1277,7 +1276,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build result.shotLabelAnnotations_ = shotLabelAnnotationsBuilder_.build(); } if (frameLabelAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = java.util.Collections.unmodifiableList(frameLabelAnnotations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1286,7 +1285,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build result.frameLabelAnnotations_ = frameLabelAnnotationsBuilder_.build(); } if (shotAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = java.util.Collections.unmodifiableList(shotAnnotations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1300,7 +1299,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build result.explicitAnnotation_ = explicitAnnotationBuilder_.build(); } if (textAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { textAnnotations_ = java.util.Collections.unmodifiableList(textAnnotations_); bitField0_ = (bitField0_ & ~0x00000040); } @@ -1309,7 +1308,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build result.textAnnotations_ = textAnnotationsBuilder_.build(); } if (objectAnnotationsBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = java.util.Collections.unmodifiableList(objectAnnotations_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1329,35 +1328,35 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoAnnotationResults build @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 @@ -1684,7 +1683,7 @@ public Builder setInputUriBytes(com.google.protobuf.ByteString value) { segmentLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureSegmentLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { segmentLabelAnnotations_ = new java.util.ArrayList( segmentLabelAnnotations_); @@ -2097,7 +2096,7 @@ public Builder removeSegmentLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelAnnotationOrBuilder>( segmentLabelAnnotations_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); segmentLabelAnnotations_ = null; @@ -2109,7 +2108,7 @@ public Builder removeSegmentLabelAnnotations(int index) { shotLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureShotLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { shotLabelAnnotations_ = new java.util.ArrayList( shotLabelAnnotations_); @@ -2522,7 +2521,7 @@ public Builder removeShotLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelAnnotationOrBuilder>( shotLabelAnnotations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); shotLabelAnnotations_ = null; @@ -2534,7 +2533,7 @@ public Builder removeShotLabelAnnotations(int index) { frameLabelAnnotations_ = java.util.Collections.emptyList(); private void ensureFrameLabelAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { frameLabelAnnotations_ = new java.util.ArrayList( frameLabelAnnotations_); @@ -2947,7 +2946,7 @@ public Builder removeFrameLabelAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.LabelAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.LabelAnnotationOrBuilder>( frameLabelAnnotations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); frameLabelAnnotations_ = null; @@ -2959,7 +2958,7 @@ public Builder removeFrameLabelAnnotations(int index) { shotAnnotations_ = java.util.Collections.emptyList(); private void ensureShotAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { shotAnnotations_ = new java.util.ArrayList( shotAnnotations_); @@ -3335,7 +3334,7 @@ public Builder removeShotAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p3beta1.VideoSegmentOrBuilder>( shotAnnotations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); shotAnnotations_ = null; @@ -3344,7 +3343,7 @@ public Builder removeShotAnnotations(int index) { } private com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation - explicitAnnotation_ = null; + explicitAnnotation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation, com.google.cloud.videointelligence.v1p3beta1.ExplicitContentAnnotation.Builder, @@ -3557,7 +3556,7 @@ public Builder clearExplicitAnnotation() { textAnnotations_ = java.util.Collections.emptyList(); private void ensureTextAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { textAnnotations_ = new java.util.ArrayList( textAnnotations_); @@ -3988,7 +3987,7 @@ public Builder removeTextAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.TextAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.TextAnnotationOrBuilder>( textAnnotations_, - ((bitField0_ & 0x00000040) == 0x00000040), + ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); textAnnotations_ = null; @@ -4000,7 +3999,7 @@ public Builder removeTextAnnotations(int index) { objectAnnotations_ = java.util.Collections.emptyList(); private void ensureObjectAnnotationsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { objectAnnotations_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation>( @@ -4404,7 +4403,7 @@ public Builder removeObjectAnnotations(int index) { com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotation.Builder, com.google.cloud.videointelligence.v1p3beta1.ObjectTrackingAnnotationOrBuilder>( objectAnnotations_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); objectAnnotations_ = null; @@ -4412,7 +4411,7 @@ public Builder removeObjectAnnotations(int index) { return objectAnnotationsBuilder_; } - private com.google.rpc.Status error_ = null; + private com.google.rpc.Status error_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_; @@ -4592,7 +4591,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoContext.java index 913cb876e12f..c2b4acce8312 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoContext.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoContext.java @@ -52,7 +52,7 @@ private VideoContext( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList< com.google.cloud.videointelligence.v1p3beta1.VideoSegment>(); @@ -140,7 +140,7 @@ private VideoContext( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,7 +152,7 @@ private VideoContext( } 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)) { segments_ = java.util.Collections.unmodifiableList(segments_); } this.unknownFields = unknownFields.build(); @@ -523,32 +523,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.VideoContext other = (com.google.cloud.videointelligence.v1p3beta1.VideoContext) obj; - boolean result = true; - result = result && getSegmentsList().equals(other.getSegmentsList()); - result = result && (hasLabelDetectionConfig() == other.hasLabelDetectionConfig()); + if (!getSegmentsList().equals(other.getSegmentsList())) return false; + if (hasLabelDetectionConfig() != other.hasLabelDetectionConfig()) return false; if (hasLabelDetectionConfig()) { - result = result && getLabelDetectionConfig().equals(other.getLabelDetectionConfig()); + if (!getLabelDetectionConfig().equals(other.getLabelDetectionConfig())) return false; } - result = result && (hasShotChangeDetectionConfig() == other.hasShotChangeDetectionConfig()); + if (hasShotChangeDetectionConfig() != other.hasShotChangeDetectionConfig()) return false; if (hasShotChangeDetectionConfig()) { - result = - result && getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig()); + if (!getShotChangeDetectionConfig().equals(other.getShotChangeDetectionConfig())) + return false; } - result = - result - && (hasExplicitContentDetectionConfig() == other.hasExplicitContentDetectionConfig()); + if (hasExplicitContentDetectionConfig() != other.hasExplicitContentDetectionConfig()) + return false; if (hasExplicitContentDetectionConfig()) { - result = - result - && getExplicitContentDetectionConfig() - .equals(other.getExplicitContentDetectionConfig()); + if (!getExplicitContentDetectionConfig().equals(other.getExplicitContentDetectionConfig())) + return false; } - result = result && (hasTextDetectionConfig() == other.hasTextDetectionConfig()); + if (hasTextDetectionConfig() != other.hasTextDetectionConfig()) return false; if (hasTextDetectionConfig()) { - result = result && getTextDetectionConfig().equals(other.getTextDetectionConfig()); + if (!getTextDetectionConfig().equals(other.getTextDetectionConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -786,7 +782,7 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoContext buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { segments_ = java.util.Collections.unmodifiableList(segments_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -821,35 +817,35 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoContext 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 @@ -940,7 +936,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { segments_ = new java.util.ArrayList( segments_); @@ -1331,17 +1327,13 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder addSegm com.google.cloud.videointelligence.v1p3beta1.VideoSegment, com.google.cloud.videointelligence.v1p3beta1.VideoSegment.Builder, com.google.cloud.videointelligence.v1p3beta1.VideoSegmentOrBuilder>( - segments_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + segments_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } - private com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig - labelDetectionConfig_ = null; + private com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig labelDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig, com.google.cloud.videointelligence.v1p3beta1.LabelDetectionConfig.Builder, @@ -1548,7 +1540,7 @@ public Builder clearLabelDetectionConfig() { } private com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig - shotChangeDetectionConfig_ = null; + shotChangeDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig, com.google.cloud.videointelligence.v1p3beta1.ShotChangeDetectionConfig.Builder, @@ -1758,7 +1750,7 @@ public Builder clearShotChangeDetectionConfig() { } private com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConfig - explicitContentDetectionConfig_ = null; + explicitContentDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConfig, com.google.cloud.videointelligence.v1p3beta1.ExplicitContentDetectionConfig.Builder, @@ -1969,8 +1961,7 @@ public Builder clearExplicitContentDetectionConfig() { return explicitContentDetectionConfigBuilder_; } - private com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig textDetectionConfig_ = - null; + private com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig textDetectionConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig, com.google.cloud.videointelligence.v1p3beta1.TextDetectionConfig.Builder, @@ -2178,7 +2169,7 @@ public Builder clearTextDetectionConfig() { @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-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoSegment.java index 7d7b76592b7d..1da3402cb4e7 100644 --- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoSegment.java +++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p3beta1/src/main/java/com/google/cloud/videointelligence/v1p3beta1/VideoSegment.java @@ -80,7 +80,7 @@ private VideoSegment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.videointelligence.v1p3beta1.VideoSegment other = (com.google.cloud.videointelligence.v1p3beta1.VideoSegment) obj; - boolean result = true; - result = result && (hasStartTimeOffset() == other.hasStartTimeOffset()); + if (hasStartTimeOffset() != other.hasStartTimeOffset()) return false; if (hasStartTimeOffset()) { - result = result && getStartTimeOffset().equals(other.getStartTimeOffset()); + if (!getStartTimeOffset().equals(other.getStartTimeOffset())) return false; } - result = result && (hasEndTimeOffset() == other.hasEndTimeOffset()); + if (hasEndTimeOffset() != other.hasEndTimeOffset()) return false; if (hasEndTimeOffset()) { - result = result && getEndTimeOffset().equals(other.getEndTimeOffset()); + if (!getEndTimeOffset().equals(other.getEndTimeOffset())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +479,35 @@ public com.google.cloud.videointelligence.v1p3beta1.VideoSegment 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 @@ -560,7 +559,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration startTimeOffset_ = null; + private com.google.protobuf.Duration startTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -750,7 +749,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOffsetOrBuilder() { return startTimeOffsetBuilder_; } - private com.google.protobuf.Duration endTimeOffset_ = null; + private com.google.protobuf.Duration endTimeOffset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -942,7 +941,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() { @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-video-intelligence/synth.metadata b/google-cloud-clients/google-cloud-video-intelligence/synth.metadata index d7e6f718dbdc..edfde4e7b052 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/synth.metadata +++ b/google-cloud-clients/google-cloud-video-intelligence/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-12T17:39:54.262454Z", + "updateTime": "2019-03-30T08:00:38.043160Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.16", - "dockerImage": "googleapis/artman@sha256:30babbfce7f05a62b1892c63c575aa2c8c502eb4bcc8f3bb90ec83e955d5d319" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "abd1c9a99c5cd7179d8e5e0c8d4c8e761054cc78", - "internalRef": "237945492" + "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],