From 427bdd01ab6bc16259bf7f15db056cf2ad68341e Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 29 Mar 2019 00:56:51 -0700 Subject: [PATCH] Regenerate speech client --- .../v1/LongRunningRecognizeMetadata.java | 39 ++++---- .../v1/LongRunningRecognizeRequest.java | 33 ++++--- .../v1/LongRunningRecognizeResponse.java | 36 ++++--- .../cloud/speech/v1/RecognitionAudio.java | 28 +++--- .../cloud/speech/v1/RecognitionConfig.java | 67 ++++++------- .../cloud/speech/v1/RecognizeRequest.java | 33 ++++--- .../cloud/speech/v1/RecognizeResponse.java | 36 ++++--- .../google/cloud/speech/v1/SpeechContext.java | 31 +++--- .../v1/SpeechRecognitionAlternative.java | 45 ++++----- .../speech/v1/SpeechRecognitionResult.java | 39 ++++---- .../speech/v1/StreamingRecognitionConfig.java | 36 ++++--- .../speech/v1/StreamingRecognitionResult.java | 49 ++++------ .../speech/v1/StreamingRecognizeRequest.java | 28 +++--- .../speech/v1/StreamingRecognizeResponse.java | 44 ++++----- .../com/google/cloud/speech/v1/WordInfo.java | 35 ++++--- .../LongRunningRecognizeMetadata.java | 39 ++++---- .../LongRunningRecognizeRequest.java | 33 ++++--- .../LongRunningRecognizeResponse.java | 36 ++++--- .../speech/v1p1beta1/RecognitionAudio.java | 28 +++--- .../speech/v1p1beta1/RecognitionConfig.java | 94 ++++++++----------- .../speech/v1p1beta1/RecognitionMetadata.java | 41 ++++---- .../speech/v1p1beta1/RecognizeRequest.java | 33 ++++--- .../speech/v1p1beta1/RecognizeResponse.java | 36 ++++--- .../cloud/speech/v1p1beta1/SpeechContext.java | 31 +++--- .../SpeechRecognitionAlternative.java | 45 ++++----- .../v1p1beta1/SpeechRecognitionResult.java | 41 ++++---- .../v1p1beta1/StreamingRecognitionConfig.java | 36 ++++--- .../v1p1beta1/StreamingRecognitionResult.java | 57 +++++------ .../v1p1beta1/StreamingRecognizeRequest.java | 28 +++--- .../v1p1beta1/StreamingRecognizeResponse.java | 44 ++++----- .../cloud/speech/v1p1beta1/WordInfo.java | 47 +++++----- .../google-cloud-speech/synth.metadata | 10 +- 32 files changed, 565 insertions(+), 693 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java index b6fec989d087..1dd9ea94ca63 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java @@ -24,9 +24,7 @@ private LongRunningRecognizeMetadata(com.google.protobuf.GeneratedMessageV3.Buil super(builder); } - private LongRunningRecognizeMetadata() { - progressPercent_ = 0; - } + private LongRunningRecognizeMetadata() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -89,7 +87,7 @@ private LongRunningRecognizeMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -274,18 +272,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.LongRunningRecognizeMetadata other = (com.google.cloud.speech.v1.LongRunningRecognizeMetadata) obj; - boolean result = true; - result = result && (getProgressPercent() == other.getProgressPercent()); - result = result && (hasStartTime() == other.hasStartTime()); + if (getProgressPercent() != other.getProgressPercent()) return false; + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasLastUpdateTime() == other.hasLastUpdateTime()); + if (hasLastUpdateTime() != other.hasLastUpdateTime()) return false; if (hasLastUpdateTime()) { - result = result && getLastUpdateTime().equals(other.getLastUpdateTime()); + if (!getLastUpdateTime().equals(other.getLastUpdateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -511,35 +508,35 @@ public com.google.cloud.speech.v1.LongRunningRecognizeMetadata buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -641,7 +638,7 @@ public Builder clearProgressPercent() { return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -816,7 +813,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp lastUpdateTime_ = null; + private com.google.protobuf.Timestamp lastUpdateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -999,7 +996,7 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java index c84aab33fbd0..ade30f22fe19 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java @@ -83,7 +83,7 @@ private LongRunningRecognizeRequest( } 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.speech.v1.LongRunningRecognizeRequest other = (com.google.cloud.speech.v1.LongRunningRecognizeRequest) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (hasAudio() == other.hasAudio()); + if (hasAudio() != other.hasAudio()) return false; if (hasAudio()) { - result = result && getAudio().equals(other.getAudio()); + if (!getAudio().equals(other.getAudio())) 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.speech.v1.LongRunningRecognizeRequest 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.speech.v1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1.RecognitionConfig, com.google.cloud.speech.v1.RecognitionConfig.Builder, @@ -751,7 +750,7 @@ public com.google.cloud.speech.v1.RecognitionConfigOrBuilder getConfigOrBuilder( return configBuilder_; } - private com.google.cloud.speech.v1.RecognitionAudio audio_ = null; + private com.google.cloud.speech.v1.RecognitionAudio audio_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1.RecognitionAudio, com.google.cloud.speech.v1.RecognitionAudio.Builder, @@ -934,7 +933,7 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder() @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java index 71e1eb919935..670617021d78 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java @@ -56,7 +56,7 @@ private LongRunningRecognizeResponse( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -69,7 +69,7 @@ private LongRunningRecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +81,7 @@ private LongRunningRecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -219,10 +219,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.LongRunningRecognizeResponse other = (com.google.cloud.speech.v1.LongRunningRecognizeResponse) obj; - boolean result = true; - result = result && getResultsList().equals(other.getResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -423,7 +422,7 @@ public com.google.cloud.speech.v1.LongRunningRecognizeResponse buildPartial() { new com.google.cloud.speech.v1.LongRunningRecognizeResponse(this); int from_bitField0_ = bitField0_; if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -437,35 +436,35 @@ public com.google.cloud.speech.v1.LongRunningRecognizeResponse 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 @@ -544,7 +543,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList(results_); bitField0_ |= 0x00000001; @@ -905,10 +904,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil com.google.cloud.speech.v1.SpeechRecognitionResult, com.google.cloud.speech.v1.SpeechRecognitionResult.Builder, com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -916,7 +912,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java index c0eb65dd0fbb..859a526f57c6 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java @@ -66,7 +66,7 @@ private RecognitionAudio( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -276,21 +276,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.RecognitionAudio other = (com.google.cloud.speech.v1.RecognitionAudio) obj; - boolean result = true; - result = result && getAudioSourceCase().equals(other.getAudioSourceCase()); - if (!result) return false; + if (!getAudioSourceCase().equals(other.getAudioSourceCase())) return false; switch (audioSourceCase_) { case 1: - result = result && getContent().equals(other.getContent()); + if (!getContent().equals(other.getContent())) return false; break; case 2: - result = result && getUri().equals(other.getUri()); + if (!getUri().equals(other.getUri())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -502,35 +500,35 @@ public com.google.cloud.speech.v1.RecognitionAudio 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 @@ -805,7 +803,7 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java index 45d444d9a6f6..f1a8337edfb9 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java @@ -25,17 +25,9 @@ private RecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builder buil private RecognitionConfig() { encoding_ = 0; - sampleRateHertz_ = 0; - audioChannelCount_ = 0; - enableSeparateRecognitionPerChannel_ = false; languageCode_ = ""; - maxAlternatives_ = 0; - profanityFilter_ = false; speechContexts_ = java.util.Collections.emptyList(); - enableWordTimeOffsets_ = false; - enableAutomaticPunctuation_ = false; model_ = ""; - useEnhanced_ = false; } @java.lang.Override @@ -93,7 +85,7 @@ private RecognitionConfig( } case 50: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { speechContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; @@ -137,7 +129,7 @@ private RecognitionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -149,7 +141,7 @@ private RecognitionConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); } this.unknownFields = unknownFields.build(); @@ -1038,24 +1030,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.RecognitionConfig other = (com.google.cloud.speech.v1.RecognitionConfig) obj; - boolean result = true; - result = result && encoding_ == other.encoding_; - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && (getAudioChannelCount() == other.getAudioChannelCount()); - result = - result - && (getEnableSeparateRecognitionPerChannel() - == other.getEnableSeparateRecognitionPerChannel()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (getMaxAlternatives() == other.getMaxAlternatives()); - result = result && (getProfanityFilter() == other.getProfanityFilter()); - result = result && getSpeechContextsList().equals(other.getSpeechContextsList()); - result = result && (getEnableWordTimeOffsets() == other.getEnableWordTimeOffsets()); - result = result && (getEnableAutomaticPunctuation() == other.getEnableAutomaticPunctuation()); - result = result && getModel().equals(other.getModel()); - result = result && (getUseEnhanced() == other.getUseEnhanced()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (encoding_ != other.encoding_) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (getAudioChannelCount() != other.getAudioChannelCount()) return false; + if (getEnableSeparateRecognitionPerChannel() != other.getEnableSeparateRecognitionPerChannel()) + return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (getMaxAlternatives() != other.getMaxAlternatives()) return false; + if (getProfanityFilter() != other.getProfanityFilter()) return false; + if (!getSpeechContextsList().equals(other.getSpeechContextsList())) return false; + if (getEnableWordTimeOffsets() != other.getEnableWordTimeOffsets()) return false; + if (getEnableAutomaticPunctuation() != other.getEnableAutomaticPunctuation()) return false; + if (!getModel().equals(other.getModel())) return false; + if (getUseEnhanced() != other.getUseEnhanced()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1306,7 +1295,7 @@ public com.google.cloud.speech.v1.RecognitionConfig buildPartial() { result.maxAlternatives_ = maxAlternatives_; result.profanityFilter_ = profanityFilter_; if (speechContextsBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1325,35 +1314,35 @@ public com.google.cloud.speech.v1.RecognitionConfig 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 @@ -1976,7 +1965,7 @@ public Builder clearProfanityFilter() { java.util.Collections.emptyList(); private void ensureSpeechContextsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { speechContexts_ = new java.util.ArrayList(speechContexts_); bitField0_ |= 0x00000080; @@ -2354,7 +2343,7 @@ public com.google.cloud.speech.v1.SpeechContext.Builder addSpeechContextsBuilder com.google.cloud.speech.v1.SpeechContext.Builder, com.google.cloud.speech.v1.SpeechContextOrBuilder>( speechContexts_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); speechContexts_ = null; @@ -2808,7 +2797,7 @@ public Builder clearUseEnhanced() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java index ed6d6c89d4ef..6fa6fe073f09 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java @@ -82,7 +82,7 @@ private RecognizeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -250,17 +250,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.RecognizeRequest other = (com.google.cloud.speech.v1.RecognizeRequest) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (hasAudio() == other.hasAudio()); + if (hasAudio() != other.hasAudio()) return false; if (hasAudio()) { - result = result && getAudio().equals(other.getAudio()); + if (!getAudio().equals(other.getAudio())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +477,35 @@ public com.google.cloud.speech.v1.RecognizeRequest 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 @@ -556,7 +555,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.speech.v1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1.RecognitionConfig, com.google.cloud.speech.v1.RecognitionConfig.Builder, @@ -746,7 +745,7 @@ public com.google.cloud.speech.v1.RecognitionConfigOrBuilder getConfigOrBuilder( return configBuilder_; } - private com.google.cloud.speech.v1.RecognitionAudio audio_ = null; + private com.google.cloud.speech.v1.RecognitionAudio audio_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1.RecognitionAudio, com.google.cloud.speech.v1.RecognitionAudio.Builder, @@ -929,7 +928,7 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder() @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java index ba4e13a49e34..426c86da29ec 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java @@ -54,7 +54,7 @@ private RecognizeResponse( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -67,7 +67,7 @@ private RecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -79,7 +79,7 @@ private RecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -217,10 +217,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.RecognizeResponse other = (com.google.cloud.speech.v1.RecognizeResponse) obj; - boolean result = true; - result = result && getResultsList().equals(other.getResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -418,7 +417,7 @@ public com.google.cloud.speech.v1.RecognizeResponse buildPartial() { new com.google.cloud.speech.v1.RecognizeResponse(this); int from_bitField0_ = bitField0_; if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -432,35 +431,35 @@ public com.google.cloud.speech.v1.RecognizeResponse 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 @@ -537,7 +536,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList(results_); bitField0_ |= 0x00000001; @@ -898,10 +897,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil com.google.cloud.speech.v1.SpeechRecognitionResult, com.google.cloud.speech.v1.SpeechRecognitionResult.Builder, com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -909,7 +905,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java index 264e7455068e..91e0e6971cc3 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/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(); @@ -218,10 +218,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.speech.v1.SpeechContext other = (com.google.cloud.speech.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 @@ -411,7 +410,7 @@ public com.google.cloud.speech.v1.SpeechContext buildPartial() { com.google.cloud.speech.v1.SpeechContext result = new com.google.cloud.speech.v1.SpeechContext(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { phrases_ = phrases_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -422,35 +421,35 @@ public com.google.cloud.speech.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 @@ -510,7 +509,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; } @@ -696,7 +695,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-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java index b2eebc698676..04fb1536aa90 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/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(); @@ -308,15 +307,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.SpeechRecognitionAlternative other = (com.google.cloud.speech.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 @@ -524,7 +520,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative buildPartial() { 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); } @@ -539,35 +535,35 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative 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 @@ -809,7 +805,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; } @@ -1183,10 +1179,7 @@ public java.util.List getWordsBuild com.google.cloud.speech.v1.WordInfo, com.google.cloud.speech.v1.WordInfo.Builder, com.google.cloud.speech.v1.WordInfoOrBuilder>( - words_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + words_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); words_ = null; } return wordsBuilder_; @@ -1194,7 +1187,7 @@ public java.util.List getWordsBuild @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java index ecccdf0d1b61..ffd5e13c2481 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java @@ -24,7 +24,6 @@ private SpeechRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -72,7 +71,7 @@ private SpeechRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +83,7 @@ private SpeechRecognitionResult( } 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(); @@ -257,11 +256,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.SpeechRecognitionResult other = (com.google.cloud.speech.v1.SpeechRecognitionResult) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && (getChannelTag() == other.getChannelTag()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (getChannelTag() != other.getChannelTag()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,7 +460,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult 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); } @@ -478,35 +476,35 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult 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 @@ -588,7 +586,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAlternativesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList( alternatives_); @@ -996,10 +994,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern com.google.cloud.speech.v1.SpeechRecognitionAlternative, com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder, com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1057,7 +1052,7 @@ public Builder clearChannelTag() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java index 3226b44615b7..a9229c13f582 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java @@ -23,10 +23,7 @@ private StreamingRecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builde super(builder); } - private StreamingRecognitionConfig() { - singleUtterance_ = false; - interimResults_ = false; - } + private StreamingRecognitionConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -80,7 +77,7 @@ private StreamingRecognitionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -255,15 +252,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.StreamingRecognitionConfig other = (com.google.cloud.speech.v1.StreamingRecognitionConfig) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (getSingleUtterance() == other.getSingleUtterance()); - result = result && (getInterimResults() == other.getInterimResults()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSingleUtterance() != other.getSingleUtterance()) return false; + if (getInterimResults() != other.getInterimResults()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +474,35 @@ public com.google.cloud.speech.v1.StreamingRecognitionConfig 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 +557,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.speech.v1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1.RecognitionConfig, com.google.cloud.speech.v1.RecognitionConfig.Builder, @@ -877,7 +873,7 @@ public Builder clearInterimResults() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java index 70d70fa14659..4bc6375e5b92 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java @@ -25,9 +25,6 @@ private StreamingRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builde private StreamingRecognitionResult() { alternatives_ = java.util.Collections.emptyList(); - isFinal_ = false; - stability_ = 0F; - channelTag_ = 0; } @java.lang.Override @@ -56,7 +53,7 @@ private StreamingRecognitionResult( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.speech.v1.SpeechRecognitionAlternative>(); @@ -85,7 +82,7 @@ private StreamingRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -97,7 +94,7 @@ private StreamingRecognitionResult( } 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(); @@ -320,16 +317,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.StreamingRecognitionResult other = (com.google.cloud.speech.v1.StreamingRecognitionResult) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && (getIsFinal() == other.getIsFinal()); - result = - result - && (java.lang.Float.floatToIntBits(getStability()) - == java.lang.Float.floatToIntBits(other.getStability())); - result = result && (getChannelTag() == other.getChannelTag()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (getIsFinal() != other.getIsFinal()) return false; + if (java.lang.Float.floatToIntBits(getStability()) + != java.lang.Float.floatToIntBits(other.getStability())) return false; + if (getChannelTag() != other.getChannelTag()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -540,7 +534,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult 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); } @@ -558,35 +552,35 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult 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 @@ -674,7 +668,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAlternativesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList( alternatives_); @@ -1082,10 +1076,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern com.google.cloud.speech.v1.SpeechRecognitionAlternative, com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder, com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1255,7 +1246,7 @@ public Builder clearChannelTag() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java index d5d69da68663..87d426e032ac 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java @@ -80,7 +80,7 @@ private StreamingRecognizeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -283,21 +283,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.StreamingRecognizeRequest other = (com.google.cloud.speech.v1.StreamingRecognizeRequest) 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 && getStreamingConfig().equals(other.getStreamingConfig()); + if (!getStreamingConfig().equals(other.getStreamingConfig())) return false; break; case 2: - result = result && getAudioContent().equals(other.getAudioContent()); + if (!getAudioContent().equals(other.getAudioContent())) 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 @@ -514,35 +512,35 @@ public com.google.cloud.speech.v1.StreamingRecognizeRequest 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 @@ -917,7 +915,7 @@ public Builder clearAudioContent() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java index 2609259e5e99..3c3fa34f1fe7 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java @@ -102,7 +102,7 @@ private StreamingRecognizeResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.speech.v1.StreamingRecognitionResult>(); @@ -123,7 +123,7 @@ private StreamingRecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -135,7 +135,7 @@ private StreamingRecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -519,15 +519,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1.StreamingRecognizeResponse other = (com.google.cloud.speech.v1.StreamingRecognizeResponse) 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 && getResultsList().equals(other.getResultsList()); - result = result && speechEventType_ == other.speechEventType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (speechEventType_ != other.speechEventType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -779,7 +778,7 @@ public com.google.cloud.speech.v1.StreamingRecognizeResponse buildPartial() { result.error_ = errorBuilder_.build(); } if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -795,35 +794,35 @@ public com.google.cloud.speech.v1.StreamingRecognizeResponse 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 @@ -904,7 +903,7 @@ public Builder mergeFrom( private int bitField0_; - 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_; @@ -1086,7 +1085,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList( results_); @@ -1489,10 +1488,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult.Builder addResultsB com.google.cloud.speech.v1.StreamingRecognitionResult, com.google.cloud.speech.v1.StreamingRecognitionResult.Builder, com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -1591,7 +1587,7 @@ public Builder clearSpeechEventType() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java index a8bb10b6a29d..844e78f885a3 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java +++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java @@ -89,7 +89,7 @@ private WordInfo( } 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.speech.v1.WordInfo other = (com.google.cloud.speech.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()); + 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 @@ -560,35 +559,35 @@ public com.google.cloud.speech.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 @@ -642,7 +641,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, @@ -862,7 +861,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, @@ -1178,7 +1177,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-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java index 744383555c0b..9c2f53310610 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java @@ -24,9 +24,7 @@ private LongRunningRecognizeMetadata(com.google.protobuf.GeneratedMessageV3.Buil super(builder); } - private LongRunningRecognizeMetadata() { - progressPercent_ = 0; - } + private LongRunningRecognizeMetadata() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -89,7 +87,7 @@ private LongRunningRecognizeMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -274,18 +272,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata other = (com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata) obj; - boolean result = true; - result = result && (getProgressPercent() == other.getProgressPercent()); - result = result && (hasStartTime() == other.hasStartTime()); + if (getProgressPercent() != other.getProgressPercent()) return false; + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasLastUpdateTime() == other.hasLastUpdateTime()); + if (hasLastUpdateTime() != other.hasLastUpdateTime()) return false; if (hasLastUpdateTime()) { - result = result && getLastUpdateTime().equals(other.getLastUpdateTime()); + if (!getLastUpdateTime().equals(other.getLastUpdateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -512,35 +509,35 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata 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 @@ -644,7 +641,7 @@ public Builder clearProgressPercent() { return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -819,7 +816,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp lastUpdateTime_ = null; + private com.google.protobuf.Timestamp lastUpdateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1002,7 +999,7 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java index fbec78c1629c..9d72b6f3583d 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java @@ -85,7 +85,7 @@ private LongRunningRecognizeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -253,17 +253,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest other = (com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (hasAudio() == other.hasAudio()); + if (hasAudio() != other.hasAudio()) return false; if (hasAudio()) { - result = result && getAudio().equals(other.getAudio()); + if (!getAudio().equals(other.getAudio())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -484,35 +483,35 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest 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 @@ -566,7 +565,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.speech.v1p1beta1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionConfig, com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder, @@ -757,7 +756,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfigOrBuilder getConfigOrB return configBuilder_; } - private com.google.cloud.speech.v1p1beta1.RecognitionAudio audio_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionAudio audio_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionAudio, com.google.cloud.speech.v1p1beta1.RecognitionAudio.Builder, @@ -941,7 +940,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java index 25e23d08e2a4..df6f672a4261 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java @@ -56,7 +56,7 @@ private LongRunningRecognizeResponse( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult>(); @@ -70,7 +70,7 @@ private LongRunningRecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private LongRunningRecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -222,10 +222,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse other = (com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse) obj; - boolean result = true; - result = result && getResultsList().equals(other.getResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -427,7 +426,7 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse buildParti new com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse(this); int from_bitField0_ = bitField0_; if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -441,35 +440,35 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse 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 @@ -550,7 +549,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList( results_); @@ -923,10 +922,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult, com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder, com.google.cloud.speech.v1p1beta1.SpeechRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -934,7 +930,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java index 77f0ebd28fda..747c6d17945d 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java @@ -66,7 +66,7 @@ private RecognitionAudio( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -276,21 +276,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.RecognitionAudio other = (com.google.cloud.speech.v1p1beta1.RecognitionAudio) obj; - boolean result = true; - result = result && getAudioSourceCase().equals(other.getAudioSourceCase()); - if (!result) return false; + if (!getAudioSourceCase().equals(other.getAudioSourceCase())) return false; switch (audioSourceCase_) { case 1: - result = result && getContent().equals(other.getContent()); + if (!getContent().equals(other.getContent())) return false; break; case 2: - result = result && getUri().equals(other.getUri()); + if (!getUri().equals(other.getUri())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -502,35 +500,35 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudio 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 @@ -807,7 +805,7 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java index 5fc326801967..10c73e440464 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java @@ -25,21 +25,10 @@ private RecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builder buil private RecognitionConfig() { encoding_ = 0; - sampleRateHertz_ = 0; - audioChannelCount_ = 0; - enableSeparateRecognitionPerChannel_ = false; languageCode_ = ""; alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; - maxAlternatives_ = 0; - profanityFilter_ = false; speechContexts_ = java.util.Collections.emptyList(); - enableWordTimeOffsets_ = false; - enableWordConfidence_ = false; - enableAutomaticPunctuation_ = false; - enableSpeakerDiarization_ = false; - diarizationSpeakerCount_ = 0; model_ = ""; - useEnhanced_ = false; } @java.lang.Override @@ -97,7 +86,7 @@ private RecognitionConfig( } case 50: { - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { speechContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; @@ -174,7 +163,7 @@ private RecognitionConfig( case 146: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -183,7 +172,7 @@ private RecognitionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -195,10 +184,10 @@ private RecognitionConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (((mutable_bitField0_ & 0x00000100) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -1325,33 +1314,30 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.RecognitionConfig other = (com.google.cloud.speech.v1p1beta1.RecognitionConfig) obj; - boolean result = true; - result = result && encoding_ == other.encoding_; - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && (getAudioChannelCount() == other.getAudioChannelCount()); - result = - result - && (getEnableSeparateRecognitionPerChannel() - == other.getEnableSeparateRecognitionPerChannel()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = - result && getAlternativeLanguageCodesList().equals(other.getAlternativeLanguageCodesList()); - result = result && (getMaxAlternatives() == other.getMaxAlternatives()); - result = result && (getProfanityFilter() == other.getProfanityFilter()); - result = result && getSpeechContextsList().equals(other.getSpeechContextsList()); - result = result && (getEnableWordTimeOffsets() == other.getEnableWordTimeOffsets()); - result = result && (getEnableWordConfidence() == other.getEnableWordConfidence()); - result = result && (getEnableAutomaticPunctuation() == other.getEnableAutomaticPunctuation()); - result = result && (getEnableSpeakerDiarization() == other.getEnableSpeakerDiarization()); - result = result && (getDiarizationSpeakerCount() == other.getDiarizationSpeakerCount()); - result = result && (hasMetadata() == other.hasMetadata()); + if (encoding_ != other.encoding_) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (getAudioChannelCount() != other.getAudioChannelCount()) return false; + if (getEnableSeparateRecognitionPerChannel() != other.getEnableSeparateRecognitionPerChannel()) + return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getAlternativeLanguageCodesList().equals(other.getAlternativeLanguageCodesList())) + return false; + if (getMaxAlternatives() != other.getMaxAlternatives()) return false; + if (getProfanityFilter() != other.getProfanityFilter()) return false; + if (!getSpeechContextsList().equals(other.getSpeechContextsList())) return false; + if (getEnableWordTimeOffsets() != other.getEnableWordTimeOffsets()) return false; + if (getEnableWordConfidence() != other.getEnableWordConfidence()) return false; + if (getEnableAutomaticPunctuation() != other.getEnableAutomaticPunctuation()) return false; + if (getEnableSpeakerDiarization() != other.getEnableSpeakerDiarization()) return false; + if (getDiarizationSpeakerCount() != other.getDiarizationSpeakerCount()) return false; + if (hasMetadata() != other.hasMetadata()) return false; if (hasMetadata()) { - result = result && getMetadata().equals(other.getMetadata()); + if (!getMetadata().equals(other.getMetadata())) return false; } - result = result && getModel().equals(other.getModel()); - result = result && (getUseEnhanced() == other.getUseEnhanced()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getModel().equals(other.getModel())) return false; + if (getUseEnhanced() != other.getUseEnhanced()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1627,7 +1613,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() { result.audioChannelCount_ = audioChannelCount_; result.enableSeparateRecognitionPerChannel_ = enableSeparateRecognitionPerChannel_; result.languageCode_ = languageCode_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -1635,7 +1621,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() { result.maxAlternatives_ = maxAlternatives_; result.profanityFilter_ = profanityFilter_; if (speechContextsBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); bitField0_ = (bitField0_ & ~0x00000100); } @@ -1662,35 +1648,35 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig 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 @@ -2226,7 +2212,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAlternativeLanguageCodesIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(alternativeLanguageCodes_); bitField0_ |= 0x00000020; @@ -2581,7 +2567,7 @@ public Builder clearProfanityFilter() { java.util.Collections.emptyList(); private void ensureSpeechContextsIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { speechContexts_ = new java.util.ArrayList( speechContexts_); @@ -2983,7 +2969,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext.Builder addSpeechContexts com.google.cloud.speech.v1p1beta1.SpeechContext.Builder, com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder>( speechContexts_, - ((bitField0_ & 0x00000100) == 0x00000100), + ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean()); speechContexts_ = null; @@ -3277,7 +3263,7 @@ public Builder clearDiarizationSpeakerCount() { return this; } - private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionMetadata, com.google.cloud.speech.v1p1beta1.RecognitionMetadata.Builder, @@ -3790,7 +3776,7 @@ public Builder clearUseEnhanced() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java index b3aab2624452..065fb7cfc6ad 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java @@ -24,13 +24,11 @@ private RecognitionMetadata(com.google.protobuf.GeneratedMessageV3.Builder bu private RecognitionMetadata() { interactionType_ = 0; - industryNaicsCodeOfAudio_ = 0; microphoneDistance_ = 0; originalMediaType_ = 0; recordingDeviceType_ = 0; recordingDeviceName_ = ""; originalMimeType_ = ""; - obfuscatedId_ = 0L; audioTopic_ = ""; } @@ -119,7 +117,7 @@ private RecognitionMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1453,18 +1451,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.RecognitionMetadata other = (com.google.cloud.speech.v1p1beta1.RecognitionMetadata) obj; - boolean result = true; - result = result && interactionType_ == other.interactionType_; - result = result && (getIndustryNaicsCodeOfAudio() == other.getIndustryNaicsCodeOfAudio()); - result = result && microphoneDistance_ == other.microphoneDistance_; - result = result && originalMediaType_ == other.originalMediaType_; - result = result && recordingDeviceType_ == other.recordingDeviceType_; - result = result && getRecordingDeviceName().equals(other.getRecordingDeviceName()); - result = result && getOriginalMimeType().equals(other.getOriginalMimeType()); - result = result && (getObfuscatedId() == other.getObfuscatedId()); - result = result && getAudioTopic().equals(other.getAudioTopic()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (interactionType_ != other.interactionType_) return false; + if (getIndustryNaicsCodeOfAudio() != other.getIndustryNaicsCodeOfAudio()) return false; + if (microphoneDistance_ != other.microphoneDistance_) return false; + if (originalMediaType_ != other.originalMediaType_) return false; + if (recordingDeviceType_ != other.recordingDeviceType_) return false; + if (!getRecordingDeviceName().equals(other.getRecordingDeviceName())) return false; + if (!getOriginalMimeType().equals(other.getOriginalMimeType())) return false; + if (getObfuscatedId() != other.getObfuscatedId()) return false; + if (!getAudioTopic().equals(other.getAudioTopic())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1698,35 +1695,35 @@ public com.google.cloud.speech.v1p1beta1.RecognitionMetadata 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 @@ -2580,7 +2577,7 @@ public Builder setAudioTopicBytes(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-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java index 75ccf979ad42..a839e4d94c2e 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java @@ -84,7 +84,7 @@ private RecognizeRequest( } 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.speech.v1p1beta1.RecognizeRequest other = (com.google.cloud.speech.v1p1beta1.RecognizeRequest) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (hasAudio() == other.hasAudio()); + if (hasAudio() != other.hasAudio()) return false; if (hasAudio()) { - result = result && getAudio().equals(other.getAudio()); + if (!getAudio().equals(other.getAudio())) 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.speech.v1p1beta1.RecognizeRequest 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.cloud.speech.v1p1beta1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionConfig, com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder, @@ -751,7 +750,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfigOrBuilder getConfigOrB return configBuilder_; } - private com.google.cloud.speech.v1p1beta1.RecognitionAudio audio_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionAudio audio_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionAudio, com.google.cloud.speech.v1p1beta1.RecognitionAudio.Builder, @@ -935,7 +934,7 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java index cc10b76015ab..ed0127896441 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java @@ -54,7 +54,7 @@ private RecognizeResponse( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult>(); @@ -68,7 +68,7 @@ private RecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +80,7 @@ private RecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -220,10 +220,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.RecognizeResponse other = (com.google.cloud.speech.v1p1beta1.RecognizeResponse) obj; - boolean result = true; - result = result && getResultsList().equals(other.getResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -421,7 +420,7 @@ public com.google.cloud.speech.v1p1beta1.RecognizeResponse buildPartial() { new com.google.cloud.speech.v1p1beta1.RecognizeResponse(this); int from_bitField0_ = bitField0_; if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -435,35 +434,35 @@ public com.google.cloud.speech.v1p1beta1.RecognizeResponse 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 @@ -542,7 +541,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { results_ = new java.util.ArrayList( results_); @@ -915,10 +914,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult, com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder, com.google.cloud.speech.v1p1beta1.SpeechRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -926,7 +922,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java index bbd55b1af610..685373aef8e3 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/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.speech.v1p1beta1.SpeechContext other = (com.google.cloud.speech.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 @@ -412,7 +411,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext buildPartial() { com.google.cloud.speech.v1p1beta1.SpeechContext result = new com.google.cloud.speech.v1p1beta1.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.speech.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 @@ -512,7 +511,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; } @@ -698,7 +697,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-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java index 2a38c2880c5e..19baf6e94a67 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/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(); 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(); @@ -308,15 +307,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative other = (com.google.cloud.speech.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 @@ -525,7 +521,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative buildParti 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); } @@ -540,35 +536,35 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative 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 @@ -812,7 +808,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; } @@ -1187,10 +1183,7 @@ public com.google.cloud.speech.v1p1beta1.WordInfo.Builder addWordsBuilder(int in com.google.cloud.speech.v1p1beta1.WordInfo, com.google.cloud.speech.v1p1beta1.WordInfo.Builder, com.google.cloud.speech.v1p1beta1.WordInfoOrBuilder>( - words_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + words_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); words_ = null; } return wordsBuilder_; @@ -1198,7 +1191,7 @@ public com.google.cloud.speech.v1p1beta1.WordInfo.Builder addWordsBuilder(int in @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java index 6592db6f2cfc..5c2338b09afc 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java @@ -24,7 +24,6 @@ private SpeechRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -80,7 +79,7 @@ private SpeechRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +91,7 @@ private SpeechRecognitionResult( } 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(); @@ -327,12 +326,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult other = (com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && (getChannelTag() == other.getChannelTag()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (getChannelTag() != other.getChannelTag()) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -538,7 +536,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult 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); } @@ -555,35 +553,35 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult 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 @@ -669,7 +667,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( alternatives_); @@ -1099,10 +1097,7 @@ public Builder removeAlternatives(int index) { com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative, com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative.Builder, com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1269,7 +1264,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-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java index a2b7ed93fbe4..fbc45b6137ed 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java @@ -23,10 +23,7 @@ private StreamingRecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builde super(builder); } - private StreamingRecognitionConfig() { - singleUtterance_ = false; - interimResults_ = false; - } + private StreamingRecognitionConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -81,7 +78,7 @@ private StreamingRecognitionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,15 +253,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig other = (com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (getSingleUtterance() == other.getSingleUtterance()); - result = result && (getInterimResults() == other.getInterimResults()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSingleUtterance() != other.getSingleUtterance()) return false; + if (getInterimResults() != other.getInterimResults()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +476,35 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig 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 @@ -564,7 +560,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.speech.v1p1beta1.RecognitionConfig config_ = null; + private com.google.cloud.speech.v1p1beta1.RecognitionConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionConfig, com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder, @@ -881,7 +877,7 @@ public Builder clearInterimResults() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java index d19bcc1056ce..910b4819d4ed 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java @@ -25,9 +25,6 @@ private StreamingRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builde private StreamingRecognitionResult() { alternatives_ = java.util.Collections.emptyList(); - isFinal_ = false; - stability_ = 0F; - channelTag_ = 0; languageCode_ = ""; } @@ -57,7 +54,7 @@ private StreamingRecognitionResult( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { alternatives_ = new java.util.ArrayList< com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative>(); @@ -108,7 +105,7 @@ private StreamingRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,7 +117,7 @@ private StreamingRecognitionResult( } 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(); @@ -455,21 +452,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult other = (com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult) obj; - boolean result = true; - result = result && getAlternativesList().equals(other.getAlternativesList()); - result = result && (getIsFinal() == other.getIsFinal()); - result = - result - && (java.lang.Float.floatToIntBits(getStability()) - == java.lang.Float.floatToIntBits(other.getStability())); - result = result && (hasResultEndTime() == other.hasResultEndTime()); + if (!getAlternativesList().equals(other.getAlternativesList())) return false; + if (getIsFinal() != other.getIsFinal()) return false; + if (java.lang.Float.floatToIntBits(getStability()) + != java.lang.Float.floatToIntBits(other.getStability())) return false; + if (hasResultEndTime() != other.hasResultEndTime()) return false; if (hasResultEndTime()) { - result = result && getResultEndTime().equals(other.getResultEndTime()); + if (!getResultEndTime().equals(other.getResultEndTime())) return false; } - result = result && (getChannelTag() == other.getChannelTag()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getChannelTag() != other.getChannelTag()) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -695,7 +689,7 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult 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); } @@ -719,35 +713,35 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult buildPartial @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -843,7 +837,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( alternatives_); @@ -1273,10 +1267,7 @@ public Builder removeAlternatives(int index) { com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative, com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative.Builder, com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder>( - alternatives_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + alternatives_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); alternatives_ = null; } return alternativesBuilder_; @@ -1394,7 +1385,7 @@ public Builder clearStability() { return this; } - private com.google.protobuf.Duration resultEndTime_ = null; + private com.google.protobuf.Duration resultEndTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1745,7 +1736,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-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java index b1af720bf531..fde0ad9cf3de 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java @@ -83,7 +83,7 @@ private StreamingRecognizeRequest( } 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.speech.v1p1beta1.StreamingRecognizeRequest other = (com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest) 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 && getStreamingConfig().equals(other.getStreamingConfig()); + if (!getStreamingConfig().equals(other.getStreamingConfig())) return false; break; case 2: - result = result && getAudioContent().equals(other.getAudioContent()); + if (!getAudioContent().equals(other.getAudioContent())) 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 @@ -518,35 +516,35 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest 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 @@ -924,7 +922,7 @@ public Builder clearAudioContent() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java index 8810050c17e9..e72ab251613e 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java @@ -102,7 +102,7 @@ private StreamingRecognizeResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult>(); @@ -123,7 +123,7 @@ private StreamingRecognizeResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -135,7 +135,7 @@ private StreamingRecognizeResponse( } 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)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -523,15 +523,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse other = (com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse) 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 && getResultsList().equals(other.getResultsList()); - result = result && speechEventType_ == other.speechEventType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (speechEventType_ != other.speechEventType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -784,7 +783,7 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse buildPartial result.error_ = errorBuilder_.build(); } if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -800,35 +799,35 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse 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.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_; @@ -1092,7 +1091,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList( results_); @@ -1502,10 +1501,7 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult.Builder addR com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult, com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult.Builder, com.google.cloud.speech.v1p1beta1.StreamingRecognitionResultOrBuilder>( - results_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -1605,7 +1601,7 @@ public Builder clearSpeechEventType() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java index d4c3be6934cb..9df950d4566f 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java @@ -24,8 +24,6 @@ private WordInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { private WordInfo() { word_ = ""; - confidence_ = 0F; - speakerTag_ = 0; } @java.lang.Override @@ -101,7 +99,7 @@ private WordInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -393,23 +391,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.speech.v1p1beta1.WordInfo other = (com.google.cloud.speech.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()); - } - 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 @@ -642,35 +637,35 @@ public com.google.cloud.speech.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 @@ -730,7 +725,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, @@ -950,7 +945,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, @@ -1384,7 +1379,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-cloud-clients/google-cloud-speech/synth.metadata b/google-cloud-clients/google-cloud-speech/synth.metadata index c39d9478f2f5..6c3359d7bf4a 100644 --- a/google-cloud-clients/google-cloud-speech/synth.metadata +++ b/google-cloud-clients/google-cloud-speech/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-02-26T08:51:45.318623Z", + "updateTime": "2019-03-29T07:56:50.652151Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.14", - "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "29f098cb03a9983cc9cb15993de5da64419046f2", - "internalRef": "235621085" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],