From 26e53ef0b86e705fc11e62a003452d3f4cfeb31b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 29 Mar 2019 03:30:50 -0700 Subject: [PATCH] Regenerate texttospeech client (#4814) --- .../cloud/texttospeech/v1/AudioConfig.java | 57 ++++++++----------- .../texttospeech/v1/ListVoicesRequest.java | 23 ++++---- .../texttospeech/v1/ListVoicesResponse.java | 36 ++++++------ .../cloud/texttospeech/v1/SynthesisInput.java | 28 +++++---- .../v1/SynthesizeSpeechRequest.java | 39 +++++++------ .../v1/SynthesizeSpeechResponse.java | 23 ++++---- .../google/cloud/texttospeech/v1/Voice.java | 38 ++++++------- .../texttospeech/v1/VoiceSelectionParams.java | 27 +++++---- .../texttospeech/v1beta1/AudioConfig.java | 57 ++++++++----------- .../v1beta1/ListVoicesRequest.java | 23 ++++---- .../v1beta1/ListVoicesResponse.java | 36 ++++++------ .../texttospeech/v1beta1/SynthesisInput.java | 28 +++++---- .../v1beta1/SynthesizeSpeechRequest.java | 39 +++++++------ .../v1beta1/SynthesizeSpeechResponse.java | 23 ++++---- .../cloud/texttospeech/v1beta1/Voice.java | 38 ++++++------- .../v1beta1/VoiceSelectionParams.java | 27 +++++---- .../google-cloud-texttospeech/synth.metadata | 10 ++-- 17 files changed, 253 insertions(+), 299 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java index d2e7742d1c53..6d7bb65e4054 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java @@ -24,10 +24,6 @@ private AudioConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private AudioConfig() { audioEncoding_ = 0; - speakingRate_ = 0D; - pitch_ = 0D; - volumeGainDb_ = 0D; - sampleRateHertz_ = 0; effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -85,7 +81,7 @@ private AudioConfig( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -94,7 +90,7 @@ private AudioConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +102,7 @@ private AudioConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -394,24 +390,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.AudioConfig other = (com.google.cloud.texttospeech.v1.AudioConfig) obj; - boolean result = true; - result = result && audioEncoding_ == other.audioEncoding_; - result = - result - && (java.lang.Double.doubleToLongBits(getSpeakingRate()) - == java.lang.Double.doubleToLongBits(other.getSpeakingRate())); - result = - result - && (java.lang.Double.doubleToLongBits(getPitch()) - == java.lang.Double.doubleToLongBits(other.getPitch())); - result = - result - && (java.lang.Double.doubleToLongBits(getVolumeGainDb()) - == java.lang.Double.doubleToLongBits(other.getVolumeGainDb())); - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && getEffectsProfileIdList().equals(other.getEffectsProfileIdList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (audioEncoding_ != other.audioEncoding_) return false; + if (java.lang.Double.doubleToLongBits(getSpeakingRate()) + != java.lang.Double.doubleToLongBits(other.getSpeakingRate())) return false; + if (java.lang.Double.doubleToLongBits(getPitch()) + != java.lang.Double.doubleToLongBits(other.getPitch())) return false; + if (java.lang.Double.doubleToLongBits(getVolumeGainDb()) + != java.lang.Double.doubleToLongBits(other.getVolumeGainDb())) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (!getEffectsProfileIdList().equals(other.getEffectsProfileIdList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -634,7 +623,7 @@ public com.google.cloud.texttospeech.v1.AudioConfig buildPartial() { result.pitch_ = pitch_; result.volumeGainDb_ = volumeGainDb_; result.sampleRateHertz_ = sampleRateHertz_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -646,35 +635,35 @@ public com.google.cloud.texttospeech.v1.AudioConfig 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 @@ -1052,7 +1041,7 @@ public Builder clearSampleRateHertz() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEffectsProfileIdIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(effectsProfileId_); bitField0_ |= 0x00000020; } @@ -1247,7 +1236,7 @@ public Builder addEffectsProfileIdBytes(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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java index f82ef275cc7f..4a19ffa508a9 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java @@ -59,7 +59,7 @@ private ListVoicesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -193,10 +193,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.ListVoicesRequest other = (com.google.cloud.texttospeech.v1.ListVoicesRequest) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +388,35 @@ public com.google.cloud.texttospeech.v1.ListVoicesRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -598,7 +597,7 @@ public Builder 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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java index 919ddbb6f492..872cb0692218 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java @@ -52,7 +52,7 @@ private ListVoicesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { voices_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ListVoicesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ListVoicesResponse( } 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)) { voices_ = java.util.Collections.unmodifiableList(voices_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.ListVoicesResponse other = (com.google.cloud.texttospeech.v1.ListVoicesResponse) obj; - boolean result = true; - result = result && getVoicesList().equals(other.getVoicesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getVoicesList().equals(other.getVoicesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,7 +405,7 @@ public com.google.cloud.texttospeech.v1.ListVoicesResponse buildPartial() { new com.google.cloud.texttospeech.v1.ListVoicesResponse(this); int from_bitField0_ = bitField0_; if (voicesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { voices_ = java.util.Collections.unmodifiableList(voices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -420,35 +419,35 @@ public com.google.cloud.texttospeech.v1.ListVoicesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -527,7 +526,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureVoicesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { voices_ = new java.util.ArrayList(voices_); bitField0_ |= 0x00000001; } @@ -865,10 +864,7 @@ public java.util.List getVoicesB com.google.cloud.texttospeech.v1.Voice, com.google.cloud.texttospeech.v1.Voice.Builder, com.google.cloud.texttospeech.v1.VoiceOrBuilder>( - voices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + voices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); voices_ = null; } return voicesBuilder_; @@ -876,7 +872,7 @@ public java.util.List getVoicesB @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java index a51747de76a1..787d9544eec8 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java @@ -67,7 +67,7 @@ private SynthesisInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -300,21 +300,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.SynthesisInput other = (com.google.cloud.texttospeech.v1.SynthesisInput) obj; - boolean result = true; - result = result && getInputSourceCase().equals(other.getInputSourceCase()); - if (!result) return false; + if (!getInputSourceCase().equals(other.getInputSourceCase())) return false; switch (inputSourceCase_) { case 1: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 2: - result = result && getSsml().equals(other.getSsml()); + if (!getSsml().equals(other.getSsml())) 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 @@ -526,35 +524,35 @@ public com.google.cloud.texttospeech.v1.SynthesisInput 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 @@ -860,7 +858,7 @@ public Builder setSsmlBytes(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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java index cdd9dcf0fe88..b9beddb8cc95 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java @@ -99,7 +99,7 @@ private SynthesizeSpeechRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -311,21 +311,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest other = (com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) obj; - boolean result = true; - result = result && (hasInput() == other.hasInput()); + if (hasInput() != other.hasInput()) return false; if (hasInput()) { - result = result && getInput().equals(other.getInput()); + if (!getInput().equals(other.getInput())) return false; } - result = result && (hasVoice() == other.hasVoice()); + if (hasVoice() != other.hasVoice()) return false; if (hasVoice()) { - result = result && getVoice().equals(other.getVoice()); + if (!getVoice().equals(other.getVoice())) return false; } - result = result && (hasAudioConfig() == other.hasAudioConfig()); + if (hasAudioConfig() != other.hasAudioConfig()) return false; if (hasAudioConfig()) { - result = result && getAudioConfig().equals(other.getAudioConfig()); + if (!getAudioConfig().equals(other.getAudioConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -559,35 +558,35 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest 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.cloud.texttospeech.v1.SynthesisInput input_ = null; + private com.google.cloud.texttospeech.v1.SynthesisInput input_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1.SynthesisInput, com.google.cloud.texttospeech.v1.SynthesisInput.Builder, @@ -824,7 +823,7 @@ public com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilde return inputBuilder_; } - private com.google.cloud.texttospeech.v1.VoiceSelectionParams voice_ = null; + private com.google.cloud.texttospeech.v1.VoiceSelectionParams voice_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1.VoiceSelectionParams, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder, @@ -1006,7 +1005,7 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOr return voiceBuilder_; } - private com.google.cloud.texttospeech.v1.AudioConfig audioConfig_ = null; + private com.google.cloud.texttospeech.v1.AudioConfig audioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1.AudioConfig, com.google.cloud.texttospeech.v1.AudioConfig.Builder, @@ -1190,7 +1189,7 @@ public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBui @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java index 0acbf65f5441..84f5a07f250b 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java @@ -57,7 +57,7 @@ private SynthesizeSpeechResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +152,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse other = (com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse) obj; - boolean result = true; - result = result && getAudioContent().equals(other.getAudioContent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAudioContent().equals(other.getAudioContent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -349,35 +348,35 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse 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 @@ -484,7 +483,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-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java index 81b021723a67..19a06148d115 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java @@ -26,7 +26,6 @@ private Voice() { languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; name_ = ""; ssmlGender_ = 0; - naturalSampleRateHertz_ = 0; } @java.lang.Override @@ -56,7 +55,7 @@ private Voice( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { languageCodes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -84,7 +83,7 @@ private Voice( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +95,7 @@ private Voice( } 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)) { languageCodes_ = languageCodes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -338,13 +337,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.texttospeech.v1.Voice other = (com.google.cloud.texttospeech.v1.Voice) obj; - boolean result = true; - result = result && getLanguageCodesList().equals(other.getLanguageCodesList()); - result = result && getName().equals(other.getName()); - result = result && ssmlGender_ == other.ssmlGender_; - result = result && (getNaturalSampleRateHertz() == other.getNaturalSampleRateHertz()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCodesList().equals(other.getLanguageCodesList())) return false; + if (!getName().equals(other.getName())) return false; + if (ssmlGender_ != other.ssmlGender_) return false; + if (getNaturalSampleRateHertz() != other.getNaturalSampleRateHertz()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -546,7 +544,7 @@ public com.google.cloud.texttospeech.v1.Voice buildPartial() { new com.google.cloud.texttospeech.v1.Voice(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { languageCodes_ = languageCodes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -561,35 +559,35 @@ public com.google.cloud.texttospeech.v1.Voice 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 @@ -659,7 +657,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLanguageCodesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { languageCodes_ = new com.google.protobuf.LazyStringArrayList(languageCodes_); bitField0_ |= 0x00000001; } @@ -1034,7 +1032,7 @@ public Builder clearNaturalSampleRateHertz() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java index db678cc1c4d4..93dd772c4abb 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java @@ -75,7 +75,7 @@ private VoiceSelectionParams( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -314,12 +314,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1.VoiceSelectionParams other = (com.google.cloud.texttospeech.v1.VoiceSelectionParams) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getName().equals(other.getName()); - result = result && ssmlGender_ == other.ssmlGender_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getName().equals(other.getName())) return false; + if (ssmlGender_ != other.ssmlGender_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -523,35 +522,35 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParams 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 @@ -951,7 +950,7 @@ public Builder clearSsmlGender() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java index 9ad23e5280fb..fc977a58d551 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java @@ -24,10 +24,6 @@ private AudioConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private AudioConfig() { audioEncoding_ = 0; - speakingRate_ = 0D; - pitch_ = 0D; - volumeGainDb_ = 0D; - sampleRateHertz_ = 0; effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -85,7 +81,7 @@ private AudioConfig( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -94,7 +90,7 @@ private AudioConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +102,7 @@ private AudioConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -382,24 +378,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.AudioConfig other = (com.google.cloud.texttospeech.v1beta1.AudioConfig) obj; - boolean result = true; - result = result && audioEncoding_ == other.audioEncoding_; - result = - result - && (java.lang.Double.doubleToLongBits(getSpeakingRate()) - == java.lang.Double.doubleToLongBits(other.getSpeakingRate())); - result = - result - && (java.lang.Double.doubleToLongBits(getPitch()) - == java.lang.Double.doubleToLongBits(other.getPitch())); - result = - result - && (java.lang.Double.doubleToLongBits(getVolumeGainDb()) - == java.lang.Double.doubleToLongBits(other.getVolumeGainDb())); - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && getEffectsProfileIdList().equals(other.getEffectsProfileIdList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (audioEncoding_ != other.audioEncoding_) return false; + if (java.lang.Double.doubleToLongBits(getSpeakingRate()) + != java.lang.Double.doubleToLongBits(other.getSpeakingRate())) return false; + if (java.lang.Double.doubleToLongBits(getPitch()) + != java.lang.Double.doubleToLongBits(other.getPitch())) return false; + if (java.lang.Double.doubleToLongBits(getVolumeGainDb()) + != java.lang.Double.doubleToLongBits(other.getVolumeGainDb())) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (!getEffectsProfileIdList().equals(other.getEffectsProfileIdList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -622,7 +611,7 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfig buildPartial() { result.pitch_ = pitch_; result.volumeGainDb_ = volumeGainDb_; result.sampleRateHertz_ = sampleRateHertz_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -634,35 +623,35 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfig 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 @@ -1044,7 +1033,7 @@ public Builder clearSampleRateHertz() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEffectsProfileIdIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(effectsProfileId_); bitField0_ |= 0x00000020; } @@ -1203,7 +1192,7 @@ public Builder addEffectsProfileIdBytes(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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java index 638ea0dd2e11..f9b0a145d6e3 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java @@ -59,7 +59,7 @@ private ListVoicesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -193,10 +193,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.ListVoicesRequest other = (com.google.cloud.texttospeech.v1beta1.ListVoicesRequest) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +389,35 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest 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 @@ -599,7 +598,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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java index a5053d73b425..246152e9a102 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java @@ -52,7 +52,7 @@ private ListVoicesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { voices_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ListVoicesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ListVoicesResponse( } 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)) { voices_ = java.util.Collections.unmodifiableList(voices_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.ListVoicesResponse other = (com.google.cloud.texttospeech.v1beta1.ListVoicesResponse) obj; - boolean result = true; - result = result && getVoicesList().equals(other.getVoicesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getVoicesList().equals(other.getVoicesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -407,7 +406,7 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse buildPartial() { new com.google.cloud.texttospeech.v1beta1.ListVoicesResponse(this); int from_bitField0_ = bitField0_; if (voicesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { voices_ = java.util.Collections.unmodifiableList(voices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -421,35 +420,35 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse 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 @@ -528,7 +527,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureVoicesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { voices_ = new java.util.ArrayList(voices_); bitField0_ |= 0x00000001; } @@ -867,10 +866,7 @@ public com.google.cloud.texttospeech.v1beta1.Voice.Builder addVoicesBuilder(int com.google.cloud.texttospeech.v1beta1.Voice, com.google.cloud.texttospeech.v1beta1.Voice.Builder, com.google.cloud.texttospeech.v1beta1.VoiceOrBuilder>( - voices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + voices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); voices_ = null; } return voicesBuilder_; @@ -878,7 +874,7 @@ public com.google.cloud.texttospeech.v1beta1.Voice.Builder addVoicesBuilder(int @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java index 73e2aeb817f7..06cbd70f199d 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java @@ -67,7 +67,7 @@ private SynthesisInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -300,21 +300,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.SynthesisInput other = (com.google.cloud.texttospeech.v1beta1.SynthesisInput) obj; - boolean result = true; - result = result && getInputSourceCase().equals(other.getInputSourceCase()); - if (!result) return false; + if (!getInputSourceCase().equals(other.getInputSourceCase())) return false; switch (inputSourceCase_) { case 1: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 2: - result = result && getSsml().equals(other.getSsml()); + if (!getSsml().equals(other.getSsml())) 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 @@ -526,35 +524,35 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInput 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 @@ -861,7 +859,7 @@ public Builder setSsmlBytes(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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java index d0c6bd742339..c75394d3dfa5 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java @@ -101,7 +101,7 @@ private SynthesizeSpeechRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -313,21 +313,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest other = (com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest) obj; - boolean result = true; - result = result && (hasInput() == other.hasInput()); + if (hasInput() != other.hasInput()) return false; if (hasInput()) { - result = result && getInput().equals(other.getInput()); + if (!getInput().equals(other.getInput())) return false; } - result = result && (hasVoice() == other.hasVoice()); + if (hasVoice() != other.hasVoice()) return false; if (hasVoice()) { - result = result && getVoice().equals(other.getVoice()); + if (!getVoice().equals(other.getVoice())) return false; } - result = result && (hasAudioConfig() == other.hasAudioConfig()); + if (hasAudioConfig() != other.hasAudioConfig()) return false; if (hasAudioConfig()) { - result = result && getAudioConfig().equals(other.getAudioConfig()); + if (!getAudioConfig().equals(other.getAudioConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -562,35 +561,35 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest 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 @@ -647,7 +646,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.texttospeech.v1beta1.SynthesisInput input_ = null; + private com.google.cloud.texttospeech.v1beta1.SynthesisInput input_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1beta1.SynthesisInput, com.google.cloud.texttospeech.v1beta1.SynthesisInput.Builder, @@ -829,7 +828,7 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInputOrBuilder getInputOrB return inputBuilder_; } - private com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams voice_ = null; + private com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams voice_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams, com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams.Builder, @@ -1011,7 +1010,7 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParamsOrBuilder getVo return voiceBuilder_; } - private com.google.cloud.texttospeech.v1beta1.AudioConfig audioConfig_ = null; + private com.google.cloud.texttospeech.v1beta1.AudioConfig audioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.texttospeech.v1beta1.AudioConfig, com.google.cloud.texttospeech.v1beta1.AudioConfig.Builder, @@ -1195,7 +1194,7 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfigOrBuilder getAudioConfig @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java index 2b8731c91ec0..c88fdcb5faa3 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java @@ -57,7 +57,7 @@ private SynthesizeSpeechResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +152,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse other = (com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse) obj; - boolean result = true; - result = result && getAudioContent().equals(other.getAudioContent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAudioContent().equals(other.getAudioContent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -350,35 +349,35 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse 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 @@ -487,7 +486,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-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java index 5d49edb0402d..7c696384bdb0 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java @@ -26,7 +26,6 @@ private Voice() { languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; name_ = ""; ssmlGender_ = 0; - naturalSampleRateHertz_ = 0; } @java.lang.Override @@ -56,7 +55,7 @@ private Voice( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { languageCodes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -84,7 +83,7 @@ private Voice( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +95,7 @@ private Voice( } 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)) { languageCodes_ = languageCodes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -341,13 +340,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.Voice other = (com.google.cloud.texttospeech.v1beta1.Voice) obj; - boolean result = true; - result = result && getLanguageCodesList().equals(other.getLanguageCodesList()); - result = result && getName().equals(other.getName()); - result = result && ssmlGender_ == other.ssmlGender_; - result = result && (getNaturalSampleRateHertz() == other.getNaturalSampleRateHertz()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCodesList().equals(other.getLanguageCodesList())) return false; + if (!getName().equals(other.getName())) return false; + if (ssmlGender_ != other.ssmlGender_) return false; + if (getNaturalSampleRateHertz() != other.getNaturalSampleRateHertz()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -549,7 +547,7 @@ public com.google.cloud.texttospeech.v1beta1.Voice buildPartial() { new com.google.cloud.texttospeech.v1beta1.Voice(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { languageCodes_ = languageCodes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -564,35 +562,35 @@ public com.google.cloud.texttospeech.v1beta1.Voice 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 @@ -662,7 +660,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLanguageCodesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { languageCodes_ = new com.google.protobuf.LazyStringArrayList(languageCodes_); bitField0_ |= 0x00000001; } @@ -1037,7 +1035,7 @@ public Builder clearNaturalSampleRateHertz() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java index 91e3fccf7005..971c83298e5d 100644 --- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java +++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java @@ -75,7 +75,7 @@ private VoiceSelectionParams( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -316,12 +316,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams other = (com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getName().equals(other.getName()); - result = result && ssmlGender_ == other.ssmlGender_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getName().equals(other.getName())) return false; + if (ssmlGender_ != other.ssmlGender_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -525,35 +524,35 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams 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 @@ -953,7 +952,7 @@ public Builder clearSsmlGender() { @java.lang.Override public 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-texttospeech/synth.metadata b/google-cloud-clients/google-cloud-texttospeech/synth.metadata index 98034875a749..4eec7346a835 100644 --- a/google-cloud-clients/google-cloud-texttospeech/synth.metadata +++ b/google-cloud-clients/google-cloud-texttospeech/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-02-26T08:53:17.676495Z", + "updateTime": "2019-03-29T07:59:38.871040Z", "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" } } ],