From 650fa9f6b8ab666583fc2b384e18b7d4cf4e4de4 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 29 Mar 2019 04:55:59 -0700 Subject: [PATCH] Regenerate dialogflow client (#4795) --- .../com/google/cloud/dialogflow/v2/Agent.java | 57 +- .../v2/BatchCreateEntitiesRequest.java | 40 +- .../v2/BatchDeleteEntitiesRequest.java | 35 +- .../v2/BatchDeleteEntityTypesRequest.java | 33 +- .../v2/BatchDeleteIntentsRequest.java | 38 +- .../v2/BatchUpdateEntitiesRequest.java | 46 +- .../v2/BatchUpdateEntityTypesRequest.java | 38 +- .../v2/BatchUpdateEntityTypesResponse.java | 36 +- .../v2/BatchUpdateIntentsRequest.java | 40 +- .../v2/BatchUpdateIntentsResponse.java | 36 +- .../google/cloud/dialogflow/v2/Context.java | 32 +- .../dialogflow/v2/CreateContextRequest.java | 29 +- .../v2/CreateEntityTypeRequest.java | 31 +- .../dialogflow/v2/CreateIntentRequest.java | 33 +- .../v2/CreateSessionEntityTypeRequest.java | 29 +- .../v2/DeleteAllContextsRequest.java | 23 +- .../dialogflow/v2/DeleteContextRequest.java | 23 +- .../v2/DeleteEntityTypeRequest.java | 23 +- .../dialogflow/v2/DeleteIntentRequest.java | 23 +- .../v2/DeleteSessionEntityTypeRequest.java | 23 +- .../dialogflow/v2/DetectIntentRequest.java | 37 +- .../dialogflow/v2/DetectIntentResponse.java | 35 +- .../cloud/dialogflow/v2/EntityType.java | 77 +- .../cloud/dialogflow/v2/EntityTypeBatch.java | 36 +- .../cloud/dialogflow/v2/EventInput.java | 31 +- .../dialogflow/v2/ExportAgentRequest.java | 25 +- .../dialogflow/v2/ExportAgentResponse.java | 28 +- .../cloud/dialogflow/v2/GetAgentRequest.java | 23 +- .../dialogflow/v2/GetContextRequest.java | 23 +- .../dialogflow/v2/GetEntityTypeRequest.java | 25 +- .../cloud/dialogflow/v2/GetIntentRequest.java | 27 +- .../v2/GetSessionEntityTypeRequest.java | 23 +- .../dialogflow/v2/ImportAgentRequest.java | 30 +- .../cloud/dialogflow/v2/InputAudioConfig.java | 38 +- .../google/cloud/dialogflow/v2/Intent.java | 914 +++++++-------- .../cloud/dialogflow/v2/IntentBatch.java | 36 +- .../dialogflow/v2/ListContextsRequest.java | 28 +- .../dialogflow/v2/ListContextsResponse.java | 38 +- .../dialogflow/v2/ListEntityTypesRequest.java | 30 +- .../v2/ListEntityTypesResponse.java | 38 +- .../dialogflow/v2/ListIntentsRequest.java | 32 +- .../dialogflow/v2/ListIntentsResponse.java | 38 +- .../v2/ListSessionEntityTypesRequest.java | 28 +- .../v2/ListSessionEntityTypesResponse.java | 35 +- .../v2/OriginalDetectIntentRequest.java | 29 +- .../cloud/dialogflow/v2/QueryInput.java | 30 +- .../cloud/dialogflow/v2/QueryParameters.java | 65 +- .../cloud/dialogflow/v2/QueryResult.java | 96 +- .../dialogflow/v2/RestoreAgentRequest.java | 30 +- .../dialogflow/v2/SearchAgentsRequest.java | 28 +- .../dialogflow/v2/SearchAgentsResponse.java | 38 +- .../dialogflow/v2/SessionEntityType.java | 40 +- .../v2/StreamingDetectIntentRequest.java | 40 +- .../v2/StreamingDetectIntentResponse.java | 41 +- .../v2/StreamingRecognitionResult.java | 35 +- .../google/cloud/dialogflow/v2/TextInput.java | 25 +- .../dialogflow/v2/TrainAgentRequest.java | 23 +- .../dialogflow/v2/UpdateContextRequest.java | 33 +- .../v2/UpdateEntityTypeRequest.java | 35 +- .../dialogflow/v2/UpdateIntentRequest.java | 37 +- .../v2/UpdateSessionEntityTypeRequest.java | 33 +- .../cloud/dialogflow/v2/WebhookRequest.java | 40 +- .../cloud/dialogflow/v2/WebhookResponse.java | 61 +- .../cloud/dialogflow/v2beta1/Agent.java | 57 +- .../v2beta1/BatchCreateEntitiesRequest.java | 40 +- .../v2beta1/BatchDeleteEntitiesRequest.java | 35 +- .../BatchDeleteEntityTypesRequest.java | 33 +- .../v2beta1/BatchDeleteIntentsRequest.java | 38 +- .../v2beta1/BatchUpdateEntitiesRequest.java | 46 +- .../BatchUpdateEntityTypesRequest.java | 38 +- .../BatchUpdateEntityTypesResponse.java | 36 +- .../v2beta1/BatchUpdateIntentsRequest.java | 40 +- .../v2beta1/BatchUpdateIntentsResponse.java | 36 +- .../cloud/dialogflow/v2beta1/Context.java | 32 +- .../v2beta1/CreateContextRequest.java | 29 +- .../v2beta1/CreateDocumentRequest.java | 29 +- .../v2beta1/CreateEntityTypeRequest.java | 31 +- .../v2beta1/CreateIntentRequest.java | 33 +- .../v2beta1/CreateKnowledgeBaseRequest.java | 29 +- .../CreateSessionEntityTypeRequest.java | 29 +- .../v2beta1/DeleteAllContextsRequest.java | 23 +- .../v2beta1/DeleteContextRequest.java | 23 +- .../v2beta1/DeleteDocumentRequest.java | 23 +- .../v2beta1/DeleteEntityTypeRequest.java | 23 +- .../v2beta1/DeleteIntentRequest.java | 23 +- .../v2beta1/DeleteKnowledgeBaseRequest.java | 26 +- .../DeleteSessionEntityTypeRequest.java | 23 +- .../v2beta1/DetectIntentRequest.java | 43 +- .../v2beta1/DetectIntentResponse.java | 57 +- .../cloud/dialogflow/v2beta1/Document.java | 46 +- .../cloud/dialogflow/v2beta1/EntityType.java | 77 +- .../dialogflow/v2beta1/EntityTypeBatch.java | 36 +- .../cloud/dialogflow/v2beta1/EventInput.java | 31 +- .../v2beta1/ExportAgentRequest.java | 25 +- .../v2beta1/ExportAgentResponse.java | 28 +- .../dialogflow/v2beta1/GetAgentRequest.java | 23 +- .../dialogflow/v2beta1/GetContextRequest.java | 23 +- .../v2beta1/GetDocumentRequest.java | 23 +- .../v2beta1/GetEntityTypeRequest.java | 25 +- .../dialogflow/v2beta1/GetIntentRequest.java | 27 +- .../v2beta1/GetKnowledgeBaseRequest.java | 23 +- .../v2beta1/GetSessionEntityTypeRequest.java | 23 +- .../v2beta1/ImportAgentRequest.java | 30 +- .../dialogflow/v2beta1/InputAudioConfig.java | 40 +- .../cloud/dialogflow/v2beta1/Intent.java | 1002 ++++++++--------- .../cloud/dialogflow/v2beta1/IntentBatch.java | 36 +- .../dialogflow/v2beta1/KnowledgeAnswers.java | 72 +- .../dialogflow/v2beta1/KnowledgeBase.java | 25 +- .../v2beta1/KnowledgeOperationMetadata.java | 23 +- .../v2beta1/ListContextsRequest.java | 28 +- .../v2beta1/ListContextsResponse.java | 38 +- .../v2beta1/ListDocumentsRequest.java | 28 +- .../v2beta1/ListDocumentsResponse.java | 38 +- .../v2beta1/ListEntityTypesRequest.java | 30 +- .../v2beta1/ListEntityTypesResponse.java | 38 +- .../v2beta1/ListIntentsRequest.java | 32 +- .../v2beta1/ListIntentsResponse.java | 38 +- .../v2beta1/ListKnowledgeBasesRequest.java | 28 +- .../v2beta1/ListKnowledgeBasesResponse.java | 35 +- .../ListSessionEntityTypesRequest.java | 28 +- .../ListSessionEntityTypesResponse.java | 35 +- .../v2beta1/OriginalDetectIntentRequest.java | 31 +- .../dialogflow/v2beta1/OutputAudioConfig.java | 33 +- .../cloud/dialogflow/v2beta1/QueryInput.java | 30 +- .../dialogflow/v2beta1/QueryParameters.java | 88 +- .../cloud/dialogflow/v2beta1/QueryResult.java | 109 +- .../v2beta1/RestoreAgentRequest.java | 30 +- .../v2beta1/SearchAgentsRequest.java | 28 +- .../v2beta1/SearchAgentsResponse.java | 38 +- .../cloud/dialogflow/v2beta1/Sentiment.java | 38 +- .../SentimentAnalysisRequestConfig.java | 27 +- .../v2beta1/SentimentAnalysisResult.java | 27 +- .../dialogflow/v2beta1/SessionEntityType.java | 40 +- .../v2beta1/StreamingDetectIntentRequest.java | 46 +- .../StreamingDetectIntentResponse.java | 64 +- .../v2beta1/StreamingRecognitionResult.java | 35 +- .../v2beta1/SynthesizeSpeechConfig.java | 58 +- .../cloud/dialogflow/v2beta1/TextInput.java | 25 +- .../dialogflow/v2beta1/TrainAgentRequest.java | 23 +- .../v2beta1/UpdateContextRequest.java | 33 +- .../v2beta1/UpdateEntityTypeRequest.java | 35 +- .../v2beta1/UpdateIntentRequest.java | 37 +- .../UpdateSessionEntityTypeRequest.java | 33 +- .../v2beta1/VoiceSelectionParams.java | 25 +- .../dialogflow/v2beta1/WebhookRequest.java | 53 +- .../dialogflow/v2beta1/WebhookResponse.java | 64 +- .../google-cloud-dialogflow/synth.metadata | 10 +- 147 files changed, 3313 insertions(+), 3758 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java index 93c4a79dab2a..a28024a7a21a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java @@ -30,9 +30,7 @@ private Agent() { timeZone_ = ""; description_ = ""; avatarUri_ = ""; - enableLogging_ = false; matchMode_ = 0; - classificationThreshold_ = 0F; } @java.lang.Override @@ -83,7 +81,7 @@ private Agent( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -130,7 +128,7 @@ private Agent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -142,7 +140,7 @@ private Agent( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -818,23 +816,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.dialogflow.v2.Agent other = (com.google.cloud.dialogflow.v2.Agent) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDefaultLanguageCode().equals(other.getDefaultLanguageCode()); - result = - result && getSupportedLanguageCodesList().equals(other.getSupportedLanguageCodesList()); - result = result && getTimeZone().equals(other.getTimeZone()); - result = result && getDescription().equals(other.getDescription()); - result = result && getAvatarUri().equals(other.getAvatarUri()); - result = result && (getEnableLogging() == other.getEnableLogging()); - result = result && matchMode_ == other.matchMode_; - result = - result - && (java.lang.Float.floatToIntBits(getClassificationThreshold()) - == java.lang.Float.floatToIntBits(other.getClassificationThreshold())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDefaultLanguageCode().equals(other.getDefaultLanguageCode())) return false; + if (!getSupportedLanguageCodesList().equals(other.getSupportedLanguageCodesList())) + return false; + if (!getTimeZone().equals(other.getTimeZone())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getAvatarUri().equals(other.getAvatarUri())) return false; + if (getEnableLogging() != other.getEnableLogging()) return false; + if (matchMode_ != other.matchMode_) return false; + if (java.lang.Float.floatToIntBits(getClassificationThreshold()) + != java.lang.Float.floatToIntBits(other.getClassificationThreshold())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1061,7 +1056,7 @@ public com.google.cloud.dialogflow.v2.Agent buildPartial() { result.parent_ = parent_; result.displayName_ = displayName_; result.defaultLanguageCode_ = defaultLanguageCode_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1079,35 +1074,35 @@ public com.google.cloud.dialogflow.v2.Agent 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 @@ -1502,7 +1497,7 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value) com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSupportedLanguageCodesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(supportedLanguageCodes_); bitField0_ |= 0x00000008; @@ -2142,7 +2137,7 @@ public Builder clearClassificationThreshold() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java index 3781153feced..4b27bfb8d786 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java @@ -62,7 +62,7 @@ private BatchCreateEntitiesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -82,7 +82,7 @@ private BatchCreateEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,7 +94,7 @@ private BatchCreateEntitiesRequest( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -335,12 +335,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest other = (com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -548,7 +547,7 @@ public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest buildPartial() int to_bitField0_ = 0; result.parent_ = parent_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -564,35 +563,35 @@ public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest 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 @@ -778,7 +777,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList(entities_); bitField0_ |= 0x00000002; @@ -1120,10 +1119,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild com.google.cloud.dialogflow.v2.EntityType.Entity, com.google.cloud.dialogflow.v2.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1245,7 +1241,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java index 4df0656fa1e9..294a66a45fb1 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java @@ -63,7 +63,7 @@ private BatchDeleteEntitiesRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entityValues_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -79,7 +79,7 @@ private BatchDeleteEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -91,7 +91,7 @@ private BatchDeleteEntitiesRequest( } 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)) { entityValues_ = entityValues_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -332,12 +332,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest other = (com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntityValuesList().equals(other.getEntityValuesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntityValuesList().equals(other.getEntityValuesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -538,7 +537,7 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entityValues_ = entityValues_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -551,35 +550,35 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest 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 @@ -748,7 +747,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEntityValuesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entityValues_ = new com.google.protobuf.LazyStringArrayList(entityValues_); bitField0_ |= 0x00000002; } @@ -1021,7 +1020,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java index b6ecadd86a92..c858aad5730e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java @@ -62,7 +62,7 @@ private BatchDeleteEntityTypesRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private BatchDeleteEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private BatchDeleteEntityTypesRequest( } 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)) { entityTypeNames_ = entityTypeNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -263,11 +263,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest other = (com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntityTypeNamesList().equals(other.getEntityTypeNamesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntityTypeNamesList().equals(other.getEntityTypeNamesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,7 +464,7 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest buildPartial int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = entityTypeNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -477,35 +476,35 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest 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 @@ -671,7 +670,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEntityTypeNamesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(entityTypeNames_); bitField0_ |= 0x00000002; } @@ -821,7 +820,7 @@ public Builder addEntityTypeNamesBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java index c59e194672a7..ad18b500879c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java @@ -61,7 +61,7 @@ private BatchDeleteIntentsRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -72,7 +72,7 @@ private BatchDeleteIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private BatchDeleteIntentsRequest( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest other = (com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,7 +480,7 @@ public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest buildPartial() { int to_bitField0_ = 0; result.parent_ = parent_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -496,35 +495,35 @@ public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest 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 @@ -706,7 +705,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000002; } @@ -1062,10 +1061,7 @@ public java.util.List getIntentsB com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, com.google.cloud.dialogflow.v2.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -1073,7 +1069,7 @@ public java.util.List getIntentsB @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java index f390bdbbd96e..2405d9544383 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java @@ -62,7 +62,7 @@ private BatchUpdateEntitiesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -97,7 +97,7 @@ private BatchUpdateEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -109,7 +109,7 @@ private BatchUpdateEntitiesRequest( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -395,16 +395,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest other = (com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -622,7 +621,7 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest buildPartial() int to_bitField0_ = 0; result.parent_ = parent_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -643,35 +642,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest 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 +859,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList(entities_); bitField0_ |= 0x00000002; @@ -1202,10 +1201,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild com.google.cloud.dialogflow.v2.EntityType.Entity, com.google.cloud.dialogflow.v2.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1325,7 +1321,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1506,7 +1502,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java index 392262c0fc98..cdc5fb8b4212 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java @@ -108,7 +108,7 @@ private BatchUpdateEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -489,27 +489,25 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest other = (com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && getEntityTypeBatchCase().equals(other.getEntityTypeBatchCase()); - if (!result) return false; + if (!getEntityTypeBatchCase().equals(other.getEntityTypeBatchCase())) return false; switch (entityTypeBatchCase_) { case 2: - result = result && getEntityTypeBatchUri().equals(other.getEntityTypeBatchUri()); + if (!getEntityTypeBatchUri().equals(other.getEntityTypeBatchUri())) return false; break; case 3: - result = result && getEntityTypeBatchInline().equals(other.getEntityTypeBatchInline()); + if (!getEntityTypeBatchInline().equals(other.getEntityTypeBatchInline())) 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 @@ -750,35 +748,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest 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 @@ -1407,7 +1405,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1588,7 +1586,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java index db2a2d613878..49360e322c58 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java @@ -54,7 +54,7 @@ private BatchUpdateEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -65,7 +65,7 @@ private BatchUpdateEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -77,7 +77,7 @@ private BatchUpdateEntityTypesResponse( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -209,10 +209,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse other = (com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -411,7 +410,7 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse buildPartia new com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse(this); int from_bitField0_ = bitField0_; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -425,35 +424,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse 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 @@ -534,7 +533,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -875,10 +874,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(i com.google.cloud.dialogflow.v2.EntityType, com.google.cloud.dialogflow.v2.EntityType.Builder, com.google.cloud.dialogflow.v2.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -886,7 +882,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(i @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java index 55c1757532e7..cf7fc3288c8a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java @@ -115,7 +115,7 @@ private BatchUpdateIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -531,28 +531,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest other = (com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && intentView_ == other.intentView_; - result = result && getIntentBatchCase().equals(other.getIntentBatchCase()); - if (!result) return false; + if (intentView_ != other.intentView_) return false; + if (!getIntentBatchCase().equals(other.getIntentBatchCase())) return false; switch (intentBatchCase_) { case 2: - result = result && getIntentBatchUri().equals(other.getIntentBatchUri()); + if (!getIntentBatchUri().equals(other.getIntentBatchUri())) return false; break; case 3: - result = result && getIntentBatchInline().equals(other.getIntentBatchInline()); + if (!getIntentBatchInline().equals(other.getIntentBatchInline())) 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 @@ -797,35 +795,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest 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 @@ -1447,7 +1445,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1704,7 +1702,7 @@ public Builder clearIntentView() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java index 18c3086dd6b0..d2f8508fbe55 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java @@ -53,7 +53,7 @@ private BatchUpdateIntentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private BatchUpdateIntentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private BatchUpdateIntentsResponse( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -208,10 +208,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse other = (com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -409,7 +408,7 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial() new com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse(this); int from_bitField0_ = bitField0_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -423,35 +422,35 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -530,7 +529,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -868,10 +867,7 @@ public java.util.List getIntentsB com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, com.google.cloud.dialogflow.v2.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -879,7 +875,7 @@ public java.util.List getIntentsB @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java index e8b96ae3d456..758296097de0 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java @@ -24,7 +24,6 @@ private Context(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Context() { name_ = ""; - lifespanCount_ = 0; } @java.lang.Override @@ -80,7 +79,7 @@ private Context( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -276,15 +275,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.dialogflow.v2.Context other = (com.google.cloud.dialogflow.v2.Context) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (getLifespanCount() == other.getLifespanCount()); - result = result && (hasParameters() == other.hasParameters()); + if (!getName().equals(other.getName())) return false; + if (getLifespanCount() != other.getLifespanCount()) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -497,35 +495,35 @@ public com.google.cloud.dialogflow.v2.Context 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 @@ -731,7 +729,7 @@ public Builder clearLifespanCount() { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -926,7 +924,7 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java index ef3c5bd6cb75..d4d4d4544485 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java @@ -76,7 +76,7 @@ private CreateContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,14 +245,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.CreateContextRequest other = (com.google.cloud.dialogflow.v2.CreateContextRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasContext() == other.hasContext()); + if (!getParent().equals(other.getParent())) return false; + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -461,35 +460,35 @@ public com.google.cloud.dialogflow.v2.CreateContextRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -641,7 +640,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.Context context_ = null; + private com.google.cloud.dialogflow.v2.Context context_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Context, com.google.cloud.dialogflow.v2.Context.Builder, @@ -824,7 +823,7 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java index 2f5cd043b650..20ac1d3ce041 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java @@ -84,7 +84,7 @@ private CreateEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -310,15 +310,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.CreateEntityTypeRequest other = (com.google.cloud.dialogflow.v2.CreateEntityTypeRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasEntityType() == other.hasEntityType()); + if (!getParent().equals(other.getParent())) return false; + if (hasEntityType() != other.hasEntityType()) return false; if (hasEntityType()) { - result = result && getEntityType().equals(other.getEntityType()); + if (!getEntityType().equals(other.getEntityType())) return false; } - 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 @@ -533,35 +532,35 @@ public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest 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 @@ -717,7 +716,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.EntityType entityType_ = null; + private com.google.cloud.dialogflow.v2.EntityType entityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.EntityType, com.google.cloud.dialogflow.v2.EntityType.Builder, @@ -1015,7 +1014,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java index f5b67309e7bb..241d0c1d55fe 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java @@ -92,7 +92,7 @@ private CreateIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -354,16 +354,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.CreateIntentRequest other = (com.google.cloud.dialogflow.v2.CreateIntentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasIntent() == other.hasIntent()); + if (!getParent().equals(other.getParent())) return false; + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -582,35 +581,35 @@ public com.google.cloud.dialogflow.v2.CreateIntentRequest 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 @@ -769,7 +768,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.Intent intent_ = null; + private com.google.cloud.dialogflow.v2.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, @@ -1142,7 +1141,7 @@ public Builder clearIntentView() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java index d805df0526f7..d1de2cd91168 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java @@ -77,7 +77,7 @@ private CreateSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -246,14 +246,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasSessionEntityType() == other.hasSessionEntityType()); + if (!getParent().equals(other.getParent())) return false; + if (hasSessionEntityType() != other.hasSessionEntityType()) return false; if (hasSessionEntityType()) { - result = result && getSessionEntityType().equals(other.getSessionEntityType()); + if (!getSessionEntityType().equals(other.getSessionEntityType())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -464,35 +463,35 @@ public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest 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 @@ -646,7 +645,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.SessionEntityType sessionEntityType_ = null; + private com.google.cloud.dialogflow.v2.SessionEntityType sessionEntityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.SessionEntityType, com.google.cloud.dialogflow.v2.SessionEntityType.Builder, @@ -831,7 +830,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntity @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java index 8b1b558fa299..6c1e14b443b0 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java @@ -60,7 +60,7 @@ private DeleteAllContextsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DeleteAllContextsRequest other = (com.google.cloud.dialogflow.v2.DeleteAllContextsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setParentBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java index 62e4f54ccf08..86d82c2b8f4b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java @@ -60,7 +60,7 @@ private DeleteContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DeleteContextRequest other = (com.google.cloud.dialogflow.v2.DeleteContextRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2.DeleteContextRequest 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 @@ -558,7 +557,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java index 34133f7a32dd..34a748c16217 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java @@ -60,7 +60,7 @@ private DeleteEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest other = (com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java index 9780d89745a3..7d8fe8f59eb1 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java @@ -60,7 +60,7 @@ private DeleteIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DeleteIntentRequest other = (com.google.cloud.dialogflow.v2.DeleteIntentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2.DeleteIntentRequest 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 @@ -558,7 +557,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java index fefcdd231a19..a7ca40dd55b8 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java @@ -61,7 +61,7 @@ private DeleteSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,10 +185,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -384,35 +383,35 @@ public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest 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 @@ -570,7 +569,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java index eccf33ad7760..d3d93e28fc43 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java @@ -97,7 +97,7 @@ private DetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -354,19 +354,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DetectIntentRequest other = (com.google.cloud.dialogflow.v2.DetectIntentRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasQueryParams() == other.hasQueryParams()); + if (!getSession().equals(other.getSession())) return false; + if (hasQueryParams() != other.hasQueryParams()) return false; if (hasQueryParams()) { - result = result && getQueryParams().equals(other.getQueryParams()); + if (!getQueryParams().equals(other.getQueryParams())) return false; } - result = result && (hasQueryInput() == other.hasQueryInput()); + if (hasQueryInput() != other.hasQueryInput()) return false; if (hasQueryInput()) { - result = result && getQueryInput().equals(other.getQueryInput()); + if (!getQueryInput().equals(other.getQueryInput())) return false; } - result = result && getInputAudio().equals(other.getInputAudio()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInputAudio().equals(other.getInputAudio())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -594,35 +593,35 @@ public com.google.cloud.dialogflow.v2.DetectIntentRequest 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 @@ -795,7 +794,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.QueryParameters queryParams_ = null; + private com.google.cloud.dialogflow.v2.QueryParameters queryParams_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryParameters, com.google.cloud.dialogflow.v2.QueryParameters.Builder, @@ -977,7 +976,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB return queryParamsBuilder_; } - private com.google.cloud.dialogflow.v2.QueryInput queryInput_ = null; + private com.google.cloud.dialogflow.v2.QueryInput queryInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryInput, com.google.cloud.dialogflow.v2.QueryInput.Builder, @@ -1250,7 +1249,7 @@ public Builder clearInputAudio() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java index a33de77c524b..41a08676a6cd 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java @@ -89,7 +89,7 @@ private DetectIntentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,18 +306,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.DetectIntentResponse other = (com.google.cloud.dialogflow.v2.DetectIntentResponse) obj; - boolean result = true; - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasQueryResult() == other.hasQueryResult()); + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = result && (hasWebhookStatus() == other.hasWebhookStatus()); + if (hasWebhookStatus() != other.hasWebhookStatus()) return false; if (hasWebhookStatus()) { - result = result && getWebhookStatus().equals(other.getWebhookStatus()); + if (!getWebhookStatus().equals(other.getWebhookStatus())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -540,35 +539,35 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse 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 @@ -723,7 +722,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryResult, com.google.cloud.dialogflow.v2.QueryResult.Builder, @@ -905,7 +904,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild return queryResultBuilder_; } - private com.google.rpc.Status webhookStatus_ = null; + private com.google.rpc.Status webhookStatus_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> webhookStatusBuilder_; @@ -1087,7 +1086,7 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java index f26eba034a7f..98d6c1abfbc9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java @@ -86,7 +86,7 @@ private EntityType( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { entities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; @@ -99,7 +99,7 @@ private EntityType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -111,7 +111,7 @@ private EntityType( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -554,7 +554,7 @@ private Entity( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -563,7 +563,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -575,7 +575,7 @@ private Entity( } 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)) { synonyms_ = synonyms_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -763,11 +763,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.EntityType.Entity other = (com.google.cloud.dialogflow.v2.EntityType.Entity) obj; - boolean result = true; - result = result && getValue().equals(other.getValue()); - result = result && getSynonymsList().equals(other.getSynonymsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValue().equals(other.getValue())) return false; + if (!getSynonymsList().equals(other.getSynonymsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -964,7 +963,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.value_ = value_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -976,23 +975,23 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1000,13 +999,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1191,7 +1190,7 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSynonymsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_); bitField0_ |= 0x00000002; } @@ -1342,7 +1341,7 @@ public Builder addSynonymsBytes(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 @@ -1687,14 +1686,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.EntityType other = (com.google.cloud.dialogflow.v2.EntityType) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && kind_ == other.kind_; - result = result && autoExpansionMode_ == other.autoExpansionMode_; - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (kind_ != other.kind_) return false; + if (autoExpansionMode_ != other.autoExpansionMode_) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1913,7 +1911,7 @@ public com.google.cloud.dialogflow.v2.EntityType buildPartial() { result.kind_ = kind_; result.autoExpansionMode_ = autoExpansionMode_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1928,35 +1926,35 @@ public com.google.cloud.dialogflow.v2.EntityType 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 @@ -2415,7 +2413,7 @@ public Builder clearAutoExpansionMode() { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { entities_ = new java.util.ArrayList(entities_); bitField0_ |= 0x00000010; @@ -2757,10 +2755,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild com.google.cloud.dialogflow.v2.EntityType.Entity, com.google.cloud.dialogflow.v2.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -2768,7 +2763,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java index 3b544872597e..4ecbab9d01a0 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java @@ -52,7 +52,7 @@ private EntityTypeBatch( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private EntityTypeBatch( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private EntityTypeBatch( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.EntityTypeBatch other = (com.google.cloud.dialogflow.v2.EntityTypeBatch) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,7 +405,7 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch buildPartial() { new com.google.cloud.dialogflow.v2.EntityTypeBatch(this); int from_bitField0_ = bitField0_; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -420,35 +419,35 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch 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 @@ -525,7 +524,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -866,10 +865,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(i com.google.cloud.dialogflow.v2.EntityType, com.google.cloud.dialogflow.v2.EntityType.Builder, com.google.cloud.dialogflow.v2.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -877,7 +873,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(i @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java index 44754ea37f24..83e086fb0409 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java @@ -86,7 +86,7 @@ private EventInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,15 +306,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.EventInput other = (com.google.cloud.dialogflow.v2.EventInput) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasParameters() == other.hasParameters()); + if (!getName().equals(other.getName())) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - 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 @@ -531,35 +530,35 @@ public com.google.cloud.dialogflow.v2.EventInput 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 @@ -708,7 +707,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -994,7 +993,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java index 5939bdc1fdb8..9140e5026d75 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java @@ -68,7 +68,7 @@ private ExportAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,11 +243,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ExportAgentRequest other = (com.google.cloud.dialogflow.v2.ExportAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentUri().equals(other.getAgentUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentUri().equals(other.getAgentUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.cloud.dialogflow.v2.ExportAgentRequest 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 @@ -733,7 +732,7 @@ public Builder setAgentUriBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java index 6f6f0ec885ed..3ab21493fd74 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java @@ -64,7 +64,7 @@ private ExportAgentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,21 +271,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ExportAgentResponse other = (com.google.cloud.dialogflow.v2.ExportAgentResponse) obj; - boolean result = true; - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 1: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 2: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -495,35 +493,35 @@ public com.google.cloud.dialogflow.v2.ExportAgentResponse 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 @@ -797,7 +795,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java index 90c9925d5082..3734871b8656 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java @@ -60,7 +60,7 @@ private GetAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.GetAgentRequest other = (com.google.cloud.dialogflow.v2.GetAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2.GetAgentRequest 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 setParentBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java index bf6b27934816..0cff43a45626 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java @@ -60,7 +60,7 @@ private GetContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.GetContextRequest other = (com.google.cloud.dialogflow.v2.GetContextRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2.GetContextRequest 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 @@ -557,7 +556,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java index 13e282e3d1ea..6ecb7a9eea12 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java @@ -68,7 +68,7 @@ private GetEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,11 +247,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.GetEntityTypeRequest other = (com.google.cloud.dialogflow.v2.GetEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -450,35 +449,35 @@ public com.google.cloud.dialogflow.v2.GetEntityTypeRequest 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 @@ -747,7 +746,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java index 522438dfbf50..f1db3564e9fb 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java @@ -76,7 +76,7 @@ private GetIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -293,12 +293,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.GetIntentRequest other = (com.google.cloud.dialogflow.v2.GetIntentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -502,35 +501,35 @@ public com.google.cloud.dialogflow.v2.GetIntentRequest 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 @@ -877,7 +876,7 @@ public Builder clearIntentView() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java index 5e56bc409222..a76be727f8a8 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java @@ -60,7 +60,7 @@ private GetSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -382,35 +381,35 @@ public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest 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 @@ -566,7 +565,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java index 5d29546ddf1c..8a350090333d 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java @@ -73,7 +73,7 @@ private ImportAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -331,22 +331,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ImportAgentRequest other = (com.google.cloud.dialogflow.v2.ImportAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 2: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 3: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -561,35 +559,35 @@ public com.google.cloud.dialogflow.v2.ImportAgentRequest 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 @@ -966,7 +964,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java index 65a45d411264..cac3fc4e88c6 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java @@ -24,7 +24,6 @@ private InputAudioConfig(com.google.protobuf.GeneratedMessageV3.Builder build private InputAudioConfig() { audioEncoding_ = 0; - sampleRateHertz_ = 0; languageCode_ = ""; phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -75,7 +74,7 @@ private InputAudioConfig( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { phraseHints_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -84,7 +83,7 @@ private InputAudioConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +95,7 @@ private InputAudioConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { phraseHints_ = phraseHints_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -351,13 +350,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.InputAudioConfig other = (com.google.cloud.dialogflow.v2.InputAudioConfig) obj; - boolean result = true; - result = result && audioEncoding_ == other.audioEncoding_; - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getPhraseHintsList().equals(other.getPhraseHintsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (audioEncoding_ != other.audioEncoding_) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getPhraseHintsList().equals(other.getPhraseHintsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -562,7 +560,7 @@ public com.google.cloud.dialogflow.v2.InputAudioConfig buildPartial() { result.audioEncoding_ = audioEncoding_; result.sampleRateHertz_ = sampleRateHertz_; result.languageCode_ = languageCode_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { phraseHints_ = phraseHints_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -574,35 +572,35 @@ public com.google.cloud.dialogflow.v2.InputAudioConfig 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 @@ -913,7 +911,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePhraseHintsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { phraseHints_ = new com.google.protobuf.LazyStringArrayList(phraseHints_); bitField0_ |= 0x00000008; } @@ -1081,7 +1079,7 @@ public Builder addPhraseHintsBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java index f6663c2637e1..5871d2ac67a7 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java @@ -28,15 +28,11 @@ private Intent() { name_ = ""; displayName_ = ""; webhookState_ = 0; - priority_ = 0; - isFallback_ = false; - mlDisabled_ = false; inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; events_ = com.google.protobuf.LazyStringArrayList.EMPTY; trainingPhrases_ = java.util.Collections.emptyList(); action_ = ""; outputContexts_ = java.util.Collections.emptyList(); - resetContexts_ = false; parameters_ = java.util.Collections.emptyList(); messages_ = java.util.Collections.emptyList(); defaultResponsePlatforms_ = java.util.Collections.emptyList(); @@ -103,7 +99,7 @@ private Intent( case 58: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { inputContextNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -113,7 +109,7 @@ private Intent( case 66: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { events_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000080; } @@ -122,7 +118,7 @@ private Intent( } case 74: { - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { trainingPhrases_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; @@ -142,7 +138,7 @@ private Intent( } case 90: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; } @@ -158,7 +154,7 @@ private Intent( } case 106: { - if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (!((mutable_bitField0_ & 0x00001000) != 0)) { parameters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00001000; @@ -170,7 +166,7 @@ private Intent( } case 114: { - if (!((mutable_bitField0_ & 0x00002000) == 0x00002000)) { + if (!((mutable_bitField0_ & 0x00002000) != 0)) { messages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00002000; @@ -183,7 +179,7 @@ private Intent( case 120: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (!((mutable_bitField0_ & 0x00004000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00004000; } @@ -196,7 +192,7 @@ private Intent( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (!((mutable_bitField0_ & 0x00004000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00004000; } @@ -221,7 +217,7 @@ private Intent( } case 146: { - if (!((mutable_bitField0_ & 0x00020000) == 0x00020000)) { + if (!((mutable_bitField0_ & 0x00020000) != 0)) { followupIntentInfo_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo>(); @@ -240,7 +236,7 @@ private Intent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -252,29 +248,29 @@ private Intent( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { inputContextNames_ = inputContextNames_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { events_ = events_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (((mutable_bitField0_ & 0x00000100) != 0)) { trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_); } - if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } - if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (((mutable_bitField0_ & 0x00001000) != 0)) { parameters_ = java.util.Collections.unmodifiableList(parameters_); } - if (((mutable_bitField0_ & 0x00002000) == 0x00002000)) { + if (((mutable_bitField0_ & 0x00002000) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); } - if (((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (((mutable_bitField0_ & 0x00004000) != 0)) { defaultResponsePlatforms_ = java.util.Collections.unmodifiableList(defaultResponsePlatforms_); } - if (((mutable_bitField0_ & 0x00020000) == 0x00020000)) { + if (((mutable_bitField0_ & 0x00020000) != 0)) { followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_); } this.unknownFields = unknownFields.build(); @@ -589,7 +585,6 @@ private TrainingPhrase() { name_ = ""; type_ = 0; parts_ = java.util.Collections.emptyList(); - timesAddedCount_ = 0; } @java.lang.Override @@ -632,7 +627,7 @@ private TrainingPhrase( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { parts_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part>(); @@ -651,7 +646,7 @@ private TrainingPhrase( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -663,7 +658,7 @@ private TrainingPhrase( } 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)) { parts_ = java.util.Collections.unmodifiableList(parts_); } this.unknownFields = unknownFields.build(); @@ -950,7 +945,6 @@ private Part() { text_ = ""; entityType_ = ""; alias_ = ""; - userDefined_ = false; } @java.lang.Override @@ -1005,7 +999,7 @@ private Part( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1256,13 +1250,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part other = (com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getEntityType().equals(other.getEntityType()); - result = result && getAlias().equals(other.getAlias()); - result = result && (getUserDefined() == other.getUserDefined()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getEntityType().equals(other.getEntityType())) return false; + if (!getAlias().equals(other.getAlias())) return false; + if (getUserDefined() != other.getUserDefined()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1474,23 +1467,23 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part 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 @@ -1498,13 +1491,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1924,7 +1917,7 @@ public Builder clearUserDefined() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2211,13 +2204,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.TrainingPhrase other = (com.google.cloud.dialogflow.v2.Intent.TrainingPhrase) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && type_ == other.type_; - result = result && getPartsList().equals(other.getPartsList()); - result = result && (getTimesAddedCount() == other.getTimesAddedCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (type_ != other.type_) return false; + if (!getPartsList().equals(other.getPartsList())) return false; + if (getTimesAddedCount() != other.getTimesAddedCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2431,7 +2423,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase buildPartial() { result.name_ = name_; result.type_ = type_; if (partsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { parts_ = java.util.Collections.unmodifiableList(parts_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2447,23 +2439,23 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase 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 @@ -2471,13 +2463,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2738,7 +2730,7 @@ public Builder clearType() { java.util.Collections.emptyList(); private void ensurePartsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { parts_ = new java.util.ArrayList( parts_); @@ -3129,10 +3121,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder addPart com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part, com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.Builder, com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.PartOrBuilder>( - parts_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + parts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); parts_ = null; } return partsBuilder_; @@ -3191,7 +3180,7 @@ public Builder clearTimesAddedCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3464,9 +3453,7 @@ private Parameter() { value_ = ""; defaultValue_ = ""; entityTypeDisplayName_ = ""; - mandatory_ = false; prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY; - isList_ = false; } @java.lang.Override @@ -3536,7 +3523,7 @@ private Parameter( case 58: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { prompts_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -3550,7 +3537,7 @@ private Parameter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -3562,7 +3549,7 @@ private Parameter( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { prompts_ = prompts_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -4000,17 +3987,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Parameter other = (com.google.cloud.dialogflow.v2.Intent.Parameter) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getValue().equals(other.getValue()); - result = result && getDefaultValue().equals(other.getDefaultValue()); - result = result && getEntityTypeDisplayName().equals(other.getEntityTypeDisplayName()); - result = result && (getMandatory() == other.getMandatory()); - result = result && getPromptsList().equals(other.getPromptsList()); - result = result && (getIsList() == other.getIsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getValue().equals(other.getValue())) return false; + if (!getDefaultValue().equals(other.getDefaultValue())) return false; + if (!getEntityTypeDisplayName().equals(other.getEntityTypeDisplayName())) return false; + if (getMandatory() != other.getMandatory()) return false; + if (!getPromptsList().equals(other.getPromptsList())) return false; + if (getIsList() != other.getIsList()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -4236,7 +4222,7 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter buildPartial() { result.defaultValue_ = defaultValue_; result.entityTypeDisplayName_ = entityTypeDisplayName_; result.mandatory_ = mandatory_; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { prompts_ = prompts_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000040); } @@ -4249,23 +4235,23 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter 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 @@ -4273,13 +4259,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -4937,7 +4923,7 @@ public Builder clearMandatory() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePromptsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { prompts_ = new com.google.protobuf.LazyStringArrayList(prompts_); bitField0_ |= 0x00000040; } @@ -5132,7 +5118,7 @@ public Builder clearIsList() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -5834,7 +5820,7 @@ private Message( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6359,7 +6345,7 @@ private Text( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { text_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -6368,7 +6354,7 @@ private Text( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6381,7 +6367,7 @@ private Text( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { text_ = text_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -6505,10 +6491,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Text other = (com.google.cloud.dialogflow.v2.Intent.Message.Text) obj; - boolean result = true; - result = result && getTextList().equals(other.getTextList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTextList().equals(other.getTextList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -6700,7 +6685,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Text buildPartial() { com.google.cloud.dialogflow.v2.Intent.Message.Text result = new com.google.cloud.dialogflow.v2.Intent.Message.Text(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { text_ = text_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -6711,23 +6696,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Text 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 @@ -6735,13 +6720,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -6803,7 +6788,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureTextIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { text_ = new com.google.protobuf.LazyStringArrayList(text_); bitField0_ |= 0x00000001; } @@ -6945,7 +6930,7 @@ public Builder addTextBytes(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 @@ -7107,7 +7092,7 @@ private Image( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7279,11 +7264,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Image other = (com.google.cloud.dialogflow.v2.Intent.Message.Image) obj; - boolean result = true; - result = result && getImageUri().equals(other.getImageUri()); - result = result && getAccessibilityText().equals(other.getAccessibilityText()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getImageUri().equals(other.getImageUri())) return false; + if (!getAccessibilityText().equals(other.getAccessibilityText())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -7484,23 +7468,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -7508,13 +7492,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -7764,7 +7748,7 @@ public Builder setAccessibilityTextBytes(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 @@ -7938,7 +7922,7 @@ private QuickReplies( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { quickReplies_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -7947,7 +7931,7 @@ private QuickReplies( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7960,7 +7944,7 @@ private QuickReplies( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { quickReplies_ = quickReplies_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -8134,11 +8118,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies other = (com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getQuickRepliesList().equals(other.getQuickRepliesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getQuickRepliesList().equals(other.getQuickRepliesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8337,7 +8320,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.title_ = title_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { quickReplies_ = quickReplies_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -8349,23 +8332,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies 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 @@ -8373,13 +8356,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -8541,7 +8524,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureQuickRepliesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { quickReplies_ = new com.google.protobuf.LazyStringArrayList(quickReplies_); bitField0_ |= 0x00000002; } @@ -8683,7 +8666,7 @@ public Builder addQuickRepliesBytes(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 @@ -8929,7 +8912,7 @@ private Card( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.Card.Button>(); @@ -8943,7 +8926,7 @@ private Card( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8956,7 +8939,7 @@ private Card( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); } this.unknownFields = unknownFields.build(); @@ -9092,7 +9075,7 @@ private Button( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -9265,11 +9248,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Card.Button other = (com.google.cloud.dialogflow.v2.Intent.Message.Card.Button) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getPostback().equals(other.getPostback()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getPostback().equals(other.getPostback())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9472,23 +9454,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button 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 @@ -9496,13 +9478,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -9755,7 +9737,7 @@ public Builder setPostbackBytes(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 @@ -10067,13 +10049,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Card other = (com.google.cloud.dialogflow.v2.Intent.Message.Card) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getSubtitle().equals(other.getSubtitle()); - result = result && getImageUri().equals(other.getImageUri()); - result = result && getButtonsList().equals(other.getButtonsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getSubtitle().equals(other.getSubtitle())) return false; + if (!getImageUri().equals(other.getImageUri())) return false; + if (!getButtonsList().equals(other.getButtonsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -10288,7 +10269,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card buildPartial() { result.subtitle_ = subtitle_; result.imageUri_ = imageUri_; if (buttonsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -10303,23 +10284,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card 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 @@ -10327,13 +10308,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -10706,7 +10687,7 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureButtonsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { buttons_ = new java.util.ArrayList( buttons_); @@ -11062,10 +11043,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.Builder addButt com.google.cloud.dialogflow.v2.Intent.Message.Card.Button, com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.Builder, com.google.cloud.dialogflow.v2.Intent.Message.Card.ButtonOrBuilder>( - buttons_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + buttons_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); buttons_ = null; } return buttonsBuilder_; @@ -11074,7 +11052,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.Builder addButt @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -11269,7 +11247,7 @@ private SimpleResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -11494,12 +11472,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse other = (com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse) obj; - boolean result = true; - result = result && getTextToSpeech().equals(other.getTextToSpeech()); - result = result && getSsml().equals(other.getSsml()); - result = result && getDisplayText().equals(other.getDisplayText()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTextToSpeech().equals(other.getTextToSpeech())) return false; + if (!getSsml().equals(other.getSsml())) return false; + if (!getDisplayText().equals(other.getDisplayText())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -11706,23 +11683,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse 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 @@ -11730,13 +11707,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -12097,7 +12074,7 @@ public Builder setDisplayTextBytes(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 @@ -12271,7 +12248,7 @@ private SimpleResponses( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { simpleResponses_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse>(); @@ -12285,7 +12262,7 @@ private SimpleResponses( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -12298,7 +12275,7 @@ private SimpleResponses( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_); } this.unknownFields = unknownFields.build(); @@ -12446,10 +12423,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses other = (com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses) obj; - boolean result = true; - result = result && getSimpleResponsesList().equals(other.getSimpleResponsesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSimpleResponsesList().equals(other.getSimpleResponsesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -12655,7 +12631,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses buildPartia new com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses(this); int from_bitField0_ = bitField0_; if (simpleResponsesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -12669,23 +12645,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponses 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 @@ -12693,13 +12669,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -12781,7 +12757,7 @@ public Builder mergeFrom( simpleResponses_ = java.util.Collections.emptyList(); private void ensureSimpleResponsesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { simpleResponses_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse>(simpleResponses_); @@ -13179,7 +13155,7 @@ public Builder removeSimpleResponses(int index) { com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponse.Builder, com.google.cloud.dialogflow.v2.Intent.Message.SimpleResponseOrBuilder>( simpleResponses_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); simpleResponses_ = null; @@ -13190,7 +13166,7 @@ public Builder removeSimpleResponses(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -13491,7 +13467,7 @@ private BasicCard( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>(); @@ -13505,7 +13481,7 @@ private BasicCard( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13518,7 +13494,7 @@ private BasicCard( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); } this.unknownFields = unknownFields.build(); @@ -13682,7 +13658,7 @@ private Button( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13798,7 +13774,7 @@ private OpenUriAction( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13924,10 +13900,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction other = (com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction) obj; - boolean result = true; - result = result && getUri().equals(other.getUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUri().equals(other.getUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -14145,23 +14120,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -14169,13 +14144,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -14331,7 +14306,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 @@ -14531,14 +14506,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button other = (com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && (hasOpenUriAction() == other.hasOpenUriAction()); + if (!getTitle().equals(other.getTitle())) return false; + if (hasOpenUriAction() != other.hasOpenUriAction()) return false; if (hasOpenUriAction()) { - result = result && getOpenUriAction().equals(other.getOpenUriAction()); + if (!getOpenUriAction().equals(other.getOpenUriAction())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -14755,23 +14729,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button 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 @@ -14779,13 +14753,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -14937,7 +14911,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { } private com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction - openUriAction_ = null; + openUriAction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction, com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.OpenUriAction @@ -15157,7 +15131,7 @@ public Builder clearOpenUriAction() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -15522,17 +15496,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.BasicCard other = (com.google.cloud.dialogflow.v2.Intent.Message.BasicCard) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getSubtitle().equals(other.getSubtitle()); - result = result && getFormattedText().equals(other.getFormattedText()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getSubtitle().equals(other.getSubtitle())) return false; + if (!getFormattedText().equals(other.getFormattedText())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && getButtonsList().equals(other.getButtonsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getButtonsList().equals(other.getButtonsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -15762,7 +15735,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard buildPartial() { result.image_ = imageBuilder_.build(); } if (buttonsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -15777,23 +15750,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.BasicCard 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 @@ -15801,13 +15774,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -16179,7 +16152,7 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.Image, com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder, @@ -16365,7 +16338,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu buttons_ = java.util.Collections.emptyList(); private void ensureButtonsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button>(buttons_); @@ -16748,10 +16721,7 @@ public Builder removeButtons(int index) { com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button, com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.Button.Builder, com.google.cloud.dialogflow.v2.Intent.Message.BasicCard.ButtonOrBuilder>( - buttons_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + buttons_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); buttons_ = null; } return buttonsBuilder_; @@ -16760,7 +16730,7 @@ public Builder removeButtons(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -16892,7 +16862,7 @@ private Suggestion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -17013,10 +16983,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Suggestion other = (com.google.cloud.dialogflow.v2.Intent.Message.Suggestion) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -17214,23 +17183,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestion 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 @@ -17238,13 +17207,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -17392,7 +17361,7 @@ public Builder setTitleBytes(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 @@ -17554,7 +17523,7 @@ private Suggestions( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { suggestions_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.Suggestion>(); @@ -17568,7 +17537,7 @@ private Suggestions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -17581,7 +17550,7 @@ private Suggestions( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { suggestions_ = java.util.Collections.unmodifiableList(suggestions_); } this.unknownFields = unknownFields.build(); @@ -17721,10 +17690,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.Suggestions other = (com.google.cloud.dialogflow.v2.Intent.Message.Suggestions) obj; - boolean result = true; - result = result && getSuggestionsList().equals(other.getSuggestionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSuggestionsList().equals(other.getSuggestionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -17924,7 +17892,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestions buildPartial() new com.google.cloud.dialogflow.v2.Intent.Message.Suggestions(this); int from_bitField0_ = bitField0_; if (suggestionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { suggestions_ = java.util.Collections.unmodifiableList(suggestions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -17938,23 +17906,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Suggestions 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 @@ -17962,13 +17930,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -18049,7 +18017,7 @@ public Builder mergeFrom( suggestions_ = java.util.Collections.emptyList(); private void ensureSuggestionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { suggestions_ = new java.util.ArrayList( suggestions_); @@ -18425,7 +18393,7 @@ public Builder removeSuggestions(int index) { com.google.cloud.dialogflow.v2.Intent.Message.Suggestion.Builder, com.google.cloud.dialogflow.v2.Intent.Message.SuggestionOrBuilder>( suggestions_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); suggestions_ = null; @@ -18436,7 +18404,7 @@ public Builder removeSuggestions(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -18600,7 +18568,7 @@ private LinkOutSuggestion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -18772,11 +18740,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion other = (com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion) obj; - boolean result = true; - result = result && getDestinationName().equals(other.getDestinationName()); - result = result && getUri().equals(other.getUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDestinationName().equals(other.getDestinationName())) return false; + if (!getUri().equals(other.getUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -18983,23 +18950,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.LinkOutSuggestion buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -19007,13 +18974,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -19267,7 +19234,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 @@ -19456,7 +19423,7 @@ private ListSelect( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item>(); @@ -19470,7 +19437,7 @@ private ListSelect( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -19483,7 +19450,7 @@ private ListSelect( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); } this.unknownFields = unknownFields.build(); @@ -19714,7 +19681,7 @@ private Item( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -19980,19 +19947,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item other = (com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item) obj; - boolean result = true; - result = result && (hasInfo() == other.hasInfo()); + if (hasInfo() != other.hasInfo()) return false; if (hasInfo()) { - result = result && getInfo().equals(other.getInfo()); + if (!getInfo().equals(other.getInfo())) return false; } - result = result && getTitle().equals(other.getTitle()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -20229,23 +20195,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item 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 @@ -20253,13 +20219,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -20323,7 +20289,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_ = null; + private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo, com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.Builder, @@ -20700,7 +20666,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.Image, com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder, @@ -20885,7 +20851,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -21099,11 +21065,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.ListSelect other = (com.google.cloud.dialogflow.v2.Intent.Message.ListSelect) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getItemsList().equals(other.getItemsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getItemsList().equals(other.getItemsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -21309,7 +21274,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect buildPartial() { int to_bitField0_ = 0; result.title_ = title_; if (itemsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -21324,23 +21289,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ListSelect 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 @@ -21348,13 +21313,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -21532,7 +21497,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { items_ = java.util.Collections.emptyList(); private void ensureItemsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item>(items_); @@ -21910,10 +21875,7 @@ public Builder removeItems(int index) { com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item, com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.Item.Builder, com.google.cloud.dialogflow.v2.Intent.Message.ListSelect.ItemOrBuilder>( - items_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + items_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); items_ = null; } return itemsBuilder_; @@ -21922,7 +21884,7 @@ public Builder removeItems(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -22086,7 +22048,7 @@ private CarouselSelect( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item>(); @@ -22101,7 +22063,7 @@ private CarouselSelect( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -22114,7 +22076,7 @@ private CarouselSelect( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); } this.unknownFields = unknownFields.build(); @@ -22345,7 +22307,7 @@ private Item( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -22611,19 +22573,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item other = (com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item) obj; - boolean result = true; - result = result && (hasInfo() == other.hasInfo()); + if (hasInfo() != other.hasInfo()) return false; if (hasInfo()) { - result = result && getInfo().equals(other.getInfo()); + if (!getInfo().equals(other.getInfo())) return false; } - result = result && getTitle().equals(other.getTitle()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -22862,23 +22823,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -22886,13 +22847,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -22957,7 +22918,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_ = null; + private com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo info_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo, com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo.Builder, @@ -23334,7 +23295,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent.Message.Image, com.google.cloud.dialogflow.v2.Intent.Message.Image.Builder, @@ -23519,7 +23480,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.ImageOrBuilder getImageOrBu @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -23690,10 +23651,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect other = (com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect) obj; - boolean result = true; - result = result && getItemsList().equals(other.getItemsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getItemsList().equals(other.getItemsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -23893,7 +23853,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect buildPartial new com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect(this); int from_bitField0_ = bitField0_; if (itemsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -23907,23 +23867,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect 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 @@ -23931,13 +23891,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -24019,7 +23979,7 @@ public Builder mergeFrom( items_ = java.util.Collections.emptyList(); private void ensureItemsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item>(items_); @@ -24403,10 +24363,7 @@ public Builder removeItems(int index) { com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item, com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.Item.Builder, com.google.cloud.dialogflow.v2.Intent.Message.CarouselSelect.ItemOrBuilder>( - items_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); items_ = null; } return itemsBuilder_; @@ -24415,7 +24372,7 @@ public Builder removeItems(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -24599,7 +24556,7 @@ private SelectItemInfo( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -24608,7 +24565,7 @@ private SelectItemInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -24621,7 +24578,7 @@ private SelectItemInfo( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -24801,11 +24758,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo other = (com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && getSynonymsList().equals(other.getSynonymsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (!getSynonymsList().equals(other.getSynonymsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -25005,7 +24961,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo buildPartial int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.key_ = key_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -25017,23 +24973,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message.SelectItemInfo 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 @@ -25041,13 +24997,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -25215,7 +25171,7 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSynonymsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_); bitField0_ |= 0x00000002; } @@ -25366,7 +25322,7 @@ public Builder addSynonymsBytes(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 @@ -26160,49 +26116,47 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.Message other = (com.google.cloud.dialogflow.v2.Intent.Message) obj; - boolean result = true; - result = result && platform_ == other.platform_; - result = result && getMessageCase().equals(other.getMessageCase()); - if (!result) return false; + if (platform_ != other.platform_) return false; + if (!getMessageCase().equals(other.getMessageCase())) return false; switch (messageCase_) { case 1: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 2: - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; break; case 3: - result = result && getQuickReplies().equals(other.getQuickReplies()); + if (!getQuickReplies().equals(other.getQuickReplies())) return false; break; case 4: - result = result && getCard().equals(other.getCard()); + if (!getCard().equals(other.getCard())) return false; break; case 5: - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; break; case 7: - result = result && getSimpleResponses().equals(other.getSimpleResponses()); + if (!getSimpleResponses().equals(other.getSimpleResponses())) return false; break; case 8: - result = result && getBasicCard().equals(other.getBasicCard()); + if (!getBasicCard().equals(other.getBasicCard())) return false; break; case 9: - result = result && getSuggestions().equals(other.getSuggestions()); + if (!getSuggestions().equals(other.getSuggestions())) return false; break; case 10: - result = result && getLinkOutSuggestion().equals(other.getLinkOutSuggestion()); + if (!getLinkOutSuggestion().equals(other.getLinkOutSuggestion())) return false; break; case 11: - result = result && getListSelect().equals(other.getListSelect()); + if (!getListSelect().equals(other.getListSelect())) return false; break; case 12: - result = result && getCarouselSelect().equals(other.getCarouselSelect()); + if (!getCarouselSelect().equals(other.getCarouselSelect())) 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 @@ -26525,23 +26479,23 @@ public com.google.cloud.dialogflow.v2.Intent.Message 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 @@ -26549,13 +26503,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -29081,7 +29035,7 @@ public Builder clearPlatform() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -29245,7 +29199,7 @@ private FollowupIntentInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -29419,11 +29373,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo other = (com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo) obj; - boolean result = true; - result = result && getFollowupIntentName().equals(other.getFollowupIntentName()); - result = result && getParentFollowupIntentName().equals(other.getParentFollowupIntentName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFollowupIntentName().equals(other.getFollowupIntentName())) return false; + if (!getParentFollowupIntentName().equals(other.getParentFollowupIntentName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -29624,23 +29577,23 @@ public com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo 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 @@ -29648,13 +29601,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -29909,7 +29862,7 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -31048,27 +31001,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.dialogflow.v2.Intent other = (com.google.cloud.dialogflow.v2.Intent) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && webhookState_ == other.webhookState_; - result = result && (getPriority() == other.getPriority()); - result = result && (getIsFallback() == other.getIsFallback()); - result = result && (getMlDisabled() == other.getMlDisabled()); - result = result && getInputContextNamesList().equals(other.getInputContextNamesList()); - result = result && getEventsList().equals(other.getEventsList()); - result = result && getTrainingPhrasesList().equals(other.getTrainingPhrasesList()); - result = result && getAction().equals(other.getAction()); - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (getResetContexts() == other.getResetContexts()); - result = result && getParametersList().equals(other.getParametersList()); - result = result && getMessagesList().equals(other.getMessagesList()); - result = result && defaultResponsePlatforms_.equals(other.defaultResponsePlatforms_); - result = result && getRootFollowupIntentName().equals(other.getRootFollowupIntentName()); - result = result && getParentFollowupIntentName().equals(other.getParentFollowupIntentName()); - result = result && getFollowupIntentInfoList().equals(other.getFollowupIntentInfoList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (webhookState_ != other.webhookState_) return false; + if (getPriority() != other.getPriority()) return false; + if (getIsFallback() != other.getIsFallback()) return false; + if (getMlDisabled() != other.getMlDisabled()) return false; + if (!getInputContextNamesList().equals(other.getInputContextNamesList())) return false; + if (!getEventsList().equals(other.getEventsList())) return false; + if (!getTrainingPhrasesList().equals(other.getTrainingPhrasesList())) return false; + if (!getAction().equals(other.getAction())) return false; + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (getResetContexts() != other.getResetContexts()) return false; + if (!getParametersList().equals(other.getParametersList())) return false; + if (!getMessagesList().equals(other.getMessagesList())) return false; + if (!defaultResponsePlatforms_.equals(other.defaultResponsePlatforms_)) return false; + if (!getRootFollowupIntentName().equals(other.getRootFollowupIntentName())) return false; + if (!getParentFollowupIntentName().equals(other.getParentFollowupIntentName())) return false; + if (!getFollowupIntentInfoList().equals(other.getFollowupIntentInfoList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -31373,18 +31325,18 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { result.priority_ = priority_; result.isFallback_ = isFallback_; result.mlDisabled_ = mlDisabled_; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { inputContextNames_ = inputContextNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000040); } result.inputContextNames_ = inputContextNames_; - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { events_ = events_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000080); } result.events_ = events_; if (trainingPhrasesBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_); bitField0_ = (bitField0_ & ~0x00000100); } @@ -31394,7 +31346,7 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { } result.action_ = action_; if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00000400); } @@ -31404,7 +31356,7 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { } result.resetContexts_ = resetContexts_; if (parametersBuilder_ == null) { - if (((bitField0_ & 0x00001000) == 0x00001000)) { + if (((bitField0_ & 0x00001000) != 0)) { parameters_ = java.util.Collections.unmodifiableList(parameters_); bitField0_ = (bitField0_ & ~0x00001000); } @@ -31413,7 +31365,7 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { result.parameters_ = parametersBuilder_.build(); } if (messagesBuilder_ == null) { - if (((bitField0_ & 0x00002000) == 0x00002000)) { + if (((bitField0_ & 0x00002000) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); bitField0_ = (bitField0_ & ~0x00002000); } @@ -31421,7 +31373,7 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { } else { result.messages_ = messagesBuilder_.build(); } - if (((bitField0_ & 0x00004000) == 0x00004000)) { + if (((bitField0_ & 0x00004000) != 0)) { defaultResponsePlatforms_ = java.util.Collections.unmodifiableList(defaultResponsePlatforms_); bitField0_ = (bitField0_ & ~0x00004000); @@ -31430,7 +31382,7 @@ public com.google.cloud.dialogflow.v2.Intent buildPartial() { result.rootFollowupIntentName_ = rootFollowupIntentName_; result.parentFollowupIntentName_ = parentFollowupIntentName_; if (followupIntentInfoBuilder_ == null) { - if (((bitField0_ & 0x00020000) == 0x00020000)) { + if (((bitField0_ & 0x00020000) != 0)) { followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_); bitField0_ = (bitField0_ & ~0x00020000); } @@ -31445,35 +31397,35 @@ public com.google.cloud.dialogflow.v2.Intent 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 @@ -32148,7 +32100,7 @@ public Builder clearMlDisabled() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInputContextNamesIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { inputContextNames_ = new com.google.protobuf.LazyStringArrayList(inputContextNames_); bitField0_ |= 0x00000040; } @@ -32309,7 +32261,7 @@ public Builder addInputContextNamesBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEventsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { events_ = new com.google.protobuf.LazyStringArrayList(events_); bitField0_ |= 0x00000080; } @@ -32470,7 +32422,7 @@ public Builder addEventsBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureTrainingPhrasesIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { trainingPhrases_ = new java.util.ArrayList( trainingPhrases_); @@ -32839,7 +32791,7 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Builder addTrainingP com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Builder, com.google.cloud.dialogflow.v2.Intent.TrainingPhraseOrBuilder>( trainingPhrases_, - ((bitField0_ & 0x00000100) == 0x00000100), + ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean()); trainingPhrases_ = null; @@ -32945,7 +32897,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00000400) == 0x00000400)) { + if (!((bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00000400; @@ -33359,7 +33311,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i com.google.cloud.dialogflow.v2.Context.Builder, com.google.cloud.dialogflow.v2.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00000400) == 0x00000400), + ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -33418,7 +33370,7 @@ public Builder clearResetContexts() { java.util.Collections.emptyList(); private void ensureParametersIsMutable() { - if (!((bitField0_ & 0x00001000) == 0x00001000)) { + if (!((bitField0_ & 0x00001000) != 0)) { parameters_ = new java.util.ArrayList(parameters_); bitField0_ |= 0x00001000; @@ -33760,10 +33712,7 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter.Builder addParametersBuil com.google.cloud.dialogflow.v2.Intent.Parameter, com.google.cloud.dialogflow.v2.Intent.Parameter.Builder, com.google.cloud.dialogflow.v2.Intent.ParameterOrBuilder>( - parameters_, - ((bitField0_ & 0x00001000) == 0x00001000), - getParentForChildren(), - isClean()); + parameters_, ((bitField0_ & 0x00001000) != 0), getParentForChildren(), isClean()); parameters_ = null; } return parametersBuilder_; @@ -33773,7 +33722,7 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter.Builder addParametersBuil java.util.Collections.emptyList(); private void ensureMessagesIsMutable() { - if (!((bitField0_ & 0x00002000) == 0x00002000)) { + if (!((bitField0_ & 0x00002000) != 0)) { messages_ = new java.util.ArrayList(messages_); bitField0_ |= 0x00002000; @@ -34132,10 +34081,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addMessagesBuilder( com.google.cloud.dialogflow.v2.Intent.Message, com.google.cloud.dialogflow.v2.Intent.Message.Builder, com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>( - messages_, - ((bitField0_ & 0x00002000) == 0x00002000), - getParentForChildren(), - isClean()); + messages_, ((bitField0_ & 0x00002000) != 0), getParentForChildren(), isClean()); messages_ = null; } return messagesBuilder_; @@ -34145,7 +34091,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addMessagesBuilder( java.util.Collections.emptyList(); private void ensureDefaultResponsePlatformsIsMutable() { - if (!((bitField0_ & 0x00004000) == 0x00004000)) { + if (!((bitField0_ & 0x00004000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(defaultResponsePlatforms_); bitField0_ |= 0x00004000; @@ -34589,7 +34535,7 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v followupIntentInfo_ = java.util.Collections.emptyList(); private void ensureFollowupIntentInfoIsMutable() { - if (!((bitField0_ & 0x00020000) == 0x00020000)) { + if (!((bitField0_ & 0x00020000) != 0)) { followupIntentInfo_ = new java.util.ArrayList( followupIntentInfo_); @@ -35001,7 +34947,7 @@ public Builder removeFollowupIntentInfo(int index) { com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfo.Builder, com.google.cloud.dialogflow.v2.Intent.FollowupIntentInfoOrBuilder>( followupIntentInfo_, - ((bitField0_ & 0x00020000) == 0x00020000), + ((bitField0_ & 0x00020000) != 0), getParentForChildren(), isClean()); followupIntentInfo_ = null; @@ -35011,7 +34957,7 @@ public Builder removeFollowupIntentInfo(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java index ca059eb437af..159af62c12f9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java @@ -52,7 +52,7 @@ private IntentBatch( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private IntentBatch( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private IntentBatch( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.IntentBatch other = (com.google.cloud.dialogflow.v2.IntentBatch) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,7 +405,7 @@ public com.google.cloud.dialogflow.v2.IntentBatch buildPartial() { new com.google.cloud.dialogflow.v2.IntentBatch(this); int from_bitField0_ = bitField0_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -420,35 +419,35 @@ public com.google.cloud.dialogflow.v2.IntentBatch 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 @@ -525,7 +524,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -863,10 +862,7 @@ public java.util.List getIntentsB com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, com.google.cloud.dialogflow.v2.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -874,7 +870,7 @@ public java.util.List getIntentsB @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java index 27bbbd036bed..cd6f8e8d0766 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java @@ -25,7 +25,6 @@ private ListContextsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ListContextsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListContextsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListContextsRequest other = (com.google.cloud.dialogflow.v2.ListContextsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,35 +474,35 @@ public com.google.cloud.dialogflow.v2.ListContextsRequest 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 @@ -803,7 +801,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java index 8b48bb203e1d..b30154350b47 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java @@ -54,7 +54,7 @@ private ListContextsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { contexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListContextsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListContextsResponse( } 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)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListContextsResponse other = (com.google.cloud.dialogflow.v2.ListContextsResponse) obj; - boolean result = true; - result = result && getContextsList().equals(other.getContextsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getContextsList().equals(other.getContextsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,7 +478,7 @@ public com.google.cloud.dialogflow.v2.ListContextsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (contextsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -495,35 +494,35 @@ public com.google.cloud.dialogflow.v2.ListContextsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -606,7 +605,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureContextsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { contexts_ = new java.util.ArrayList(contexts_); bitField0_ |= 0x00000001; } @@ -962,10 +961,7 @@ public java.util.List getContext com.google.cloud.dialogflow.v2.Context, com.google.cloud.dialogflow.v2.Context.Builder, com.google.cloud.dialogflow.v2.ContextOrBuilder>( - contexts_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + contexts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); contexts_ = null; } return contextsBuilder_; @@ -1072,7 +1068,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java index 2510f962bbde..11b887d9886c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java @@ -26,7 +26,6 @@ private ListEntityTypesRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListEntityTypesRequest() { parent_ = ""; languageCode_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -332,13 +331,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListEntityTypesRequest other = (com.google.cloud.dialogflow.v2.ListEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -548,35 +546,35 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesRequest 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 @@ -993,7 +991,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java index d2a930a0cc9b..cc3681b1e56e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java @@ -54,7 +54,7 @@ private ListEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListEntityTypesResponse( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListEntityTypesResponse other = (com.google.cloud.dialogflow.v2.ListEntityTypesResponse) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,7 +479,7 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -496,35 +495,35 @@ public com.google.cloud.dialogflow.v2.ListEntityTypesResponse 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 @@ -607,7 +606,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -966,10 +965,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(i com.google.cloud.dialogflow.v2.EntityType, com.google.cloud.dialogflow.v2.EntityType.Builder, com.google.cloud.dialogflow.v2.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -1076,7 +1072,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java index aae7af842466..157e6c5a2856 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java @@ -27,7 +27,6 @@ private ListIntentsRequest() { parent_ = ""; languageCode_ = ""; intentView_ = 0; - pageSize_ = 0; pageToken_ = ""; } @@ -90,7 +89,7 @@ private ListIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -378,14 +377,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListIntentsRequest other = (com.google.cloud.dialogflow.v2.ListIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -599,35 +597,35 @@ public com.google.cloud.dialogflow.v2.ListIntentsRequest 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 @@ -1123,7 +1121,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java index 6ec0289e814a..cfe644bd0382 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java @@ -54,7 +54,7 @@ private ListIntentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListIntentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListIntentsResponse( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListIntentsResponse other = (com.google.cloud.dialogflow.v2.ListIntentsResponse) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,7 +478,7 @@ public com.google.cloud.dialogflow.v2.ListIntentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -495,35 +494,35 @@ public com.google.cloud.dialogflow.v2.ListIntentsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -606,7 +605,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -962,10 +961,7 @@ public java.util.List getIntentsB com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, com.google.cloud.dialogflow.v2.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -1072,7 +1068,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java index d49a37d2914d..2dea7289fe3d 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java @@ -25,7 +25,6 @@ private ListSessionEntityTypesRequest(com.google.protobuf.GeneratedMessageV3.Bui private ListSessionEntityTypesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListSessionEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest other = (com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +476,35 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesRequest 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 @@ -806,7 +804,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java index 0d63eec021a3..ceda06004583 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java @@ -55,7 +55,7 @@ private ListSessionEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -75,7 +75,7 @@ private ListSessionEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -87,7 +87,7 @@ private ListSessionEntityTypesResponse( } 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)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); } this.unknownFields = unknownFields.build(); @@ -279,11 +279,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse other = (com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse) obj; - boolean result = true; - result = result && getSessionEntityTypesList().equals(other.getSessionEntityTypesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSessionEntityTypesList().equals(other.getSessionEntityTypesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,7 +486,7 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse buildPartia int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (sessionEntityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -503,35 +502,35 @@ public com.google.cloud.dialogflow.v2.ListSessionEntityTypesResponse 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 @@ -616,7 +615,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSessionEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = new java.util.ArrayList( sessionEntityTypes_); @@ -983,7 +982,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity com.google.cloud.dialogflow.v2.SessionEntityType.Builder, com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder>( sessionEntityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); sessionEntityTypes_ = null; @@ -1092,7 +1091,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java index 5f89ee97b21c..a231987ddcb4 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java @@ -74,7 +74,7 @@ private OriginalDetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,14 +244,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest other = (com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest) obj; - boolean result = true; - result = result && getSource().equals(other.getSource()); - result = result && (hasPayload() == other.hasPayload()); + if (!getSource().equals(other.getSource())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -461,35 +460,35 @@ public com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -641,7 +640,7 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -827,7 +826,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java index 3b9b54d828d7..a1e9222b5a82 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java @@ -102,7 +102,7 @@ private QueryInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -372,24 +372,22 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.QueryInput other = (com.google.cloud.dialogflow.v2.QueryInput) obj; - boolean result = true; - result = result && getInputCase().equals(other.getInputCase()); - if (!result) return false; + if (!getInputCase().equals(other.getInputCase())) return false; switch (inputCase_) { case 1: - result = result && getAudioConfig().equals(other.getAudioConfig()); + if (!getAudioConfig().equals(other.getAudioConfig())) return false; break; case 2: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 3: - result = result && getEvent().equals(other.getEvent()); + if (!getEvent().equals(other.getEvent())) 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 @@ -621,35 +619,35 @@ public com.google.cloud.dialogflow.v2.QueryInput 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 @@ -1334,7 +1332,7 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getEventOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java index dc1098eab638..37844e60b461 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java @@ -25,7 +25,6 @@ private QueryParameters(com.google.protobuf.GeneratedMessageV3.Builder builde private QueryParameters() { timeZone_ = ""; contexts_ = java.util.Collections.emptyList(); - resetContexts_ = false; sessionEntityTypes_ = java.util.Collections.emptyList(); } @@ -76,7 +75,7 @@ private QueryParameters( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { contexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -92,7 +91,7 @@ private QueryParameters( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; @@ -119,7 +118,7 @@ private QueryParameters( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -131,10 +130,10 @@ private QueryParameters( } 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)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); } this.unknownFields = unknownFields.build(); @@ -525,21 +524,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.QueryParameters other = (com.google.cloud.dialogflow.v2.QueryParameters) obj; - boolean result = true; - result = result && getTimeZone().equals(other.getTimeZone()); - result = result && (hasGeoLocation() == other.hasGeoLocation()); + if (!getTimeZone().equals(other.getTimeZone())) return false; + if (hasGeoLocation() != other.hasGeoLocation()) return false; if (hasGeoLocation()) { - result = result && getGeoLocation().equals(other.getGeoLocation()); + if (!getGeoLocation().equals(other.getGeoLocation())) return false; } - result = result && getContextsList().equals(other.getContextsList()); - result = result && (getResetContexts() == other.getResetContexts()); - result = result && getSessionEntityTypesList().equals(other.getSessionEntityTypesList()); - result = result && (hasPayload() == other.hasPayload()); + if (!getContextsList().equals(other.getContextsList())) return false; + if (getResetContexts() != other.getResetContexts()) return false; + if (!getSessionEntityTypesList().equals(other.getSessionEntityTypesList())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -781,7 +779,7 @@ public com.google.cloud.dialogflow.v2.QueryParameters buildPartial() { result.geoLocation_ = geoLocationBuilder_.build(); } if (contextsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -791,7 +789,7 @@ public com.google.cloud.dialogflow.v2.QueryParameters buildPartial() { } result.resetContexts_ = resetContexts_; if (sessionEntityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -811,35 +809,35 @@ public com.google.cloud.dialogflow.v2.QueryParameters 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 @@ -1061,7 +1059,7 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.type.LatLng geoLocation_ = null; + private com.google.type.LatLng geoLocation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoLocationBuilder_; @@ -1236,7 +1234,7 @@ public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() { java.util.Collections.emptyList(); private void ensureContextsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { contexts_ = new java.util.ArrayList(contexts_); bitField0_ |= 0x00000004; } @@ -1592,10 +1590,7 @@ public java.util.List getContext com.google.cloud.dialogflow.v2.Context, com.google.cloud.dialogflow.v2.Context.Builder, com.google.cloud.dialogflow.v2.ContextOrBuilder>( - contexts_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + contexts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); contexts_ = null; } return contextsBuilder_; @@ -1652,7 +1647,7 @@ public Builder clearResetContexts() { java.util.Collections.emptyList(); private void ensureSessionEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = new java.util.ArrayList( sessionEntityTypes_); @@ -2037,7 +2032,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity com.google.cloud.dialogflow.v2.SessionEntityType.Builder, com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder>( sessionEntityTypes_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); sessionEntityTypes_ = null; @@ -2045,7 +2040,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder addSessionEntity return sessionEntityTypesBuilder_; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2231,7 +2226,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java index 7f8c25156463..1b4f28fd3f3a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java @@ -25,14 +25,11 @@ private QueryResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { private QueryResult() { queryText_ = ""; languageCode_ = ""; - speechRecognitionConfidence_ = 0F; action_ = ""; - allRequiredParamsPresent_ = false; fulfillmentText_ = ""; fulfillmentMessages_ = java.util.Collections.emptyList(); webhookSource_ = ""; outputContexts_ = java.util.Collections.emptyList(); - intentDetectionConfidence_ = 0F; } @java.lang.Override @@ -107,7 +104,7 @@ private QueryResult( } case 58: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; @@ -141,7 +138,7 @@ private QueryResult( } case 82: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; } @@ -195,7 +192,7 @@ private QueryResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -207,10 +204,10 @@ private QueryResult( } 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)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); } - if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } this.unknownFields = unknownFields.build(); @@ -967,41 +964,36 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.QueryResult other = (com.google.cloud.dialogflow.v2.QueryResult) obj; - boolean result = true; - result = result && getQueryText().equals(other.getQueryText()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = - result - && (java.lang.Float.floatToIntBits(getSpeechRecognitionConfidence()) - == java.lang.Float.floatToIntBits(other.getSpeechRecognitionConfidence())); - result = result && getAction().equals(other.getAction()); - result = result && (hasParameters() == other.hasParameters()); + if (!getQueryText().equals(other.getQueryText())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (java.lang.Float.floatToIntBits(getSpeechRecognitionConfidence()) + != java.lang.Float.floatToIntBits(other.getSpeechRecognitionConfidence())) return false; + if (!getAction().equals(other.getAction())) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - result = result && (getAllRequiredParamsPresent() == other.getAllRequiredParamsPresent()); - result = result && getFulfillmentText().equals(other.getFulfillmentText()); - result = result && getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList()); - result = result && getWebhookSource().equals(other.getWebhookSource()); - result = result && (hasWebhookPayload() == other.hasWebhookPayload()); + if (getAllRequiredParamsPresent() != other.getAllRequiredParamsPresent()) return false; + if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; + if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; + if (!getWebhookSource().equals(other.getWebhookSource())) return false; + if (hasWebhookPayload() != other.hasWebhookPayload()) return false; if (hasWebhookPayload()) { - result = result && getWebhookPayload().equals(other.getWebhookPayload()); + if (!getWebhookPayload().equals(other.getWebhookPayload())) return false; } - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (hasIntent() == other.hasIntent()); + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getIntentDetectionConfidence()) - == java.lang.Float.floatToIntBits(other.getIntentDetectionConfidence())); - result = result && (hasDiagnosticInfo() == other.hasDiagnosticInfo()); + if (java.lang.Float.floatToIntBits(getIntentDetectionConfidence()) + != java.lang.Float.floatToIntBits(other.getIntentDetectionConfidence())) return false; + if (hasDiagnosticInfo() != other.hasDiagnosticInfo()) return false; if (hasDiagnosticInfo()) { - result = result && getDiagnosticInfo().equals(other.getDiagnosticInfo()); + if (!getDiagnosticInfo().equals(other.getDiagnosticInfo())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1292,7 +1284,7 @@ public com.google.cloud.dialogflow.v2.QueryResult buildPartial() { result.allRequiredParamsPresent_ = allRequiredParamsPresent_; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1307,7 +1299,7 @@ public com.google.cloud.dialogflow.v2.QueryResult buildPartial() { result.webhookPayload_ = webhookPayloadBuilder_.build(); } if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00000400); } @@ -1333,35 +1325,35 @@ public com.google.cloud.dialogflow.v2.QueryResult 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 @@ -1889,7 +1881,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2218,7 +2210,7 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureFulfillmentMessagesIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = new java.util.ArrayList( fulfillmentMessages_); @@ -2567,7 +2559,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa com.google.cloud.dialogflow.v2.Intent.Message.Builder, com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>( fulfillmentMessages_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); fulfillmentMessages_ = null; @@ -2674,7 +2666,7 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct webhookPayload_ = null; + private com.google.protobuf.Struct webhookPayload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2868,7 +2860,7 @@ public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00000400) == 0x00000400)) { + if (!((bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00000400; @@ -3264,7 +3256,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i com.google.cloud.dialogflow.v2.Context.Builder, com.google.cloud.dialogflow.v2.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00000400) == 0x00000400), + ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -3272,7 +3264,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i return outputContextsBuilder_; } - private com.google.cloud.dialogflow.v2.Intent intent_ = null; + private com.google.cloud.dialogflow.v2.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, @@ -3518,7 +3510,7 @@ public Builder clearIntentDetectionConfidence() { return this; } - private com.google.protobuf.Struct diagnosticInfo_ = null; + private com.google.protobuf.Struct diagnosticInfo_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -3710,7 +3702,7 @@ public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java index aa6f067a7d8a..1dbf40bed9b2 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java @@ -73,7 +73,7 @@ private RestoreAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -331,22 +331,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.RestoreAgentRequest other = (com.google.cloud.dialogflow.v2.RestoreAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 2: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 3: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -561,35 +559,35 @@ public com.google.cloud.dialogflow.v2.RestoreAgentRequest 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 @@ -966,7 +964,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java index 3aab1b7432c4..679cf5c0db83 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java @@ -25,7 +25,6 @@ private SearchAgentsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private SearchAgentsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private SearchAgentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.SearchAgentsRequest other = (com.google.cloud.dialogflow.v2.SearchAgentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,35 +474,35 @@ public com.google.cloud.dialogflow.v2.SearchAgentsRequest 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 @@ -803,7 +801,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java index 7ebb2e292e7c..302d661c2e25 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java @@ -54,7 +54,7 @@ private SearchAgentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { agents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private SearchAgentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private SearchAgentsResponse( } 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)) { agents_ = java.util.Collections.unmodifiableList(agents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.SearchAgentsResponse other = (com.google.cloud.dialogflow.v2.SearchAgentsResponse) obj; - boolean result = true; - result = result && getAgentsList().equals(other.getAgentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAgentsList().equals(other.getAgentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,7 +478,7 @@ public com.google.cloud.dialogflow.v2.SearchAgentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (agentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { agents_ = java.util.Collections.unmodifiableList(agents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -495,35 +494,35 @@ public com.google.cloud.dialogflow.v2.SearchAgentsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -606,7 +605,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAgentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { agents_ = new java.util.ArrayList(agents_); bitField0_ |= 0x00000001; } @@ -962,10 +961,7 @@ public java.util.List getAgentsBui com.google.cloud.dialogflow.v2.Agent, com.google.cloud.dialogflow.v2.Agent.Builder, com.google.cloud.dialogflow.v2.AgentOrBuilder>( - agents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + agents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); agents_ = null; } return agentsBuilder_; @@ -1072,7 +1068,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java index 754563accd77..db27528c430e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java @@ -72,7 +72,7 @@ private SessionEntityType( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { entities_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -85,7 +85,7 @@ private SessionEntityType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -97,7 +97,7 @@ private SessionEntityType( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -500,12 +500,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.SessionEntityType other = (com.google.cloud.dialogflow.v2.SessionEntityType) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && entityOverrideMode_ == other.entityOverrideMode_; - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (entityOverrideMode_ != other.entityOverrideMode_) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -716,7 +715,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType buildPartial() { result.name_ = name_; result.entityOverrideMode_ = entityOverrideMode_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -731,35 +730,35 @@ public com.google.cloud.dialogflow.v2.SessionEntityType 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 +1043,7 @@ public Builder clearEntityOverrideMode() { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { entities_ = new java.util.ArrayList(entities_); bitField0_ |= 0x00000004; @@ -1404,10 +1403,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild com.google.cloud.dialogflow.v2.EntityType.Entity, com.google.cloud.dialogflow.v2.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1415,7 +1411,7 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java index c64d482a12fe..a0296e795ec9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java @@ -32,7 +32,6 @@ private StreamingDetectIntentRequest(com.google.protobuf.GeneratedMessageV3.Buil private StreamingDetectIntentRequest() { session_ = ""; - singleUtterance_ = false; inputAudio_ = com.google.protobuf.ByteString.EMPTY; } @@ -111,7 +110,7 @@ private StreamingDetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -398,20 +397,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest other = (com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasQueryParams() == other.hasQueryParams()); + if (!getSession().equals(other.getSession())) return false; + if (hasQueryParams() != other.hasQueryParams()) return false; if (hasQueryParams()) { - result = result && getQueryParams().equals(other.getQueryParams()); + if (!getQueryParams().equals(other.getQueryParams())) return false; } - result = result && (hasQueryInput() == other.hasQueryInput()); + if (hasQueryInput() != other.hasQueryInput()) return false; if (hasQueryInput()) { - result = result && getQueryInput().equals(other.getQueryInput()); + if (!getQueryInput().equals(other.getQueryInput())) return false; } - result = result && (getSingleUtterance() == other.getSingleUtterance()); - result = result && getInputAudio().equals(other.getInputAudio()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSingleUtterance() != other.getSingleUtterance()) return false; + if (!getInputAudio().equals(other.getInputAudio())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -653,35 +651,35 @@ public com.google.cloud.dialogflow.v2.StreamingDetectIntentRequest 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 @@ -862,7 +860,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.QueryParameters queryParams_ = null; + private com.google.cloud.dialogflow.v2.QueryParameters queryParams_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryParameters, com.google.cloud.dialogflow.v2.QueryParameters.Builder, @@ -1044,7 +1042,7 @@ public com.google.cloud.dialogflow.v2.QueryParametersOrBuilder getQueryParamsOrB return queryParamsBuilder_; } - private com.google.cloud.dialogflow.v2.QueryInput queryInput_ = null; + private com.google.cloud.dialogflow.v2.QueryInput queryInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryInput, com.google.cloud.dialogflow.v2.QueryInput.Builder, @@ -1382,7 +1380,7 @@ public Builder clearInputAudio() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java index f4b88955dfb9..b6e3c68a0cf8 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java @@ -114,7 +114,7 @@ private StreamingDetectIntentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -376,22 +376,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse other = (com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse) obj; - boolean result = true; - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasRecognitionResult() == other.hasRecognitionResult()); + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasRecognitionResult() != other.hasRecognitionResult()) return false; if (hasRecognitionResult()) { - result = result && getRecognitionResult().equals(other.getRecognitionResult()); + if (!getRecognitionResult().equals(other.getRecognitionResult())) return false; } - result = result && (hasQueryResult() == other.hasQueryResult()); + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = result && (hasWebhookStatus() == other.hasWebhookStatus()); + if (hasWebhookStatus() != other.hasWebhookStatus()) return false; if (hasWebhookStatus()) { - result = result && getWebhookStatus().equals(other.getWebhookStatus()); + if (!getWebhookStatus().equals(other.getWebhookStatus())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -639,35 +638,35 @@ public com.google.cloud.dialogflow.v2.StreamingDetectIntentResponse buildPartial @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -826,7 +825,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.StreamingRecognitionResult recognitionResult_ = null; + private com.google.cloud.dialogflow.v2.StreamingRecognitionResult recognitionResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.StreamingRecognitionResult, com.google.cloud.dialogflow.v2.StreamingRecognitionResult.Builder, @@ -1013,7 +1012,7 @@ public Builder clearRecognitionResult() { return recognitionResultBuilder_; } - private com.google.cloud.dialogflow.v2.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryResult, com.google.cloud.dialogflow.v2.QueryResult.Builder, @@ -1195,7 +1194,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild return queryResultBuilder_; } - private com.google.rpc.Status webhookStatus_ = null; + private com.google.rpc.Status webhookStatus_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> webhookStatusBuilder_; @@ -1368,7 +1367,7 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java index 6806065ca67a..539afe076be8 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java @@ -44,8 +44,6 @@ private StreamingRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builde private StreamingRecognitionResult() { messageType_ = 0; transcript_ = ""; - isFinal_ = false; - confidence_ = 0F; } @java.lang.Override @@ -98,7 +96,7 @@ private StreamingRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -476,16 +474,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.StreamingRecognitionResult other = (com.google.cloud.dialogflow.v2.StreamingRecognitionResult) obj; - boolean result = true; - result = result && messageType_ == other.messageType_; - result = result && getTranscript().equals(other.getTranscript()); - result = result && (getIsFinal() == other.getIsFinal()); - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (messageType_ != other.messageType_) return false; + if (!getTranscript().equals(other.getTranscript())) return false; + if (getIsFinal() != other.getIsFinal()) return false; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -713,35 +708,35 @@ public com.google.cloud.dialogflow.v2.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 @@ -1101,7 +1096,7 @@ public Builder clearConfidence() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java index 8aa50a272206..14cbeef20418 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java @@ -67,7 +67,7 @@ private TextInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,11 +243,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.dialogflow.v2.TextInput other = (com.google.cloud.dialogflow.v2.TextInput) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -445,35 +444,35 @@ public com.google.cloud.dialogflow.v2.TextInput 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 @@ -735,7 +734,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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java index a8857c89a1e9..2734e2e1cb0b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java @@ -60,7 +60,7 @@ private TrainAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.TrainAgentRequest other = (com.google.cloud.dialogflow.v2.TrainAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2.TrainAgentRequest 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 @@ -557,7 +556,7 @@ public Builder setParentBytes(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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java index b394b8f5f144..b74214e6dddf 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java @@ -82,7 +82,7 @@ private UpdateContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,17 +245,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.UpdateContextRequest other = (com.google.cloud.dialogflow.v2.UpdateContextRequest) obj; - boolean result = true; - result = result && (hasContext() == other.hasContext()); + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,35 +473,35 @@ public com.google.cloud.dialogflow.v2.UpdateContextRequest 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 @@ -554,7 +553,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.Context context_ = null; + private com.google.cloud.dialogflow.v2.Context context_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Context, com.google.cloud.dialogflow.v2.Context.Builder, @@ -735,7 +734,7 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() { return contextBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -916,7 +915,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java index cda2662da49e..cab5505335c3 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java @@ -91,7 +91,7 @@ private UpdateEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -314,18 +314,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest other = (com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest) obj; - boolean result = true; - result = result && (hasEntityType() == other.hasEntityType()); + if (hasEntityType() != other.hasEntityType()) return false; if (hasEntityType()) { - result = result && getEntityType().equals(other.getEntityType()); + if (!getEntityType().equals(other.getEntityType())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -550,35 +549,35 @@ public com.google.cloud.dialogflow.v2.UpdateEntityTypeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -634,7 +633,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.EntityType entityType_ = null; + private com.google.cloud.dialogflow.v2.EntityType entityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.EntityType, com.google.cloud.dialogflow.v2.EntityType.Builder, @@ -939,7 +938,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1120,7 +1119,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java index 6a8b4eb1f163..f890c0c3bc35 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java @@ -99,7 +99,7 @@ private UpdateIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -358,19 +358,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.UpdateIntentRequest other = (com.google.cloud.dialogflow.v2.UpdateIntentRequest) obj; - boolean result = true; - result = result && (hasIntent() == other.hasIntent()); + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -599,35 +598,35 @@ public com.google.cloud.dialogflow.v2.UpdateIntentRequest 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 @@ -686,7 +685,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.Intent intent_ = null; + private com.google.cloud.dialogflow.v2.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.Intent, com.google.cloud.dialogflow.v2.Intent.Builder, @@ -990,7 +989,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1247,7 +1246,7 @@ public Builder clearIntentView() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java index 4b17950dc55e..bc2586625b50 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java @@ -83,7 +83,7 @@ private UpdateSessionEntityTypeRequest( } 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.dialogflow.v2.UpdateSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest) obj; - boolean result = true; - result = result && (hasSessionEntityType() == other.hasSessionEntityType()); + if (hasSessionEntityType() != other.hasSessionEntityType()) return false; if (hasSessionEntityType()) { - result = result && getSessionEntityType().equals(other.getSessionEntityType()); + if (!getSessionEntityType().equals(other.getSessionEntityType())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +482,35 @@ public com.google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest 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 @@ -565,7 +564,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2.SessionEntityType sessionEntityType_ = null; + private com.google.cloud.dialogflow.v2.SessionEntityType sessionEntityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.SessionEntityType, com.google.cloud.dialogflow.v2.SessionEntityType.Builder, @@ -766,7 +765,7 @@ public com.google.cloud.dialogflow.v2.SessionEntityType.Builder getSessionEntity return sessionEntityTypeBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -947,7 +946,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java index 63d96c5989b4..929bbdab3b7c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java @@ -100,7 +100,7 @@ private WebhookRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -385,20 +385,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.WebhookRequest other = (com.google.cloud.dialogflow.v2.WebhookRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasQueryResult() == other.hasQueryResult()); + if (!getSession().equals(other.getSession())) return false; + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = result && (hasOriginalDetectIntentRequest() == other.hasOriginalDetectIntentRequest()); + if (hasOriginalDetectIntentRequest() != other.hasOriginalDetectIntentRequest()) return false; if (hasOriginalDetectIntentRequest()) { - result = - result && getOriginalDetectIntentRequest().equals(other.getOriginalDetectIntentRequest()); + if (!getOriginalDetectIntentRequest().equals(other.getOriginalDetectIntentRequest())) + return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -626,35 +625,35 @@ public com.google.cloud.dialogflow.v2.WebhookRequest 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 @@ -915,7 +914,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.QueryResult, com.google.cloud.dialogflow.v2.QueryResult.Builder, @@ -1106,8 +1105,7 @@ public com.google.cloud.dialogflow.v2.QueryResultOrBuilder getQueryResultOrBuild return queryResultBuilder_; } - private com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest - originalDetectIntentRequest_ = null; + private com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest originalDetectIntentRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest, com.google.cloud.dialogflow.v2.OriginalDetectIntentRequest.Builder, @@ -1324,7 +1322,7 @@ public Builder clearOriginalDetectIntentRequest() { @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-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java index 24445a6047dc..34ec0a2f943b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java @@ -62,7 +62,7 @@ private WebhookResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -95,7 +95,7 @@ private WebhookResponse( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -122,7 +122,7 @@ private WebhookResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -134,10 +134,10 @@ private WebhookResponse( } 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)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } this.unknownFields = unknownFields.build(); @@ -611,21 +611,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2.WebhookResponse other = (com.google.cloud.dialogflow.v2.WebhookResponse) obj; - boolean result = true; - result = result && getFulfillmentText().equals(other.getFulfillmentText()); - result = result && getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList()); - result = result && getSource().equals(other.getSource()); - result = result && (hasPayload() == other.hasPayload()); + if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; + if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; + if (!getSource().equals(other.getSource())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (hasFollowupEventInput() == other.hasFollowupEventInput()); + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (hasFollowupEventInput() != other.hasFollowupEventInput()) return false; if (hasFollowupEventInput()) { - result = result && getFollowupEventInput().equals(other.getFollowupEventInput()); + if (!getFollowupEventInput().equals(other.getFollowupEventInput())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -862,7 +861,7 @@ public com.google.cloud.dialogflow.v2.WebhookResponse buildPartial() { int to_bitField0_ = 0; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -877,7 +876,7 @@ public com.google.cloud.dialogflow.v2.WebhookResponse buildPartial() { result.payload_ = payloadBuilder_.build(); } if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -897,35 +896,35 @@ public com.google.cloud.dialogflow.v2.WebhookResponse 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 @@ -1142,7 +1141,7 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureFulfillmentMessagesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = new java.util.ArrayList( fulfillmentMessages_); @@ -1509,7 +1508,7 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Builder addFulfillmentMessa com.google.cloud.dialogflow.v2.Intent.Message.Builder, com.google.cloud.dialogflow.v2.Intent.MessageOrBuilder>( fulfillmentMessages_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); fulfillmentMessages_ = null; @@ -1611,7 +1610,7 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1979,7 +1978,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00000010; @@ -2339,7 +2338,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i com.google.cloud.dialogflow.v2.Context.Builder, com.google.cloud.dialogflow.v2.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -2347,7 +2346,7 @@ public com.google.cloud.dialogflow.v2.Context.Builder addOutputContextsBuilder(i return outputContextsBuilder_; } - private com.google.cloud.dialogflow.v2.EventInput followupEventInput_ = null; + private com.google.cloud.dialogflow.v2.EventInput followupEventInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2.EventInput, com.google.cloud.dialogflow.v2.EventInput.Builder, @@ -2540,7 +2539,7 @@ public com.google.cloud.dialogflow.v2.EventInputOrBuilder getFollowupEventInputO @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java index 32f19a4553f4..3bcc2e58ad82 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java @@ -30,9 +30,7 @@ private Agent() { timeZone_ = ""; description_ = ""; avatarUri_ = ""; - enableLogging_ = false; matchMode_ = 0; - classificationThreshold_ = 0F; } @java.lang.Override @@ -83,7 +81,7 @@ private Agent( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -130,7 +128,7 @@ private Agent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -142,7 +140,7 @@ private Agent( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -821,23 +819,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Agent other = (com.google.cloud.dialogflow.v2beta1.Agent) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDefaultLanguageCode().equals(other.getDefaultLanguageCode()); - result = - result && getSupportedLanguageCodesList().equals(other.getSupportedLanguageCodesList()); - result = result && getTimeZone().equals(other.getTimeZone()); - result = result && getDescription().equals(other.getDescription()); - result = result && getAvatarUri().equals(other.getAvatarUri()); - result = result && (getEnableLogging() == other.getEnableLogging()); - result = result && matchMode_ == other.matchMode_; - result = - result - && (java.lang.Float.floatToIntBits(getClassificationThreshold()) - == java.lang.Float.floatToIntBits(other.getClassificationThreshold())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDefaultLanguageCode().equals(other.getDefaultLanguageCode())) return false; + if (!getSupportedLanguageCodesList().equals(other.getSupportedLanguageCodesList())) + return false; + if (!getTimeZone().equals(other.getTimeZone())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getAvatarUri().equals(other.getAvatarUri())) return false; + if (getEnableLogging() != other.getEnableLogging()) return false; + if (matchMode_ != other.matchMode_) return false; + if (java.lang.Float.floatToIntBits(getClassificationThreshold()) + != java.lang.Float.floatToIntBits(other.getClassificationThreshold())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1066,7 +1061,7 @@ public com.google.cloud.dialogflow.v2beta1.Agent buildPartial() { result.parent_ = parent_; result.displayName_ = displayName_; result.defaultLanguageCode_ = defaultLanguageCode_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = supportedLanguageCodes_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1084,35 +1079,35 @@ public com.google.cloud.dialogflow.v2beta1.Agent 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 @@ -1507,7 +1502,7 @@ public Builder setDefaultLanguageCodeBytes(com.google.protobuf.ByteString value) com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSupportedLanguageCodesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { supportedLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(supportedLanguageCodes_); bitField0_ |= 0x00000008; @@ -2149,7 +2144,7 @@ public Builder clearClassificationThreshold() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java index 286205df632b..c21aa3407070 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java @@ -62,7 +62,7 @@ private BatchCreateEntitiesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(); @@ -83,7 +83,7 @@ private BatchCreateEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -95,7 +95,7 @@ private BatchCreateEntitiesRequest( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -337,12 +337,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest other = (com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -551,7 +550,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest buildParti int to_bitField0_ = 0; result.parent_ = parent_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -567,35 +566,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchCreateEntitiesRequest 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 @@ -783,7 +782,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList( entities_); @@ -1132,10 +1131,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities com.google.cloud.dialogflow.v2beta1.EntityType.Entity, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1257,7 +1253,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java index fbce365c9bbb..7db60cb8ee4d 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java @@ -63,7 +63,7 @@ private BatchDeleteEntitiesRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entityValues_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -79,7 +79,7 @@ private BatchDeleteEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -91,7 +91,7 @@ private BatchDeleteEntitiesRequest( } 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)) { entityValues_ = entityValues_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -332,12 +332,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest other = (com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntityValuesList().equals(other.getEntityValuesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntityValuesList().equals(other.getEntityValuesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -539,7 +538,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest buildParti int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entityValues_ = entityValues_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -552,35 +551,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntitiesRequest 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 @@ -751,7 +750,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEntityValuesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entityValues_ = new com.google.protobuf.LazyStringArrayList(entityValues_); bitField0_ |= 0x00000002; } @@ -1024,7 +1023,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java index 1fab66dff168..3c020f51dedc 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java @@ -62,7 +62,7 @@ private BatchDeleteEntityTypesRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private BatchDeleteEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private BatchDeleteEntityTypesRequest( } 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)) { entityTypeNames_ = entityTypeNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -263,11 +263,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest other = (com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntityTypeNamesList().equals(other.getEntityTypeNamesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getEntityTypeNamesList().equals(other.getEntityTypeNamesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -467,7 +466,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest buildPa int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = entityTypeNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -479,35 +478,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteEntityTypesRequest buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -675,7 +674,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEntityTypeNamesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entityTypeNames_ = new com.google.protobuf.LazyStringArrayList(entityTypeNames_); bitField0_ |= 0x00000002; } @@ -825,7 +824,7 @@ public Builder addEntityTypeNamesBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java index 7a4d060ae1f0..ab2aa4b5dfc6 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java @@ -61,7 +61,7 @@ private BatchDeleteIntentsRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -72,7 +72,7 @@ private BatchDeleteIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private BatchDeleteIntentsRequest( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest other = (com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,7 +481,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest buildPartia int to_bitField0_ = 0; result.parent_ = parent_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -497,35 +496,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchDeleteIntentsRequest 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 @@ -709,7 +708,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000002; } @@ -1066,10 +1065,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -1077,7 +1073,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java index f79f7fe39667..7a9f4df8cc0b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java @@ -62,7 +62,7 @@ private BatchUpdateEntitiesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(); @@ -98,7 +98,7 @@ private BatchUpdateEntitiesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -110,7 +110,7 @@ private BatchUpdateEntitiesRequest( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -397,16 +397,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest other = (com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -625,7 +624,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest buildParti int to_bitField0_ = 0; result.parent_ = parent_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -646,35 +645,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntitiesRequest 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 @@ -865,7 +864,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { entities_ = new java.util.ArrayList( entities_); @@ -1214,10 +1213,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities com.google.cloud.dialogflow.v2beta1.EntityType.Entity, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1337,7 +1333,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1518,7 +1514,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java index 6ef6396c1be5..71026ab03f79 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java @@ -110,7 +110,7 @@ private BatchUpdateEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -492,27 +492,25 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest other = (com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && getEntityTypeBatchCase().equals(other.getEntityTypeBatchCase()); - if (!result) return false; + if (!getEntityTypeBatchCase().equals(other.getEntityTypeBatchCase())) return false; switch (entityTypeBatchCase_) { case 2: - result = result && getEntityTypeBatchUri().equals(other.getEntityTypeBatchUri()); + if (!getEntityTypeBatchUri().equals(other.getEntityTypeBatchUri())) return false; break; case 3: - result = result && getEntityTypeBatchInline().equals(other.getEntityTypeBatchInline()); + if (!getEntityTypeBatchInline().equals(other.getEntityTypeBatchInline())) 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 @@ -755,35 +753,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesRequest buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1416,7 +1414,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1597,7 +1595,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java index ae671fa812b7..49ab9bce44cc 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java @@ -54,7 +54,7 @@ private BatchUpdateEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -66,7 +66,7 @@ private BatchUpdateEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -78,7 +78,7 @@ private BatchUpdateEntityTypesResponse( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -211,10 +211,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse other = (com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -416,7 +415,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse buildP new com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse(this); int from_bitField0_ = bitField0_; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -430,35 +429,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateEntityTypesResponse buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -541,7 +540,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -883,10 +882,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Builder addEntityTypesBuil com.google.cloud.dialogflow.v2beta1.EntityType, com.google.cloud.dialogflow.v2beta1.EntityType.Builder, com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -894,7 +890,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Builder addEntityTypesBuil @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java index d4e9b6b2034d..3a255ff9557f 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java @@ -116,7 +116,7 @@ private BatchUpdateIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -532,28 +532,26 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest other = (com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && intentView_ == other.intentView_; - result = result && getIntentBatchCase().equals(other.getIntentBatchCase()); - if (!result) return false; + if (intentView_ != other.intentView_) return false; + if (!getIntentBatchCase().equals(other.getIntentBatchCase())) return false; switch (intentBatchCase_) { case 2: - result = result && getIntentBatchUri().equals(other.getIntentBatchUri()); + if (!getIntentBatchUri().equals(other.getIntentBatchUri())) return false; break; case 3: - result = result && getIntentBatchInline().equals(other.getIntentBatchInline()); + if (!getIntentBatchInline().equals(other.getIntentBatchInline())) 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 @@ -799,35 +797,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsRequest 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 @@ -1453,7 +1451,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1710,7 +1708,7 @@ public Builder clearIntentView() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java index f4ed6402180a..b748cd6b165a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java @@ -53,7 +53,7 @@ private BatchUpdateIntentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private BatchUpdateIntentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private BatchUpdateIntentsResponse( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -208,10 +208,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse other = (com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -410,7 +409,7 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse buildParti new com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse(this); int from_bitField0_ = bitField0_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -424,35 +423,35 @@ public com.google.cloud.dialogflow.v2beta1.BatchUpdateIntentsResponse 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 @@ -533,7 +532,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -872,10 +871,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -883,7 +879,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java index 7e4095bd73d4..03ef5863d487 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java @@ -24,7 +24,6 @@ private Context(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Context() { name_ = ""; - lifespanCount_ = 0; } @java.lang.Override @@ -80,7 +79,7 @@ private Context( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -287,15 +286,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Context other = (com.google.cloud.dialogflow.v2beta1.Context) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (getLifespanCount() == other.getLifespanCount()); - result = result && (hasParameters() == other.hasParameters()); + if (!getName().equals(other.getName())) return false; + if (getLifespanCount() != other.getLifespanCount()) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -508,35 +506,35 @@ public com.google.cloud.dialogflow.v2beta1.Context 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 @@ -767,7 +765,7 @@ public Builder clearLifespanCount() { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -962,7 +960,7 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java index ceca3a8ac4f9..acf27658c065 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java @@ -76,7 +76,7 @@ private CreateContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -253,14 +253,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateContextRequest other = (com.google.cloud.dialogflow.v2beta1.CreateContextRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasContext() == other.hasContext()); + if (!getParent().equals(other.getParent())) return false; + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,35 +469,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateContextRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -670,7 +669,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Context context_ = null; + private com.google.cloud.dialogflow.v2beta1.Context context_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Context, com.google.cloud.dialogflow.v2beta1.Context.Builder, @@ -853,7 +852,7 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextOrBuilder( @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java index b2bc0606bb68..7281a029eef6 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateDocumentRequest.java @@ -76,7 +76,7 @@ private CreateDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,14 +245,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest other = (com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDocument() == other.hasDocument()); + if (!getParent().equals(other.getParent())) return false; + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +461,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateDocumentRequest 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 setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Document document_ = null; + private com.google.cloud.dialogflow.v2beta1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Document, com.google.cloud.dialogflow.v2beta1.Document.Builder, @@ -826,7 +825,7 @@ public com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder getDocumentOrBuilde @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java index 98d224be7176..b795e00d8128 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java @@ -84,7 +84,7 @@ private CreateEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -310,15 +310,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasEntityType() == other.hasEntityType()); + if (!getParent().equals(other.getParent())) return false; + if (hasEntityType() != other.hasEntityType()) return false; if (hasEntityType()) { - result = result && getEntityType().equals(other.getEntityType()); + if (!getEntityType().equals(other.getEntityType())) return false; } - 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 @@ -533,35 +532,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateEntityTypeRequest 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 @@ -717,7 +716,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.EntityType entityType_ = null; + private com.google.cloud.dialogflow.v2beta1.EntityType entityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.EntityType, com.google.cloud.dialogflow.v2beta1.EntityType.Builder, @@ -1015,7 +1014,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java index 7f89cd3bda11..51d6e027a570 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java @@ -92,7 +92,7 @@ private CreateIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -356,16 +356,15 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateIntentRequest other = (com.google.cloud.dialogflow.v2beta1.CreateIntentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasIntent() == other.hasIntent()); + if (!getParent().equals(other.getParent())) return false; + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -585,35 +584,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateIntentRequest 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 @@ -772,7 +771,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Intent intent_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, @@ -1145,7 +1144,7 @@ public Builder clearIntentView() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java index 505ac26b30fa..fe294bc62a5c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateKnowledgeBaseRequest.java @@ -77,7 +77,7 @@ private CreateKnowledgeBaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -246,14 +246,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest other = (com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasKnowledgeBase() == other.hasKnowledgeBase()); + if (!getParent().equals(other.getParent())) return false; + if (hasKnowledgeBase() != other.hasKnowledgeBase()) return false; if (hasKnowledgeBase()) { - result = result && getKnowledgeBase().equals(other.getKnowledgeBase()); + if (!getKnowledgeBase().equals(other.getKnowledgeBase())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -464,35 +463,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateKnowledgeBaseRequest 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 @@ -646,7 +645,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.KnowledgeBase knowledgeBase_ = null; + private com.google.cloud.dialogflow.v2beta1.KnowledgeBase knowledgeBase_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.KnowledgeBase, com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder, @@ -830,7 +829,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder getKnowledgeBa @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java index 5bbcf0265eb7..c7ffbb3e9744 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java @@ -78,7 +78,7 @@ private CreateSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,14 +256,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasSessionEntityType() == other.hasSessionEntityType()); + if (!getParent().equals(other.getParent())) return false; + if (hasSessionEntityType() != other.hasSessionEntityType()) return false; if (hasSessionEntityType()) { - result = result && getSessionEntityType().equals(other.getSessionEntityType()); + if (!getSessionEntityType().equals(other.getSessionEntityType())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,35 +476,35 @@ public com.google.cloud.dialogflow.v2beta1.CreateSessionEntityTypeRequest buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -681,7 +680,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.SessionEntityType sessionEntityType_ = null; + private com.google.cloud.dialogflow.v2beta1.SessionEntityType sessionEntityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.SessionEntityType, com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder, @@ -869,7 +868,7 @@ public Builder clearSessionEntityType() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java index 65aec03ba8c7..fa0f063db00c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java @@ -60,7 +60,7 @@ private DeleteAllContextsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -188,10 +188,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -387,35 +386,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteAllContextsRequest buildPartial @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -582,7 +581,7 @@ public Builder setParentBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java index 009cc7692dc3..82ed3ed032df 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java @@ -60,7 +60,7 @@ private DeleteContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -190,10 +190,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteContextRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteContextRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -388,35 +387,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteContextRequest 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 @@ -587,7 +586,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java index a8d4b1a65df2..0f836a59b36a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteDocumentRequest.java @@ -60,7 +60,7 @@ private DeleteDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -382,35 +381,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteDocumentRequest 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 @@ -566,7 +565,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java index f9221705b450..4597de078d45 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java @@ -60,7 +60,7 @@ private DeleteEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteEntityTypeRequest buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java index a89fef106140..7275687a88d4 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java @@ -60,7 +60,7 @@ private DeleteIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteIntentRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java index b0ae49bf6b40..bf8b835c7155 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteKnowledgeBaseRequest.java @@ -25,7 +25,6 @@ private DeleteKnowledgeBaseRequest(com.google.protobuf.GeneratedMessageV3.Builde private DeleteKnowledgeBaseRequest() { name_ = ""; - force_ = false; } @java.lang.Override @@ -66,7 +65,7 @@ private DeleteKnowledgeBaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -210,11 +209,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (getForce() == other.getForce()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (getForce() != other.getForce()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -415,35 +413,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteKnowledgeBaseRequest 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 @@ -646,7 +644,7 @@ public Builder clearForce() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java index c56c17a4a0db..0b3567174a63 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java @@ -61,7 +61,7 @@ private DeleteSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -191,10 +191,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -393,35 +392,35 @@ public com.google.cloud.dialogflow.v2beta1.DeleteSessionEntityTypeRequest buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -596,7 +595,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java index 32f96db70203..dd867c22d7c9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java @@ -115,7 +115,7 @@ private DetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -434,23 +434,22 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DetectIntentRequest other = (com.google.cloud.dialogflow.v2beta1.DetectIntentRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasQueryParams() == other.hasQueryParams()); + if (!getSession().equals(other.getSession())) return false; + if (hasQueryParams() != other.hasQueryParams()) return false; if (hasQueryParams()) { - result = result && getQueryParams().equals(other.getQueryParams()); + if (!getQueryParams().equals(other.getQueryParams())) return false; } - result = result && (hasQueryInput() == other.hasQueryInput()); + if (hasQueryInput() != other.hasQueryInput()) return false; if (hasQueryInput()) { - result = result && getQueryInput().equals(other.getQueryInput()); + if (!getQueryInput().equals(other.getQueryInput())) return false; } - result = result && (hasOutputAudioConfig() == other.hasOutputAudioConfig()); + if (hasOutputAudioConfig() != other.hasOutputAudioConfig()) return false; if (hasOutputAudioConfig()) { - result = result && getOutputAudioConfig().equals(other.getOutputAudioConfig()); + if (!getOutputAudioConfig().equals(other.getOutputAudioConfig())) return false; } - result = result && getInputAudio().equals(other.getInputAudio()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInputAudio().equals(other.getInputAudio())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -694,35 +693,35 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentRequest 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 @@ -918,7 +917,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.QueryParameters queryParams_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryParameters queryParams_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryParameters, com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder, @@ -1100,7 +1099,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara return queryParamsBuilder_; } - private com.google.cloud.dialogflow.v2beta1.QueryInput queryInput_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryInput queryInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryInput, com.google.cloud.dialogflow.v2beta1.QueryInput.Builder, @@ -1318,7 +1317,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBu return queryInputBuilder_; } - private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_ = null; + private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.OutputAudioConfig, com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder, @@ -1577,7 +1576,7 @@ public Builder clearInputAudio() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java index da7e9734b231..96b0a716a1fa 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java @@ -96,7 +96,7 @@ private DetectIntentResponse( } case 42: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { alternativeQueryResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -125,7 +125,7 @@ private DetectIntentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -137,7 +137,7 @@ private DetectIntentResponse( } 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)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); } this.unknownFields = unknownFields.build(); @@ -538,25 +538,24 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.DetectIntentResponse other = (com.google.cloud.dialogflow.v2beta1.DetectIntentResponse) obj; - boolean result = true; - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasQueryResult() == other.hasQueryResult()); + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = - result && getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList()); - result = result && (hasWebhookStatus() == other.hasWebhookStatus()); + if (!getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList())) + return false; + if (hasWebhookStatus() != other.hasWebhookStatus()) return false; if (hasWebhookStatus()) { - result = result && getWebhookStatus().equals(other.getWebhookStatus()); + if (!getWebhookStatus().equals(other.getWebhookStatus())) return false; } - result = result && getOutputAudio().equals(other.getOutputAudio()); - result = result && (hasOutputAudioConfig() == other.hasOutputAudioConfig()); + if (!getOutputAudio().equals(other.getOutputAudio())) return false; + if (hasOutputAudioConfig() != other.hasOutputAudioConfig()) return false; if (hasOutputAudioConfig()) { - result = result && getOutputAudioConfig().equals(other.getOutputAudioConfig()); + if (!getOutputAudioConfig().equals(other.getOutputAudioConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -798,7 +797,7 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentResponse buildPartial() { result.queryResult_ = queryResultBuilder_.build(); } if (alternativeQueryResultsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); bitField0_ = (bitField0_ & ~0x00000004); @@ -825,35 +824,35 @@ public com.google.cloud.dialogflow.v2beta1.DetectIntentResponse 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 @@ -1043,7 +1042,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryResult, com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, @@ -1238,7 +1237,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr alternativeQueryResults_ = java.util.Collections.emptyList(); private void ensureAlternativeQueryResultsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { alternativeQueryResults_ = new java.util.ArrayList( alternativeQueryResults_); @@ -1733,7 +1732,7 @@ public Builder removeAlternativeQueryResults(int index) { com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>( alternativeQueryResults_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); alternativeQueryResults_ = null; @@ -1741,7 +1740,7 @@ public Builder removeAlternativeQueryResults(int index) { return alternativeQueryResultsBuilder_; } - private com.google.rpc.Status webhookStatus_ = null; + private com.google.rpc.Status webhookStatus_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> webhookStatusBuilder_; @@ -1968,7 +1967,7 @@ public Builder clearOutputAudio() { return this; } - private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_ = null; + private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.OutputAudioConfig, com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder, @@ -2174,7 +2173,7 @@ public Builder clearOutputAudioConfig() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java index ee7810486655..0534c3b77ef2 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Document.java @@ -77,7 +77,7 @@ private Document( case 32: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { knowledgeTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -90,7 +90,7 @@ private Document( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { knowledgeTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -115,7 +115,7 @@ private Document( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -127,7 +127,7 @@ private Document( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_); } this.unknownFields = unknownFields.build(); @@ -781,25 +781,23 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Document other = (com.google.cloud.dialogflow.v2beta1.Document) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getMimeType().equals(other.getMimeType()); - result = result && knowledgeTypes_.equals(other.knowledgeTypes_); - result = result && getSourceCase().equals(other.getSourceCase()); - if (!result) return false; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getMimeType().equals(other.getMimeType())) return false; + if (!knowledgeTypes_.equals(other.knowledgeTypes_)) return false; + if (!getSourceCase().equals(other.getSourceCase())) return false; switch (sourceCase_) { case 5: - result = result && getContentUri().equals(other.getContentUri()); + if (!getContentUri().equals(other.getContentUri())) return false; break; case 6: - result = result && getContent().equals(other.getContent()); + if (!getContent().equals(other.getContent())) 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 @@ -1018,7 +1016,7 @@ public com.google.cloud.dialogflow.v2beta1.Document buildPartial() { result.name_ = name_; result.displayName_ = displayName_; result.mimeType_ = mimeType_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { knowledgeTypes_ = java.util.Collections.unmodifiableList(knowledgeTypes_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1037,35 +1035,35 @@ public com.google.cloud.dialogflow.v2beta1.Document 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 @@ -1472,7 +1470,7 @@ public Builder setMimeTypeBytes(com.google.protobuf.ByteString value) { private java.util.List knowledgeTypes_ = java.util.Collections.emptyList(); private void ensureKnowledgeTypesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { knowledgeTypes_ = new java.util.ArrayList(knowledgeTypes_); bitField0_ |= 0x00000008; } @@ -1919,7 +1917,7 @@ public Builder setContentBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java index 4be09b648744..c9cfaa58dfc2 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java @@ -86,7 +86,7 @@ private EntityType( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { entities_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(); @@ -100,7 +100,7 @@ private EntityType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -112,7 +112,7 @@ private EntityType( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -555,7 +555,7 @@ private Entity( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -564,7 +564,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -576,7 +576,7 @@ private Entity( } 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)) { synonyms_ = synonyms_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -764,11 +764,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.EntityType.Entity other = (com.google.cloud.dialogflow.v2beta1.EntityType.Entity) obj; - boolean result = true; - result = result && getValue().equals(other.getValue()); - result = result && getSynonymsList().equals(other.getSynonymsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValue().equals(other.getValue())) return false; + if (!getSynonymsList().equals(other.getSynonymsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -966,7 +965,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.value_ = value_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -978,23 +977,23 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1002,13 +1001,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1193,7 +1192,7 @@ public Builder setValueBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSynonymsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_); bitField0_ |= 0x00000002; } @@ -1344,7 +1343,7 @@ public Builder addSynonymsBytes(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 @@ -1695,14 +1694,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.EntityType other = (com.google.cloud.dialogflow.v2beta1.EntityType) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && kind_ == other.kind_; - result = result && autoExpansionMode_ == other.autoExpansionMode_; - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (kind_ != other.kind_) return false; + if (autoExpansionMode_ != other.autoExpansionMode_) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1921,7 +1919,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType buildPartial() { result.kind_ = kind_; result.autoExpansionMode_ = autoExpansionMode_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1936,35 +1934,35 @@ public com.google.cloud.dialogflow.v2beta1.EntityType 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 @@ -2426,7 +2424,7 @@ public Builder clearAutoExpansionMode() { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { entities_ = new java.util.ArrayList( entities_); @@ -2775,10 +2773,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities com.google.cloud.dialogflow.v2beta1.EntityType.Entity, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -2786,7 +2781,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java index 3c34df0c58f4..46ec0f08f049 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java @@ -52,7 +52,7 @@ private EntityTypeBatch( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -64,7 +64,7 @@ private EntityTypeBatch( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private EntityTypeBatch( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -209,10 +209,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.EntityTypeBatch other = (com.google.cloud.dialogflow.v2beta1.EntityTypeBatch) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -408,7 +407,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch buildPartial() { new com.google.cloud.dialogflow.v2beta1.EntityTypeBatch(this); int from_bitField0_ = bitField0_; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -422,35 +421,35 @@ public com.google.cloud.dialogflow.v2beta1.EntityTypeBatch 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 @@ -529,7 +528,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -871,10 +870,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Builder addEntityTypesBuil com.google.cloud.dialogflow.v2beta1.EntityType, com.google.cloud.dialogflow.v2beta1.EntityType.Builder, com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -882,7 +878,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Builder addEntityTypesBuil @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java index e748d5fab370..a665f66d7445 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java @@ -86,7 +86,7 @@ private EventInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,15 +306,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.EventInput other = (com.google.cloud.dialogflow.v2beta1.EventInput) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasParameters() == other.hasParameters()); + if (!getName().equals(other.getName())) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - 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 @@ -531,35 +530,35 @@ public com.google.cloud.dialogflow.v2beta1.EventInput 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 @@ -708,7 +707,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -994,7 +993,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java index 078ab67221a7..9d0c29772884 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java @@ -68,7 +68,7 @@ private ExportAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,11 +247,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ExportAgentRequest other = (com.google.cloud.dialogflow.v2beta1.ExportAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentUri().equals(other.getAgentUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentUri().equals(other.getAgentUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -451,35 +450,35 @@ public com.google.cloud.dialogflow.v2beta1.ExportAgentRequest 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 @@ -748,7 +747,7 @@ public Builder setAgentUriBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java index 5e2055ea7868..657b81832610 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java @@ -64,7 +64,7 @@ private ExportAgentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,21 +272,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ExportAgentResponse other = (com.google.cloud.dialogflow.v2beta1.ExportAgentResponse) obj; - boolean result = true; - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 1: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 2: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -497,35 +495,35 @@ public com.google.cloud.dialogflow.v2beta1.ExportAgentResponse 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 @@ -802,7 +800,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java index 9daa4503b378..036a3b0ed113 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java @@ -60,7 +60,7 @@ private GetAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetAgentRequest other = (com.google.cloud.dialogflow.v2beta1.GetAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.dialogflow.v2beta1.GetAgentRequest 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 @@ -558,7 +557,7 @@ public Builder setParentBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java index a88c8196f316..262dbf0172ab 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java @@ -60,7 +60,7 @@ private GetContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -190,10 +190,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetContextRequest other = (com.google.cloud.dialogflow.v2beta1.GetContextRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -388,35 +387,35 @@ public com.google.cloud.dialogflow.v2beta1.GetContextRequest 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 @@ -587,7 +586,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java index ce96f60a03b1..a20af390a631 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetDocumentRequest.java @@ -60,7 +60,7 @@ private GetDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetDocumentRequest other = (com.google.cloud.dialogflow.v2beta1.GetDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -382,35 +381,35 @@ public com.google.cloud.dialogflow.v2beta1.GetDocumentRequest 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 @@ -566,7 +565,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java index ec841f268616..b65d5e19520b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java @@ -68,7 +68,7 @@ private GetEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,11 +247,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -451,35 +450,35 @@ public com.google.cloud.dialogflow.v2beta1.GetEntityTypeRequest 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 @@ -748,7 +747,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java index 5be9260ca562..87c85b58c693 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java @@ -76,7 +76,7 @@ private GetIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -293,12 +293,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetIntentRequest other = (com.google.cloud.dialogflow.v2beta1.GetIntentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -502,35 +501,35 @@ public com.google.cloud.dialogflow.v2beta1.GetIntentRequest 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 @@ -878,7 +877,7 @@ public Builder clearIntentView() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java index 983c9ab7019c..2e5c8426e72e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetKnowledgeBaseRequest.java @@ -59,7 +59,7 @@ private GetKnowledgeBaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest other = (com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -378,35 +377,35 @@ public com.google.cloud.dialogflow.v2beta1.GetKnowledgeBaseRequest 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 @@ -557,7 +556,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java index 6d4757268b6c..778758608d4f 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java @@ -60,7 +60,7 @@ private GetSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -190,10 +190,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +388,35 @@ public com.google.cloud.dialogflow.v2beta1.GetSessionEntityTypeRequest buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -591,7 +590,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java index 12fb38e24186..d1312d031be9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java @@ -73,7 +73,7 @@ private ImportAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -332,22 +332,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ImportAgentRequest other = (com.google.cloud.dialogflow.v2beta1.ImportAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 2: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 3: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -563,35 +561,35 @@ public com.google.cloud.dialogflow.v2beta1.ImportAgentRequest 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 @@ -971,7 +969,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java index 843dc0031740..56b1c8f2e9c3 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java @@ -24,7 +24,6 @@ private InputAudioConfig(com.google.protobuf.GeneratedMessageV3.Builder build private InputAudioConfig() { audioEncoding_ = 0; - sampleRateHertz_ = 0; languageCode_ = ""; phraseHints_ = com.google.protobuf.LazyStringArrayList.EMPTY; model_ = ""; @@ -76,7 +75,7 @@ private InputAudioConfig( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { phraseHints_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -92,7 +91,7 @@ private InputAudioConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -104,7 +103,7 @@ private InputAudioConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { phraseHints_ = phraseHints_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -440,14 +439,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.InputAudioConfig other = (com.google.cloud.dialogflow.v2beta1.InputAudioConfig) obj; - boolean result = true; - result = result && audioEncoding_ == other.audioEncoding_; - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getPhraseHintsList().equals(other.getPhraseHintsList()); - result = result && getModel().equals(other.getModel()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (audioEncoding_ != other.audioEncoding_) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getPhraseHintsList().equals(other.getPhraseHintsList())) return false; + if (!getModel().equals(other.getModel())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -656,7 +654,7 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfig buildPartial() { result.audioEncoding_ = audioEncoding_; result.sampleRateHertz_ = sampleRateHertz_; result.languageCode_ = languageCode_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { phraseHints_ = phraseHints_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -669,35 +667,35 @@ public com.google.cloud.dialogflow.v2beta1.InputAudioConfig 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 @@ -1021,7 +1019,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePhraseHintsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { phraseHints_ = new com.google.protobuf.LazyStringArrayList(phraseHints_); bitField0_ |= 0x00000008; } @@ -1351,7 +1349,7 @@ public Builder setModelBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java index 17946d457406..2c53e0f4d2ec 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java @@ -28,17 +28,11 @@ private Intent() { name_ = ""; displayName_ = ""; webhookState_ = 0; - priority_ = 0; - isFallback_ = false; - mlEnabled_ = false; - mlDisabled_ = false; - endInteraction_ = false; inputContextNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; events_ = com.google.protobuf.LazyStringArrayList.EMPTY; trainingPhrases_ = java.util.Collections.emptyList(); action_ = ""; outputContexts_ = java.util.Collections.emptyList(); - resetContexts_ = false; parameters_ = java.util.Collections.emptyList(); messages_ = java.util.Collections.emptyList(); defaultResponsePlatforms_ = java.util.Collections.emptyList(); @@ -110,7 +104,7 @@ private Intent( case 58: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + if (!((mutable_bitField0_ & 0x00000100) != 0)) { inputContextNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000100; } @@ -120,7 +114,7 @@ private Intent( case 66: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (!((mutable_bitField0_ & 0x00000200) != 0)) { events_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000200; } @@ -129,7 +123,7 @@ private Intent( } case 74: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { trainingPhrases_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase>(); @@ -150,7 +144,7 @@ private Intent( } case 90: { - if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (!((mutable_bitField0_ & 0x00001000) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00001000; @@ -167,7 +161,7 @@ private Intent( } case 106: { - if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (!((mutable_bitField0_ & 0x00004000) != 0)) { parameters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00004000; @@ -180,7 +174,7 @@ private Intent( } case 114: { - if (!((mutable_bitField0_ & 0x00008000) == 0x00008000)) { + if (!((mutable_bitField0_ & 0x00008000) != 0)) { messages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00008000; @@ -194,7 +188,7 @@ private Intent( case 120: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00010000) == 0x00010000)) { + if (!((mutable_bitField0_ & 0x00010000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00010000; } @@ -207,7 +201,7 @@ private Intent( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00010000) == 0x00010000)) { + if (!((mutable_bitField0_ & 0x00010000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00010000; } @@ -232,7 +226,7 @@ private Intent( } case 146: { - if (!((mutable_bitField0_ & 0x00080000) == 0x00080000)) { + if (!((mutable_bitField0_ & 0x00080000) != 0)) { followupIntentInfo_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo>(); @@ -256,7 +250,7 @@ private Intent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -268,29 +262,29 @@ private Intent( } 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)) { inputContextNames_ = inputContextNames_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (((mutable_bitField0_ & 0x00000200) != 0)) { events_ = events_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (((mutable_bitField0_ & 0x00000400) != 0)) { trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_); } - if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { + if (((mutable_bitField0_ & 0x00001000) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } - if (((mutable_bitField0_ & 0x00004000) == 0x00004000)) { + if (((mutable_bitField0_ & 0x00004000) != 0)) { parameters_ = java.util.Collections.unmodifiableList(parameters_); } - if (((mutable_bitField0_ & 0x00008000) == 0x00008000)) { + if (((mutable_bitField0_ & 0x00008000) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); } - if (((mutable_bitField0_ & 0x00010000) == 0x00010000)) { + if (((mutable_bitField0_ & 0x00010000) != 0)) { defaultResponsePlatforms_ = java.util.Collections.unmodifiableList(defaultResponsePlatforms_); } - if (((mutable_bitField0_ & 0x00080000) == 0x00080000)) { + if (((mutable_bitField0_ & 0x00080000) != 0)) { followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_); } this.unknownFields = unknownFields.build(); @@ -607,7 +601,6 @@ private TrainingPhrase() { name_ = ""; type_ = 0; parts_ = java.util.Collections.emptyList(); - timesAddedCount_ = 0; } @java.lang.Override @@ -650,7 +643,7 @@ private TrainingPhrase( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { parts_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part>(); @@ -669,7 +662,7 @@ private TrainingPhrase( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -681,7 +674,7 @@ private TrainingPhrase( } 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)) { parts_ = java.util.Collections.unmodifiableList(parts_); } this.unknownFields = unknownFields.build(); @@ -968,7 +961,6 @@ private Part() { text_ = ""; entityType_ = ""; alias_ = ""; - userDefined_ = false; } @java.lang.Override @@ -1023,7 +1015,7 @@ private Part( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1274,13 +1266,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part other = (com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getEntityType().equals(other.getEntityType()); - result = result && getAlias().equals(other.getAlias()); - result = result && (getUserDefined() == other.getUserDefined()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getEntityType().equals(other.getEntityType())) return false; + if (!getAlias().equals(other.getAlias())) return false; + if (getUserDefined() != other.getUserDefined()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1496,23 +1487,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part 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 @@ -1520,13 +1511,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1948,7 +1939,7 @@ public Builder clearUserDefined() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2237,13 +2228,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase other = (com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && type_ == other.type_; - result = result && getPartsList().equals(other.getPartsList()); - result = result && (getTimesAddedCount() == other.getTimesAddedCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (type_ != other.type_) return false; + if (!getPartsList().equals(other.getPartsList())) return false; + if (getTimesAddedCount() != other.getTimesAddedCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2457,7 +2447,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase buildPartial() result.name_ = name_; result.type_ = type_; if (partsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { parts_ = java.util.Collections.unmodifiableList(parts_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2473,23 +2463,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase 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 @@ -2497,13 +2487,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2764,7 +2754,7 @@ public Builder clearType() { parts_ = java.util.Collections.emptyList(); private void ensurePartsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { parts_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part>(parts_); @@ -3178,10 +3168,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part.Builder ad com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part, com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Part.Builder, com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.PartOrBuilder>( - parts_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + parts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); parts_ = null; } return partsBuilder_; @@ -3240,7 +3227,7 @@ public Builder clearTimesAddedCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3513,9 +3500,7 @@ private Parameter() { value_ = ""; defaultValue_ = ""; entityTypeDisplayName_ = ""; - mandatory_ = false; prompts_ = com.google.protobuf.LazyStringArrayList.EMPTY; - isList_ = false; } @java.lang.Override @@ -3585,7 +3570,7 @@ private Parameter( case 58: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { prompts_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -3599,7 +3584,7 @@ private Parameter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -3611,7 +3596,7 @@ private Parameter( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { prompts_ = prompts_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -4049,17 +4034,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Parameter other = (com.google.cloud.dialogflow.v2beta1.Intent.Parameter) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getValue().equals(other.getValue()); - result = result && getDefaultValue().equals(other.getDefaultValue()); - result = result && getEntityTypeDisplayName().equals(other.getEntityTypeDisplayName()); - result = result && (getMandatory() == other.getMandatory()); - result = result && getPromptsList().equals(other.getPromptsList()); - result = result && (getIsList() == other.getIsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getValue().equals(other.getValue())) return false; + if (!getDefaultValue().equals(other.getDefaultValue())) return false; + if (!getEntityTypeDisplayName().equals(other.getEntityTypeDisplayName())) return false; + if (getMandatory() != other.getMandatory()) return false; + if (!getPromptsList().equals(other.getPromptsList())) return false; + if (getIsList() != other.getIsList()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -4286,7 +4270,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter buildPartial() { result.defaultValue_ = defaultValue_; result.entityTypeDisplayName_ = entityTypeDisplayName_; result.mandatory_ = mandatory_; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { prompts_ = prompts_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000040); } @@ -4299,23 +4283,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter 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 @@ -4323,13 +4307,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -4987,7 +4971,7 @@ public Builder clearMandatory() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensurePromptsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { prompts_ = new com.google.protobuf.LazyStringArrayList(prompts_); bitField0_ |= 0x00000040; } @@ -5182,7 +5166,7 @@ public Builder clearIsList() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6095,7 +6079,7 @@ private Message( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6644,7 +6628,7 @@ private Text( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { text_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -6653,7 +6637,7 @@ private Text( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6666,7 +6650,7 @@ private Text( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { text_ = text_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -6790,10 +6774,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Text other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Text) obj; - boolean result = true; - result = result && getTextList().equals(other.getTextList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTextList().equals(other.getTextList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -6985,7 +6968,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Text buildPartial() { com.google.cloud.dialogflow.v2beta1.Intent.Message.Text result = new com.google.cloud.dialogflow.v2beta1.Intent.Message.Text(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { text_ = text_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -6996,23 +6979,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Text 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 @@ -7020,13 +7003,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -7088,7 +7071,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureTextIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { text_ = new com.google.protobuf.LazyStringArrayList(text_); bitField0_ |= 0x00000001; } @@ -7230,7 +7213,7 @@ public Builder addTextBytes(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 @@ -7392,7 +7375,7 @@ private Image( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7564,11 +7547,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Image other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Image) obj; - boolean result = true; - result = result && getImageUri().equals(other.getImageUri()); - result = result && getAccessibilityText().equals(other.getAccessibilityText()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getImageUri().equals(other.getImageUri())) return false; + if (!getAccessibilityText().equals(other.getAccessibilityText())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -7770,23 +7752,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -7794,13 +7776,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -8051,7 +8033,7 @@ public Builder setAccessibilityTextBytes(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 @@ -8226,7 +8208,7 @@ private QuickReplies( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { quickReplies_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -8235,7 +8217,7 @@ private QuickReplies( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8248,7 +8230,7 @@ private QuickReplies( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { quickReplies_ = quickReplies_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -8422,11 +8404,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getQuickRepliesList().equals(other.getQuickRepliesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getQuickRepliesList().equals(other.getQuickRepliesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8629,7 +8610,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies buildPart int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.title_ = title_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { quickReplies_ = quickReplies_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -8641,23 +8622,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.QuickReplies buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -8665,13 +8646,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -8835,7 +8816,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureQuickRepliesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { quickReplies_ = new com.google.protobuf.LazyStringArrayList(quickReplies_); bitField0_ |= 0x00000002; } @@ -8977,7 +8958,7 @@ public Builder addQuickRepliesBytes(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 @@ -9230,7 +9211,7 @@ private Card( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button>(); @@ -9244,7 +9225,7 @@ private Card( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -9257,7 +9238,7 @@ private Card( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); } this.unknownFields = unknownFields.build(); @@ -9393,7 +9374,7 @@ private Button( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -9566,11 +9547,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getPostback().equals(other.getPostback()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getPostback().equals(other.getPostback())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9777,23 +9757,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button 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 @@ -9801,13 +9781,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -10061,7 +10041,7 @@ public Builder setPostbackBytes(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 @@ -10379,13 +10359,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Card other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Card) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getSubtitle().equals(other.getSubtitle()); - result = result && getImageUri().equals(other.getImageUri()); - result = result && getButtonsList().equals(other.getButtonsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getSubtitle().equals(other.getSubtitle())) return false; + if (!getImageUri().equals(other.getImageUri())) return false; + if (!getButtonsList().equals(other.getButtonsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -10600,7 +10579,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card buildPartial() { result.subtitle_ = subtitle_; result.imageUri_ = imageUri_; if (buttonsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -10615,23 +10594,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Card 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 @@ -10639,13 +10618,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -11018,7 +10997,7 @@ public Builder setImageUriBytes(com.google.protobuf.ByteString value) { buttons_ = java.util.Collections.emptyList(); private void ensureButtonsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button>(buttons_); @@ -11401,10 +11380,7 @@ public Builder removeButtons(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button, com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.Button.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.Card.ButtonOrBuilder>( - buttons_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + buttons_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); buttons_ = null; } return buttonsBuilder_; @@ -11413,7 +11389,7 @@ public Builder removeButtons(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -11608,7 +11584,7 @@ private SimpleResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -11833,12 +11809,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse) obj; - boolean result = true; - result = result && getTextToSpeech().equals(other.getTextToSpeech()); - result = result && getSsml().equals(other.getSsml()); - result = result && getDisplayText().equals(other.getDisplayText()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTextToSpeech().equals(other.getTextToSpeech())) return false; + if (!getSsml().equals(other.getSsml())) return false; + if (!getDisplayText().equals(other.getDisplayText())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -12049,23 +12024,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -12073,13 +12048,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -12441,7 +12416,7 @@ public Builder setDisplayTextBytes(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 @@ -12616,7 +12591,7 @@ private SimpleResponses( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { simpleResponses_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse>(); @@ -12631,7 +12606,7 @@ private SimpleResponses( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -12644,7 +12619,7 @@ private SimpleResponses( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_); } this.unknownFields = unknownFields.build(); @@ -12792,10 +12767,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses) obj; - boolean result = true; - result = result && getSimpleResponsesList().equals(other.getSimpleResponsesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSimpleResponsesList().equals(other.getSimpleResponsesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -13003,7 +12977,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses buildP new com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses(this); int from_bitField0_ = bitField0_; if (simpleResponsesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { simpleResponses_ = java.util.Collections.unmodifiableList(simpleResponses_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -13017,23 +12991,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponses buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -13041,13 +13015,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -13130,7 +13104,7 @@ public Builder mergeFrom( simpleResponses_ = java.util.Collections.emptyList(); private void ensureSimpleResponsesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { simpleResponses_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse>( @@ -13534,7 +13508,7 @@ public Builder removeSimpleResponses(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponse.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.SimpleResponseOrBuilder>( simpleResponses_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); simpleResponses_ = null; @@ -13545,7 +13519,7 @@ public Builder removeSimpleResponses(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -13853,7 +13827,7 @@ private BasicCard( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>(); @@ -13868,7 +13842,7 @@ private BasicCard( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13881,7 +13855,7 @@ private BasicCard( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); } this.unknownFields = unknownFields.build(); @@ -14045,7 +14019,7 @@ private Button( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -14162,7 +14136,7 @@ private OpenUriAction( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -14292,10 +14266,9 @@ public boolean equals(final java.lang.Object obj) { .OpenUriAction) obj; - boolean result = true; - result = result && getUri().equals(other.getUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUri().equals(other.getUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -14526,23 +14499,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -14550,13 +14523,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -14715,7 +14688,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 @@ -14919,14 +14892,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && (hasOpenUriAction() == other.hasOpenUriAction()); + if (!getTitle().equals(other.getTitle())) return false; + if (hasOpenUriAction() != other.hasOpenUriAction()) return false; if (hasOpenUriAction()) { - result = result && getOpenUriAction().equals(other.getOpenUriAction()); + if (!getOpenUriAction().equals(other.getOpenUriAction())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -15146,23 +15118,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button build @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -15170,13 +15142,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -15330,7 +15302,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { } private com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction - openUriAction_ = null; + openUriAction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction, com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.OpenUriAction @@ -15554,7 +15526,7 @@ public Builder clearOpenUriAction() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -15927,17 +15899,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getSubtitle().equals(other.getSubtitle()); - result = result && getFormattedText().equals(other.getFormattedText()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getSubtitle().equals(other.getSubtitle())) return false; + if (!getFormattedText().equals(other.getFormattedText())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && getButtonsList().equals(other.getButtonsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getButtonsList().equals(other.getButtonsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -16168,7 +16139,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard buildPartial result.image_ = imageBuilder_.build(); } if (buttonsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { buttons_ = java.util.Collections.unmodifiableList(buttons_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -16183,23 +16154,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard 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 @@ -16207,13 +16178,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -16588,7 +16559,7 @@ public Builder setFormattedTextBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.Image, com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder, @@ -16775,7 +16746,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder getImage buttons_ = java.util.Collections.emptyList(); private void ensureButtonsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { buttons_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button>(buttons_); @@ -17177,10 +17148,7 @@ public Builder removeButtons(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button, com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.Button.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.BasicCard.ButtonOrBuilder>( - buttons_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + buttons_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); buttons_ = null; } return buttonsBuilder_; @@ -17189,7 +17157,7 @@ public Builder removeButtons(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -17324,7 +17292,7 @@ private Suggestion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -17445,10 +17413,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -17649,23 +17616,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion 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 @@ -17673,13 +17640,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -17829,7 +17796,7 @@ public Builder setTitleBytes(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 @@ -17995,7 +17962,7 @@ private Suggestions( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { suggestions_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion>(); @@ -18009,7 +17976,7 @@ private Suggestions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -18022,7 +17989,7 @@ private Suggestions( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { suggestions_ = java.util.Collections.unmodifiableList(suggestions_); } this.unknownFields = unknownFields.build(); @@ -18164,10 +18131,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions) obj; - boolean result = true; - result = result && getSuggestionsList().equals(other.getSuggestionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSuggestionsList().equals(other.getSuggestionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -18371,7 +18337,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions buildParti new com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions(this); int from_bitField0_ = bitField0_; if (suggestionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { suggestions_ = java.util.Collections.unmodifiableList(suggestions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -18385,23 +18351,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestions 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 @@ -18409,13 +18375,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -18498,7 +18464,7 @@ public Builder mergeFrom( suggestions_ = java.util.Collections.emptyList(); private void ensureSuggestionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { suggestions_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion>(suggestions_); @@ -18896,7 +18862,7 @@ public Builder removeSuggestions(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.Suggestion.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.SuggestionOrBuilder>( suggestions_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); suggestions_ = null; @@ -18907,7 +18873,7 @@ public Builder removeSuggestions(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -19073,7 +19039,7 @@ private LinkOutSuggestion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -19246,11 +19212,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion) obj; - boolean result = true; - result = result && getDestinationName().equals(other.getDestinationName()); - result = result && getUri().equals(other.getUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDestinationName().equals(other.getDestinationName())) return false; + if (!getUri().equals(other.getUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -19459,23 +19424,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.LinkOutSuggestion buil @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -19483,13 +19448,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -19744,7 +19709,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 @@ -19940,7 +19905,7 @@ private ListSelect( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item>(); @@ -19955,7 +19920,7 @@ private ListSelect( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -19968,7 +19933,7 @@ private ListSelect( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); } this.unknownFields = unknownFields.build(); @@ -20202,7 +20167,7 @@ private Item( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -20471,19 +20436,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item) obj; - boolean result = true; - result = result && (hasInfo() == other.hasInfo()); + if (hasInfo() != other.hasInfo()) return false; if (hasInfo()) { - result = result && getInfo().equals(other.getInfo()); + if (!getInfo().equals(other.getInfo())) return false; } - result = result && getTitle().equals(other.getTitle()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -20722,23 +20686,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -20746,13 +20710,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -20817,7 +20781,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo, com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.Builder, @@ -21195,7 +21159,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.Image, com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder, @@ -21383,7 +21347,7 @@ public Builder clearImage() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -21605,11 +21569,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect) obj; - boolean result = true; - result = result && getTitle().equals(other.getTitle()); - result = result && getItemsList().equals(other.getItemsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTitle().equals(other.getTitle())) return false; + if (!getItemsList().equals(other.getItemsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -21818,7 +21781,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect buildPartia int to_bitField0_ = 0; result.title_ = title_; if (itemsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -21833,23 +21796,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect 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 @@ -21857,13 +21820,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -22043,7 +22006,7 @@ public Builder setTitleBytes(com.google.protobuf.ByteString value) { items_ = java.util.Collections.emptyList(); private void ensureItemsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item>(items_); @@ -22427,10 +22390,7 @@ public Builder removeItems(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item, com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.Item.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.ListSelect.ItemOrBuilder>( - items_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + items_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); items_ = null; } return itemsBuilder_; @@ -22439,7 +22399,7 @@ public Builder removeItems(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -22611,7 +22571,7 @@ private CarouselSelect( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect @@ -22627,7 +22587,7 @@ private CarouselSelect( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -22640,7 +22600,7 @@ private CarouselSelect( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); } this.unknownFields = unknownFields.build(); @@ -22874,7 +22834,7 @@ private Item( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -23144,19 +23104,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item) obj; - boolean result = true; - result = result && (hasInfo() == other.hasInfo()); + if (hasInfo() != other.hasInfo()) return false; if (hasInfo()) { - result = result && getInfo().equals(other.getInfo()); + if (!getInfo().equals(other.getInfo())) return false; } - result = result && getTitle().equals(other.getTitle()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasImage() == other.hasImage()); + if (!getTitle().equals(other.getTitle())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (hasImage() != other.hasImage()) return false; if (hasImage()) { - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -23403,23 +23362,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item bu @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -23427,13 +23386,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -23499,7 +23458,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo info_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo, com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo.Builder, @@ -23877,7 +23836,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent.Message.Image image_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent.Message.Image, com.google.cloud.dialogflow.v2beta1.Intent.Message.Image.Builder, @@ -24065,7 +24024,7 @@ public Builder clearImage() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -24243,10 +24202,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect) obj; - boolean result = true; - result = result && getItemsList().equals(other.getItemsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getItemsList().equals(other.getItemsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -24450,7 +24408,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect buildPa new com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect(this); int from_bitField0_ = bitField0_; if (itemsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { items_ = java.util.Collections.unmodifiableList(items_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -24464,23 +24422,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -24488,13 +24446,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -24578,7 +24536,7 @@ public Builder mergeFrom( items_ = java.util.Collections.emptyList(); private void ensureItemsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { items_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item>(items_); @@ -24985,10 +24943,7 @@ public Builder removeItems(int index) { com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect.Item.Builder, com.google.cloud.dialogflow.v2beta1.Intent.Message.CarouselSelect .ItemOrBuilder>( - items_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + items_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); items_ = null; } return itemsBuilder_; @@ -24997,7 +24952,7 @@ public Builder removeItems(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -25181,7 +25136,7 @@ private SelectItemInfo( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -25190,7 +25145,7 @@ private SelectItemInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -25203,7 +25158,7 @@ private SelectItemInfo( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -25383,11 +25338,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && getSynonymsList().equals(other.getSynonymsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (!getSynonymsList().equals(other.getSynonymsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -25591,7 +25545,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo buildPa int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.key_ = key_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { synonyms_ = synonyms_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -25603,23 +25557,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.SelectItemInfo buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -25627,13 +25581,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -25802,7 +25756,7 @@ public Builder setKeyBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSynonymsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { synonyms_ = new com.google.protobuf.LazyStringArrayList(synonyms_); bitField0_ |= 0x00000002; } @@ -25953,7 +25907,7 @@ public Builder addSynonymsBytes(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 @@ -26107,7 +26061,7 @@ private TelephonyPlayAudio( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -26250,10 +26204,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio) obj; - boolean result = true; - result = result && getAudioUri().equals(other.getAudioUri()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAudioUri().equals(other.getAudioUri())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -26457,23 +26410,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyPlayAudio bui @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -26481,13 +26434,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -26690,7 +26643,7 @@ public Builder setAudioUriBytes(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 @@ -26862,7 +26815,7 @@ private TelephonySynthesizeSpeech( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -27095,21 +27048,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonySynthesizeSpeech) obj; - boolean result = true; - result = result && getSourceCase().equals(other.getSourceCase()); - if (!result) return false; + if (!getSourceCase().equals(other.getSourceCase())) return false; switch (sourceCase_) { case 1: - result = result && 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 @@ -27343,23 +27294,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -27367,13 +27318,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -27679,7 +27630,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 @@ -27819,7 +27770,7 @@ private TelephonyTransferCall( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -27946,10 +27897,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall other = (com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall) obj; - boolean result = true; - result = result && getPhoneNumber().equals(other.getPhoneNumber()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPhoneNumber().equals(other.getPhoneNumber())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -28159,23 +28109,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.TelephonyTransferCall @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 @@ -28183,13 +28133,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -28352,7 +28302,7 @@ public Builder setPhoneNumberBytes(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 @@ -29371,59 +29321,57 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.Message other = (com.google.cloud.dialogflow.v2beta1.Intent.Message) obj; - boolean result = true; - result = result && platform_ == other.platform_; - result = result && getMessageCase().equals(other.getMessageCase()); - if (!result) return false; + if (platform_ != other.platform_) return false; + if (!getMessageCase().equals(other.getMessageCase())) return false; switch (messageCase_) { case 1: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 2: - result = result && getImage().equals(other.getImage()); + if (!getImage().equals(other.getImage())) return false; break; case 3: - result = result && getQuickReplies().equals(other.getQuickReplies()); + if (!getQuickReplies().equals(other.getQuickReplies())) return false; break; case 4: - result = result && getCard().equals(other.getCard()); + if (!getCard().equals(other.getCard())) return false; break; case 5: - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; break; case 7: - result = result && getSimpleResponses().equals(other.getSimpleResponses()); + if (!getSimpleResponses().equals(other.getSimpleResponses())) return false; break; case 8: - result = result && getBasicCard().equals(other.getBasicCard()); + if (!getBasicCard().equals(other.getBasicCard())) return false; break; case 9: - result = result && getSuggestions().equals(other.getSuggestions()); + if (!getSuggestions().equals(other.getSuggestions())) return false; break; case 10: - result = result && getLinkOutSuggestion().equals(other.getLinkOutSuggestion()); + if (!getLinkOutSuggestion().equals(other.getLinkOutSuggestion())) return false; break; case 11: - result = result && getListSelect().equals(other.getListSelect()); + if (!getListSelect().equals(other.getListSelect())) return false; break; case 12: - result = result && getCarouselSelect().equals(other.getCarouselSelect()); + if (!getCarouselSelect().equals(other.getCarouselSelect())) return false; break; case 13: - result = result && getTelephonyPlayAudio().equals(other.getTelephonyPlayAudio()); + if (!getTelephonyPlayAudio().equals(other.getTelephonyPlayAudio())) return false; break; case 14: - result = - result && getTelephonySynthesizeSpeech().equals(other.getTelephonySynthesizeSpeech()); + if (!getTelephonySynthesizeSpeech().equals(other.getTelephonySynthesizeSpeech())) + return false; break; case 15: - result = result && getTelephonyTransferCall().equals(other.getTelephonyTransferCall()); + if (!getTelephonyTransferCall().equals(other.getTelephonyTransferCall())) 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 @@ -29779,23 +29727,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message 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 @@ -29803,13 +29751,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -33104,7 +33052,7 @@ public Builder clearPlatform() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -33268,7 +33216,7 @@ private FollowupIntentInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -33442,11 +33390,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo other = (com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo) obj; - boolean result = true; - result = result && getFollowupIntentName().equals(other.getFollowupIntentName()); - result = result && getParentFollowupIntentName().equals(other.getParentFollowupIntentName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFollowupIntentName().equals(other.getFollowupIntentName())) return false; + if (!getParentFollowupIntentName().equals(other.getParentFollowupIntentName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -33648,23 +33595,23 @@ public com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo 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 @@ -33672,13 +33619,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -33936,7 +33883,7 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -35152,29 +35099,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Intent other = (com.google.cloud.dialogflow.v2beta1.Intent) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && webhookState_ == other.webhookState_; - result = result && (getPriority() == other.getPriority()); - result = result && (getIsFallback() == other.getIsFallback()); - result = result && (getMlEnabled() == other.getMlEnabled()); - result = result && (getMlDisabled() == other.getMlDisabled()); - result = result && (getEndInteraction() == other.getEndInteraction()); - result = result && getInputContextNamesList().equals(other.getInputContextNamesList()); - result = result && getEventsList().equals(other.getEventsList()); - result = result && getTrainingPhrasesList().equals(other.getTrainingPhrasesList()); - result = result && getAction().equals(other.getAction()); - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (getResetContexts() == other.getResetContexts()); - result = result && getParametersList().equals(other.getParametersList()); - result = result && getMessagesList().equals(other.getMessagesList()); - result = result && defaultResponsePlatforms_.equals(other.defaultResponsePlatforms_); - result = result && getRootFollowupIntentName().equals(other.getRootFollowupIntentName()); - result = result && getParentFollowupIntentName().equals(other.getParentFollowupIntentName()); - result = result && getFollowupIntentInfoList().equals(other.getFollowupIntentInfoList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (webhookState_ != other.webhookState_) return false; + if (getPriority() != other.getPriority()) return false; + if (getIsFallback() != other.getIsFallback()) return false; + if (getMlEnabled() != other.getMlEnabled()) return false; + if (getMlDisabled() != other.getMlDisabled()) return false; + if (getEndInteraction() != other.getEndInteraction()) return false; + if (!getInputContextNamesList().equals(other.getInputContextNamesList())) return false; + if (!getEventsList().equals(other.getEventsList())) return false; + if (!getTrainingPhrasesList().equals(other.getTrainingPhrasesList())) return false; + if (!getAction().equals(other.getAction())) return false; + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (getResetContexts() != other.getResetContexts()) return false; + if (!getParametersList().equals(other.getParametersList())) return false; + if (!getMessagesList().equals(other.getMessagesList())) return false; + if (!defaultResponsePlatforms_.equals(other.defaultResponsePlatforms_)) return false; + if (!getRootFollowupIntentName().equals(other.getRootFollowupIntentName())) return false; + if (!getParentFollowupIntentName().equals(other.getParentFollowupIntentName())) return false; + if (!getFollowupIntentInfoList().equals(other.getFollowupIntentInfoList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -35490,18 +35436,18 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { result.mlEnabled_ = mlEnabled_; result.mlDisabled_ = mlDisabled_; result.endInteraction_ = endInteraction_; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000100) != 0)) { inputContextNames_ = inputContextNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000100); } result.inputContextNames_ = inputContextNames_; - if (((bitField0_ & 0x00000200) == 0x00000200)) { + if (((bitField0_ & 0x00000200) != 0)) { events_ = events_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000200); } result.events_ = events_; if (trainingPhrasesBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000400) != 0)) { trainingPhrases_ = java.util.Collections.unmodifiableList(trainingPhrases_); bitField0_ = (bitField0_ & ~0x00000400); } @@ -35511,7 +35457,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { } result.action_ = action_; if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00001000) == 0x00001000)) { + if (((bitField0_ & 0x00001000) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00001000); } @@ -35521,7 +35467,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { } result.resetContexts_ = resetContexts_; if (parametersBuilder_ == null) { - if (((bitField0_ & 0x00004000) == 0x00004000)) { + if (((bitField0_ & 0x00004000) != 0)) { parameters_ = java.util.Collections.unmodifiableList(parameters_); bitField0_ = (bitField0_ & ~0x00004000); } @@ -35530,7 +35476,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { result.parameters_ = parametersBuilder_.build(); } if (messagesBuilder_ == null) { - if (((bitField0_ & 0x00008000) == 0x00008000)) { + if (((bitField0_ & 0x00008000) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); bitField0_ = (bitField0_ & ~0x00008000); } @@ -35538,7 +35484,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { } else { result.messages_ = messagesBuilder_.build(); } - if (((bitField0_ & 0x00010000) == 0x00010000)) { + if (((bitField0_ & 0x00010000) != 0)) { defaultResponsePlatforms_ = java.util.Collections.unmodifiableList(defaultResponsePlatforms_); bitField0_ = (bitField0_ & ~0x00010000); @@ -35547,7 +35493,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent buildPartial() { result.rootFollowupIntentName_ = rootFollowupIntentName_; result.parentFollowupIntentName_ = parentFollowupIntentName_; if (followupIntentInfoBuilder_ == null) { - if (((bitField0_ & 0x00080000) == 0x00080000)) { + if (((bitField0_ & 0x00080000) != 0)) { followupIntentInfo_ = java.util.Collections.unmodifiableList(followupIntentInfo_); bitField0_ = (bitField0_ & ~0x00080000); } @@ -35562,35 +35508,35 @@ public com.google.cloud.dialogflow.v2beta1.Intent 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 @@ -36398,7 +36344,7 @@ public Builder clearEndInteraction() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInputContextNamesIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { + if (!((bitField0_ & 0x00000100) != 0)) { inputContextNames_ = new com.google.protobuf.LazyStringArrayList(inputContextNames_); bitField0_ |= 0x00000100; } @@ -36559,7 +36505,7 @@ public Builder addInputContextNamesBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEventsIsMutable() { - if (!((bitField0_ & 0x00000200) == 0x00000200)) { + if (!((bitField0_ & 0x00000200) != 0)) { events_ = new com.google.protobuf.LazyStringArrayList(events_); bitField0_ |= 0x00000200; } @@ -36720,7 +36666,7 @@ public Builder addEventsBytes(com.google.protobuf.ByteString value) { trainingPhrases_ = java.util.Collections.emptyList(); private void ensureTrainingPhrasesIsMutable() { - if (!((bitField0_ & 0x00000400) == 0x00000400)) { + if (!((bitField0_ & 0x00000400) != 0)) { trainingPhrases_ = new java.util.ArrayList( trainingPhrases_); @@ -37114,7 +37060,7 @@ public Builder removeTrainingPhrases(int index) { com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhrase.Builder, com.google.cloud.dialogflow.v2beta1.Intent.TrainingPhraseOrBuilder>( trainingPhrases_, - ((bitField0_ & 0x00000400) == 0x00000400), + ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); trainingPhrases_ = null; @@ -37225,7 +37171,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00001000) == 0x00001000)) { + if (!((bitField0_ & 0x00001000) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00001000; @@ -37640,7 +37586,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil com.google.cloud.dialogflow.v2beta1.Context.Builder, com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00001000) == 0x00001000), + ((bitField0_ & 0x00001000) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -37699,7 +37645,7 @@ public Builder clearResetContexts() { java.util.Collections.emptyList(); private void ensureParametersIsMutable() { - if (!((bitField0_ & 0x00004000) == 0x00004000)) { + if (!((bitField0_ & 0x00004000) != 0)) { parameters_ = new java.util.ArrayList( parameters_); @@ -38048,10 +37994,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder addParameter com.google.cloud.dialogflow.v2beta1.Intent.Parameter, com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder, com.google.cloud.dialogflow.v2beta1.Intent.ParameterOrBuilder>( - parameters_, - ((bitField0_ & 0x00004000) == 0x00004000), - getParentForChildren(), - isClean()); + parameters_, ((bitField0_ & 0x00004000) != 0), getParentForChildren(), isClean()); parameters_ = null; } return parametersBuilder_; @@ -38061,7 +38004,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Parameter.Builder addParameter java.util.Collections.emptyList(); private void ensureMessagesIsMutable() { - if (!((bitField0_ & 0x00008000) == 0x00008000)) { + if (!((bitField0_ & 0x00008000) != 0)) { messages_ = new java.util.ArrayList(messages_); bitField0_ |= 0x00008000; @@ -38426,10 +38369,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addMessagesBui com.google.cloud.dialogflow.v2beta1.Intent.Message, com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder, com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>( - messages_, - ((bitField0_ & 0x00008000) == 0x00008000), - getParentForChildren(), - isClean()); + messages_, ((bitField0_ & 0x00008000) != 0), getParentForChildren(), isClean()); messages_ = null; } return messagesBuilder_; @@ -38439,7 +38379,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addMessagesBui java.util.Collections.emptyList(); private void ensureDefaultResponsePlatformsIsMutable() { - if (!((bitField0_ & 0x00010000) == 0x00010000)) { + if (!((bitField0_ & 0x00010000) != 0)) { defaultResponsePlatforms_ = new java.util.ArrayList(defaultResponsePlatforms_); bitField0_ |= 0x00010000; @@ -38883,7 +38823,7 @@ public Builder setParentFollowupIntentNameBytes(com.google.protobuf.ByteString v followupIntentInfo_ = java.util.Collections.emptyList(); private void ensureFollowupIntentInfoIsMutable() { - if (!((bitField0_ & 0x00080000) == 0x00080000)) { + if (!((bitField0_ & 0x00080000) != 0)) { followupIntentInfo_ = new java.util.ArrayList( followupIntentInfo_); @@ -39296,7 +39236,7 @@ public Builder removeFollowupIntentInfo(int index) { com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfo.Builder, com.google.cloud.dialogflow.v2beta1.Intent.FollowupIntentInfoOrBuilder>( followupIntentInfo_, - ((bitField0_ & 0x00080000) == 0x00080000), + ((bitField0_ & 0x00080000) != 0), getParentForChildren(), isClean()); followupIntentInfo_ = null; @@ -39306,7 +39246,7 @@ public Builder removeFollowupIntentInfo(int index) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java index 1cb99c6a0e0c..46f4f7f918d0 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java @@ -52,7 +52,7 @@ private IntentBatch( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private IntentBatch( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private IntentBatch( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -207,10 +207,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.IntentBatch other = (com.google.cloud.dialogflow.v2beta1.IntentBatch) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,7 +405,7 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatch buildPartial() { new com.google.cloud.dialogflow.v2beta1.IntentBatch(this); int from_bitField0_ = bitField0_; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -420,35 +419,35 @@ public com.google.cloud.dialogflow.v2beta1.IntentBatch 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 @@ -526,7 +525,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -865,10 +864,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -876,7 +872,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java index d44ec60874b1..d29a9e4bb054 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeAnswers.java @@ -52,7 +52,7 @@ private KnowledgeAnswers( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { answers_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer>(); @@ -66,7 +66,7 @@ private KnowledgeAnswers( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -78,7 +78,7 @@ private KnowledgeAnswers( } 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)) { answers_ = java.util.Collections.unmodifiableList(answers_); } this.unknownFields = unknownFields.build(); @@ -256,7 +256,6 @@ private Answer() { faqQuestion_ = ""; answer_ = ""; matchConfidenceLevel_ = 0; - matchConfidence_ = 0F; } @java.lang.Override @@ -318,7 +317,7 @@ private Answer( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -808,17 +807,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer other = (com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer) obj; - boolean result = true; - result = result && getSource().equals(other.getSource()); - result = result && getFaqQuestion().equals(other.getFaqQuestion()); - result = result && getAnswer().equals(other.getAnswer()); - result = result && matchConfidenceLevel_ == other.matchConfidenceLevel_; - result = - result - && (java.lang.Float.floatToIntBits(getMatchConfidence()) - == java.lang.Float.floatToIntBits(other.getMatchConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSource().equals(other.getSource())) return false; + if (!getFaqQuestion().equals(other.getFaqQuestion())) return false; + if (!getAnswer().equals(other.getAnswer())) return false; + if (matchConfidenceLevel_ != other.matchConfidenceLevel_) return false; + if (java.lang.Float.floatToIntBits(getMatchConfidence()) + != java.lang.Float.floatToIntBits(other.getMatchConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1035,23 +1031,23 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer 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 @@ -1059,13 +1055,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1620,7 +1616,7 @@ public Builder clearMatchConfidence() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1782,10 +1778,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers other = (com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers) obj; - boolean result = true; - result = result && getAnswersList().equals(other.getAnswersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAnswersList().equals(other.getAnswersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1981,7 +1976,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers buildPartial() { new com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers(this); int from_bitField0_ = bitField0_; if (answersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { answers_ = java.util.Collections.unmodifiableList(answers_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1995,35 +1990,35 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers 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 @@ -2102,7 +2097,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAnswersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { answers_ = new java.util.ArrayList( answers_); @@ -2457,10 +2452,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.Builder addAn com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer, com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.Builder, com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.AnswerOrBuilder>( - answers_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + answers_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); answers_ = null; } return answersBuilder_; @@ -2468,7 +2460,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Answer.Builder addAn @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java index 4d8402f529d3..9cb18209a4a6 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBase.java @@ -67,7 +67,7 @@ private KnowledgeBase( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,11 +242,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.KnowledgeBase other = (com.google.cloud.dialogflow.v2beta1.KnowledgeBase) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBase 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 @@ -731,7 +730,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java index bcde44f64374..7faeacef534e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeOperationMetadata.java @@ -59,7 +59,7 @@ private KnowledgeOperationMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -341,10 +341,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata other = (com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata) obj; - boolean result = true; - result = result && state_ == other.state_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (state_ != other.state_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -539,35 +538,35 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeOperationMetadata 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 @@ -699,7 +698,7 @@ public Builder clearState() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java index 58a21d7dc8cf..569a90f57adb 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java @@ -25,7 +25,6 @@ private ListContextsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ListContextsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListContextsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -275,12 +274,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListContextsRequest other = (com.google.cloud.dialogflow.v2beta1.ListContextsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -485,35 +483,35 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsRequest 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 @@ -832,7 +830,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java index 985f814fc993..7814101ad831 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java @@ -54,7 +54,7 @@ private ListContextsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { contexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListContextsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListContextsResponse( } 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)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListContextsResponse other = (com.google.cloud.dialogflow.v2beta1.ListContextsResponse) obj; - boolean result = true; - result = result && getContextsList().equals(other.getContextsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getContextsList().equals(other.getContextsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,7 +479,7 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (contextsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -496,35 +495,35 @@ public com.google.cloud.dialogflow.v2beta1.ListContextsResponse 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 @@ -607,7 +606,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureContextsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { contexts_ = new java.util.ArrayList(contexts_); bitField0_ |= 0x00000001; } @@ -965,10 +964,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addContextsBuilder(in com.google.cloud.dialogflow.v2beta1.Context, com.google.cloud.dialogflow.v2beta1.Context.Builder, com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>( - contexts_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + contexts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); contexts_ = null; } return contextsBuilder_; @@ -1075,7 +1071,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java index e0bfe1edd56a..0654d5782058 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsRequest.java @@ -25,7 +25,6 @@ private ListDocumentsRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListDocumentsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest other = (com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,35 +475,35 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -804,7 +802,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java index ef313379f8d6..21d97508711b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListDocumentsResponse.java @@ -54,7 +54,7 @@ private ListDocumentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListDocumentsResponse( } 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)) { documents_ = java.util.Collections.unmodifiableList(documents_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse other = (com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse) obj; - boolean result = true; - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,7 +475,7 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (documentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { documents_ = java.util.Collections.unmodifiableList(documents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -492,35 +491,35 @@ public com.google.cloud.dialogflow.v2beta1.ListDocumentsResponse 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 @@ -603,7 +602,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(documents_); bitField0_ |= 0x00000001; @@ -944,10 +943,7 @@ public com.google.cloud.dialogflow.v2beta1.Document.Builder addDocumentsBuilder( com.google.cloud.dialogflow.v2beta1.Document, com.google.cloud.dialogflow.v2beta1.Document.Builder, com.google.cloud.dialogflow.v2beta1.DocumentOrBuilder>( - documents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + documents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); documents_ = null; } return documentsBuilder_; @@ -1054,7 +1050,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java index 7e77786b71cc..602fa97eab63 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java @@ -26,7 +26,6 @@ private ListEntityTypesRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListEntityTypesRequest() { parent_ = ""; languageCode_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -332,13 +331,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest other = (com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -548,35 +546,35 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesRequest 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 @@ -993,7 +991,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java index 80446b7fef43..df91df8b720f 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java @@ -54,7 +54,7 @@ private ListEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListEntityTypesResponse( } 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)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); } this.unknownFields = unknownFields.build(); @@ -275,11 +275,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse other = (com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse) obj; - boolean result = true; - result = result && getEntityTypesList().equals(other.getEntityTypesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntityTypesList().equals(other.getEntityTypesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,7 +481,7 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse buildPartial( int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (entityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entityTypes_ = java.util.Collections.unmodifiableList(entityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -498,35 +497,35 @@ public com.google.cloud.dialogflow.v2beta1.ListEntityTypesResponse 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 @@ -609,7 +608,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entityTypes_ = new java.util.ArrayList(entityTypes_); bitField0_ |= 0x00000001; @@ -969,10 +968,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Builder addEntityTypesBuil com.google.cloud.dialogflow.v2beta1.EntityType, com.google.cloud.dialogflow.v2beta1.EntityType.Builder, com.google.cloud.dialogflow.v2beta1.EntityTypeOrBuilder>( - entityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entityTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entityTypes_ = null; } return entityTypesBuilder_; @@ -1079,7 +1075,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java index 0bb057ca616f..52cc2691048c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java @@ -27,7 +27,6 @@ private ListIntentsRequest() { parent_ = ""; languageCode_ = ""; intentView_ = 0; - pageSize_ = 0; pageToken_ = ""; } @@ -90,7 +89,7 @@ private ListIntentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -378,14 +377,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListIntentsRequest other = (com.google.cloud.dialogflow.v2beta1.ListIntentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && intentView_ == other.intentView_; - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (intentView_ != other.intentView_) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -600,35 +598,35 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsRequest 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 @@ -1124,7 +1122,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java index 2efff7bc1621..75b39f77482c 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java @@ -54,7 +54,7 @@ private ListIntentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListIntentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListIntentsResponse( } 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)) { intents_ = java.util.Collections.unmodifiableList(intents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListIntentsResponse other = (com.google.cloud.dialogflow.v2beta1.ListIntentsResponse) obj; - boolean result = true; - result = result && getIntentsList().equals(other.getIntentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIntentsList().equals(other.getIntentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,7 +479,7 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (intentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { intents_ = java.util.Collections.unmodifiableList(intents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -496,35 +495,35 @@ public com.google.cloud.dialogflow.v2beta1.ListIntentsResponse 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 @@ -607,7 +606,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIntentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { intents_ = new java.util.ArrayList(intents_); bitField0_ |= 0x00000001; } @@ -964,10 +963,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>( - intents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + intents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); intents_ = null; } return intentsBuilder_; @@ -1074,7 +1070,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java index acc2c2e4a059..dd422ebbff88 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesRequest.java @@ -25,7 +25,6 @@ private ListKnowledgeBasesRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListKnowledgeBasesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListKnowledgeBasesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest other = (com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +476,35 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesRequest 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 @@ -807,7 +805,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java index 50e82d348ae1..8899aaf980f5 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListKnowledgeBasesResponse.java @@ -54,7 +54,7 @@ private ListKnowledgeBasesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { knowledgeBases_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -74,7 +74,7 @@ private ListKnowledgeBasesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private ListKnowledgeBasesResponse( } 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)) { knowledgeBases_ = java.util.Collections.unmodifiableList(knowledgeBases_); } this.unknownFields = unknownFields.build(); @@ -271,11 +271,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse other = (com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse) obj; - boolean result = true; - result = result && getKnowledgeBasesList().equals(other.getKnowledgeBasesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKnowledgeBasesList().equals(other.getKnowledgeBasesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,7 +478,7 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse buildParti int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (knowledgeBasesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { knowledgeBases_ = java.util.Collections.unmodifiableList(knowledgeBases_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -495,35 +494,35 @@ public com.google.cloud.dialogflow.v2beta1.ListKnowledgeBasesResponse 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 @@ -608,7 +607,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureKnowledgeBasesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { knowledgeBases_ = new java.util.ArrayList( knowledgeBases_); @@ -958,7 +957,7 @@ public com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder addKnowledgeBas com.google.cloud.dialogflow.v2beta1.KnowledgeBase.Builder, com.google.cloud.dialogflow.v2beta1.KnowledgeBaseOrBuilder>( knowledgeBases_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); knowledgeBases_ = null; @@ -1067,7 +1066,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java index ff9631fab52b..996473f0e5c5 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java @@ -25,7 +25,6 @@ private ListSessionEntityTypesRequest(com.google.protobuf.GeneratedMessageV3.Bui private ListSessionEntityTypesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListSessionEntityTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -275,12 +274,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest other = (com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -488,35 +486,35 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesRequest buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -838,7 +836,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java index e2f7d62698a6..3a3f548d71db 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java @@ -55,7 +55,7 @@ private ListSessionEntityTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.SessionEntityType>(); @@ -76,7 +76,7 @@ private ListSessionEntityTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private ListSessionEntityTypesResponse( } 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)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); } this.unknownFields = unknownFields.build(); @@ -285,11 +285,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse other = (com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse) obj; - boolean result = true; - result = result && getSessionEntityTypesList().equals(other.getSessionEntityTypesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSessionEntityTypesList().equals(other.getSessionEntityTypesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -496,7 +495,7 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse buildP int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (sessionEntityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -512,35 +511,35 @@ public com.google.cloud.dialogflow.v2beta1.ListSessionEntityTypesResponse buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -627,7 +626,7 @@ public Builder mergeFrom( sessionEntityTypes_ = java.util.Collections.emptyList(); private void ensureSessionEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { sessionEntityTypes_ = new java.util.ArrayList( sessionEntityTypes_); @@ -1016,7 +1015,7 @@ public Builder removeSessionEntityTypes(int index) { com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder, com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder>( sessionEntityTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); sessionEntityTypes_ = null; @@ -1125,7 +1124,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java index dd58e9c3f454..479249c35e2f 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java @@ -82,7 +82,7 @@ private OriginalDetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -339,15 +339,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest other = (com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest) obj; - boolean result = true; - result = result && getSource().equals(other.getSource()); - result = result && getVersion().equals(other.getVersion()); - result = result && (hasPayload() == other.hasPayload()); + if (!getSource().equals(other.getSource())) return false; + if (!getVersion().equals(other.getVersion())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -563,35 +562,35 @@ public com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -849,7 +848,7 @@ public Builder setVersionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1143,7 +1142,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java index 8a4320ab4960..a2d8592d5d94 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java @@ -24,7 +24,6 @@ private OutputAudioConfig(com.google.protobuf.GeneratedMessageV3.Builder buil private OutputAudioConfig() { audioEncoding_ = 0; - sampleRateHertz_ = 0; } @java.lang.Override @@ -82,7 +81,7 @@ private OutputAudioConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,15 +271,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.OutputAudioConfig other = (com.google.cloud.dialogflow.v2beta1.OutputAudioConfig) obj; - boolean result = true; - result = result && audioEncoding_ == other.audioEncoding_; - result = result && (getSampleRateHertz() == other.getSampleRateHertz()); - result = result && (hasSynthesizeSpeechConfig() == other.hasSynthesizeSpeechConfig()); + if (audioEncoding_ != other.audioEncoding_) return false; + if (getSampleRateHertz() != other.getSampleRateHertz()) return false; + if (hasSynthesizeSpeechConfig() != other.hasSynthesizeSpeechConfig()) return false; if (hasSynthesizeSpeechConfig()) { - result = result && getSynthesizeSpeechConfig().equals(other.getSynthesizeSpeechConfig()); + if (!getSynthesizeSpeechConfig().equals(other.getSynthesizeSpeechConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -494,35 +492,35 @@ public com.google.cloud.dialogflow.v2beta1.OutputAudioConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -711,8 +709,7 @@ public Builder clearSampleRateHertz() { return this; } - private com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig synthesizeSpeechConfig_ = - null; + private com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig synthesizeSpeechConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig, com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig.Builder, @@ -910,7 +907,7 @@ public Builder clearSynthesizeSpeechConfig() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java index 2f14bd650cdd..251890c88f96 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java @@ -104,7 +104,7 @@ private QueryInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -374,24 +374,22 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.QueryInput other = (com.google.cloud.dialogflow.v2beta1.QueryInput) obj; - boolean result = true; - result = result && getInputCase().equals(other.getInputCase()); - if (!result) return false; + if (!getInputCase().equals(other.getInputCase())) return false; switch (inputCase_) { case 1: - result = result && getAudioConfig().equals(other.getAudioConfig()); + if (!getAudioConfig().equals(other.getAudioConfig())) return false; break; case 2: - result = result && getText().equals(other.getText()); + if (!getText().equals(other.getText())) return false; break; case 3: - result = result && getEvent().equals(other.getEvent()); + if (!getEvent().equals(other.getEvent())) 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 @@ -623,35 +621,35 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput 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 @@ -1338,7 +1336,7 @@ public com.google.cloud.dialogflow.v2beta1.EventInputOrBuilder getEventOrBuilder @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java index cc89f6483cf6..e423b789e752 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java @@ -25,7 +25,6 @@ private QueryParameters(com.google.protobuf.GeneratedMessageV3.Builder builde private QueryParameters() { timeZone_ = ""; contexts_ = java.util.Collections.emptyList(); - resetContexts_ = false; sessionEntityTypes_ = java.util.Collections.emptyList(); knowledgeBaseNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -77,7 +76,7 @@ private QueryParameters( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { contexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -93,7 +92,7 @@ private QueryParameters( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.SessionEntityType>(); @@ -140,7 +139,7 @@ private QueryParameters( case 98: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { knowledgeBaseNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -149,7 +148,7 @@ private QueryParameters( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -161,13 +160,13 @@ private QueryParameters( } 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)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { knowledgeBaseNames_ = knowledgeBaseNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -712,31 +711,27 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.QueryParameters other = (com.google.cloud.dialogflow.v2beta1.QueryParameters) obj; - boolean result = true; - result = result && getTimeZone().equals(other.getTimeZone()); - result = result && (hasGeoLocation() == other.hasGeoLocation()); + if (!getTimeZone().equals(other.getTimeZone())) return false; + if (hasGeoLocation() != other.hasGeoLocation()) return false; if (hasGeoLocation()) { - result = result && getGeoLocation().equals(other.getGeoLocation()); + if (!getGeoLocation().equals(other.getGeoLocation())) return false; } - result = result && getContextsList().equals(other.getContextsList()); - result = result && (getResetContexts() == other.getResetContexts()); - result = result && getSessionEntityTypesList().equals(other.getSessionEntityTypesList()); - result = result && (hasPayload() == other.hasPayload()); + if (!getContextsList().equals(other.getContextsList())) return false; + if (getResetContexts() != other.getResetContexts()) return false; + if (!getSessionEntityTypesList().equals(other.getSessionEntityTypesList())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && getKnowledgeBaseNamesList().equals(other.getKnowledgeBaseNamesList()); - result = - result - && (hasSentimentAnalysisRequestConfig() == other.hasSentimentAnalysisRequestConfig()); + if (!getKnowledgeBaseNamesList().equals(other.getKnowledgeBaseNamesList())) return false; + if (hasSentimentAnalysisRequestConfig() != other.hasSentimentAnalysisRequestConfig()) + return false; if (hasSentimentAnalysisRequestConfig()) { - result = - result - && getSentimentAnalysisRequestConfig() - .equals(other.getSentimentAnalysisRequestConfig()); + if (!getSentimentAnalysisRequestConfig().equals(other.getSentimentAnalysisRequestConfig())) + return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -994,7 +989,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters buildPartial() { result.geoLocation_ = geoLocationBuilder_.build(); } if (contextsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { contexts_ = java.util.Collections.unmodifiableList(contexts_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1004,7 +999,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters buildPartial() { } result.resetContexts_ = resetContexts_; if (sessionEntityTypesBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = java.util.Collections.unmodifiableList(sessionEntityTypes_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1017,7 +1012,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters buildPartial() { } else { result.payload_ = payloadBuilder_.build(); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { knowledgeBaseNames_ = knowledgeBaseNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000040); } @@ -1034,35 +1029,35 @@ public com.google.cloud.dialogflow.v2beta1.QueryParameters 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 @@ -1299,7 +1294,7 @@ public Builder setTimeZoneBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.type.LatLng geoLocation_ = null; + private com.google.type.LatLng geoLocation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoLocationBuilder_; @@ -1474,7 +1469,7 @@ public com.google.type.LatLngOrBuilder getGeoLocationOrBuilder() { java.util.Collections.emptyList(); private void ensureContextsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { contexts_ = new java.util.ArrayList(contexts_); bitField0_ |= 0x00000004; } @@ -1832,10 +1827,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addContextsBuilder(in com.google.cloud.dialogflow.v2beta1.Context, com.google.cloud.dialogflow.v2beta1.Context.Builder, com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>( - contexts_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + contexts_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); contexts_ = null; } return contextsBuilder_; @@ -1892,7 +1884,7 @@ public Builder clearResetContexts() { sessionEntityTypes_ = java.util.Collections.emptyList(); private void ensureSessionEntityTypesIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { sessionEntityTypes_ = new java.util.ArrayList( sessionEntityTypes_); @@ -2299,7 +2291,7 @@ public Builder removeSessionEntityTypes(int index) { com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder, com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder>( sessionEntityTypes_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); sessionEntityTypes_ = null; @@ -2307,7 +2299,7 @@ public Builder removeSessionEntityTypes(int index) { return sessionEntityTypesBuilder_; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2495,7 +2487,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureKnowledgeBaseNamesIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { knowledgeBaseNames_ = new com.google.protobuf.LazyStringArrayList(knowledgeBaseNames_); bitField0_ |= 0x00000040; } @@ -2680,7 +2672,7 @@ public Builder addKnowledgeBaseNamesBytes(com.google.protobuf.ByteString value) } private com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig - sentimentAnalysisRequestConfig_ = null; + sentimentAnalysisRequestConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig, com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig.Builder, @@ -2919,7 +2911,7 @@ public Builder clearSentimentAnalysisRequestConfig() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java index d17c4fda6fc6..bde6e0189ab1 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java @@ -25,14 +25,11 @@ private QueryResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { private QueryResult() { queryText_ = ""; languageCode_ = ""; - speechRecognitionConfidence_ = 0F; action_ = ""; - allRequiredParamsPresent_ = false; fulfillmentText_ = ""; fulfillmentMessages_ = java.util.Collections.emptyList(); webhookSource_ = ""; outputContexts_ = java.util.Collections.emptyList(); - intentDetectionConfidence_ = 0F; } @java.lang.Override @@ -107,7 +104,7 @@ private QueryResult( } case 58: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; @@ -142,7 +139,7 @@ private QueryResult( } case 82: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000400; @@ -231,7 +228,7 @@ private QueryResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,10 +240,10 @@ private QueryResult( } 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)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); } - if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (((mutable_bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } this.unknownFields = unknownFields.build(); @@ -1115,49 +1112,44 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.QueryResult other = (com.google.cloud.dialogflow.v2beta1.QueryResult) obj; - boolean result = true; - result = result && getQueryText().equals(other.getQueryText()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = - result - && (java.lang.Float.floatToIntBits(getSpeechRecognitionConfidence()) - == java.lang.Float.floatToIntBits(other.getSpeechRecognitionConfidence())); - result = result && getAction().equals(other.getAction()); - result = result && (hasParameters() == other.hasParameters()); + if (!getQueryText().equals(other.getQueryText())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (java.lang.Float.floatToIntBits(getSpeechRecognitionConfidence()) + != java.lang.Float.floatToIntBits(other.getSpeechRecognitionConfidence())) return false; + if (!getAction().equals(other.getAction())) return false; + if (hasParameters() != other.hasParameters()) return false; if (hasParameters()) { - result = result && getParameters().equals(other.getParameters()); + if (!getParameters().equals(other.getParameters())) return false; } - result = result && (getAllRequiredParamsPresent() == other.getAllRequiredParamsPresent()); - result = result && getFulfillmentText().equals(other.getFulfillmentText()); - result = result && getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList()); - result = result && getWebhookSource().equals(other.getWebhookSource()); - result = result && (hasWebhookPayload() == other.hasWebhookPayload()); + if (getAllRequiredParamsPresent() != other.getAllRequiredParamsPresent()) return false; + if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; + if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; + if (!getWebhookSource().equals(other.getWebhookSource())) return false; + if (hasWebhookPayload() != other.hasWebhookPayload()) return false; if (hasWebhookPayload()) { - result = result && getWebhookPayload().equals(other.getWebhookPayload()); + if (!getWebhookPayload().equals(other.getWebhookPayload())) return false; } - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (hasIntent() == other.hasIntent()); + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = - result - && (java.lang.Float.floatToIntBits(getIntentDetectionConfidence()) - == java.lang.Float.floatToIntBits(other.getIntentDetectionConfidence())); - result = result && (hasDiagnosticInfo() == other.hasDiagnosticInfo()); + if (java.lang.Float.floatToIntBits(getIntentDetectionConfidence()) + != java.lang.Float.floatToIntBits(other.getIntentDetectionConfidence())) return false; + if (hasDiagnosticInfo() != other.hasDiagnosticInfo()) return false; if (hasDiagnosticInfo()) { - result = result && getDiagnosticInfo().equals(other.getDiagnosticInfo()); + if (!getDiagnosticInfo().equals(other.getDiagnosticInfo())) return false; } - result = result && (hasSentimentAnalysisResult() == other.hasSentimentAnalysisResult()); + if (hasSentimentAnalysisResult() != other.hasSentimentAnalysisResult()) return false; if (hasSentimentAnalysisResult()) { - result = result && getSentimentAnalysisResult().equals(other.getSentimentAnalysisResult()); + if (!getSentimentAnalysisResult().equals(other.getSentimentAnalysisResult())) return false; } - result = result && (hasKnowledgeAnswers() == other.hasKnowledgeAnswers()); + if (hasKnowledgeAnswers() != other.hasKnowledgeAnswers()) return false; if (hasKnowledgeAnswers()) { - result = result && getKnowledgeAnswers().equals(other.getKnowledgeAnswers()); + if (!getKnowledgeAnswers().equals(other.getKnowledgeAnswers())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1468,7 +1460,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult buildPartial() { result.allRequiredParamsPresent_ = allRequiredParamsPresent_; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1483,7 +1475,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult buildPartial() { result.webhookPayload_ = webhookPayloadBuilder_.build(); } if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000400) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00000400); } @@ -1519,35 +1511,35 @@ public com.google.cloud.dialogflow.v2beta1.QueryResult 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 @@ -2082,7 +2074,7 @@ public Builder setActionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct parameters_ = null; + private com.google.protobuf.Struct parameters_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2411,7 +2403,7 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) { fulfillmentMessages_ = java.util.Collections.emptyList(); private void ensureFulfillmentMessagesIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { fulfillmentMessages_ = new java.util.ArrayList( fulfillmentMessages_); @@ -2781,7 +2773,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addFulfillment com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder, com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>( fulfillmentMessages_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); fulfillmentMessages_ = null; @@ -2888,7 +2880,7 @@ public Builder setWebhookSourceBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct webhookPayload_ = null; + private com.google.protobuf.Struct webhookPayload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -3082,7 +3074,7 @@ public com.google.protobuf.StructOrBuilder getWebhookPayloadOrBuilder() { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00000400) == 0x00000400)) { + if (!((bitField0_ & 0x00000400) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00000400; @@ -3479,7 +3471,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil com.google.cloud.dialogflow.v2beta1.Context.Builder, com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00000400) == 0x00000400), + ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -3487,7 +3479,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil return outputContextsBuilder_; } - private com.google.cloud.dialogflow.v2beta1.Intent intent_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, @@ -3739,7 +3731,7 @@ public Builder clearIntentDetectionConfidence() { return this; } - private com.google.protobuf.Struct diagnosticInfo_ = null; + private com.google.protobuf.Struct diagnosticInfo_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -3929,8 +3921,7 @@ public com.google.protobuf.StructOrBuilder getDiagnosticInfoOrBuilder() { return diagnosticInfoBuilder_; } - private com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult sentimentAnalysisResult_ = - null; + private com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult sentimentAnalysisResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult, com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult.Builder, @@ -4145,7 +4136,7 @@ public Builder clearSentimentAnalysisResult() { return sentimentAnalysisResultBuilder_; } - private com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers knowledgeAnswers_ = null; + private com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers knowledgeAnswers_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers, com.google.cloud.dialogflow.v2beta1.KnowledgeAnswers.Builder, @@ -4341,7 +4332,7 @@ public Builder clearKnowledgeAnswers() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java index 7ea89b6adce8..101e9b607816 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java @@ -73,7 +73,7 @@ private RestoreAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -332,22 +332,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest other = (com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getAgentCase().equals(other.getAgentCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getAgentCase().equals(other.getAgentCase())) return false; switch (agentCase_) { case 2: - result = result && getAgentUri().equals(other.getAgentUri()); + if (!getAgentUri().equals(other.getAgentUri())) return false; break; case 3: - result = result && getAgentContent().equals(other.getAgentContent()); + if (!getAgentContent().equals(other.getAgentContent())) 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 @@ -563,35 +561,35 @@ public com.google.cloud.dialogflow.v2beta1.RestoreAgentRequest 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 @@ -971,7 +969,7 @@ public Builder clearAgentContent() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java index 2a911566ffe5..6e86ac830f54 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java @@ -25,7 +25,6 @@ private SearchAgentsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private SearchAgentsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private SearchAgentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -267,12 +266,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest other = (com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,35 +475,35 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -804,7 +802,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java index 8d7bb20cc0cf..45b5122a6f71 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java @@ -54,7 +54,7 @@ private SearchAgentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { agents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private SearchAgentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private SearchAgentsResponse( } 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)) { agents_ = java.util.Collections.unmodifiableList(agents_); } this.unknownFields = unknownFields.build(); @@ -273,11 +273,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse other = (com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse) obj; - boolean result = true; - result = result && getAgentsList().equals(other.getAgentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAgentsList().equals(other.getAgentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,7 +479,7 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (agentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { agents_ = java.util.Collections.unmodifiableList(agents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -496,35 +495,35 @@ public com.google.cloud.dialogflow.v2beta1.SearchAgentsResponse 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 @@ -607,7 +606,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAgentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { agents_ = new java.util.ArrayList(agents_); bitField0_ |= 0x00000001; } @@ -964,10 +963,7 @@ public com.google.cloud.dialogflow.v2beta1.Agent.Builder addAgentsBuilder(int in com.google.cloud.dialogflow.v2beta1.Agent, com.google.cloud.dialogflow.v2beta1.Agent.Builder, com.google.cloud.dialogflow.v2beta1.AgentOrBuilder>( - agents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + agents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); agents_ = null; } return agentsBuilder_; @@ -1074,7 +1070,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java index 1d88f1f0a72b..f390476d35b9 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Sentiment.java @@ -23,10 +23,7 @@ private Sentiment(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Sentiment() { - score_ = 0F; - magnitude_ = 0F; - } + private Sentiment() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -64,7 +61,7 @@ private Sentiment( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,17 +176,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.Sentiment other = (com.google.cloud.dialogflow.v2beta1.Sentiment) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getScore()) - == java.lang.Float.floatToIntBits(other.getScore())); - result = - result - && (java.lang.Float.floatToIntBits(getMagnitude()) - == java.lang.Float.floatToIntBits(other.getMagnitude())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getScore()) + != java.lang.Float.floatToIntBits(other.getScore())) return false; + if (java.lang.Float.floatToIntBits(getMagnitude()) + != java.lang.Float.floatToIntBits(other.getMagnitude())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -388,35 +380,35 @@ public com.google.cloud.dialogflow.v2beta1.Sentiment buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -562,7 +554,7 @@ public Builder clearMagnitude() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java index 47242f109b5d..69f75bb7b64a 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisRequestConfig.java @@ -23,9 +23,7 @@ private SentimentAnalysisRequestConfig( super(builder); } - private SentimentAnalysisRequestConfig() { - analyzeQueryTextSentiment_ = false; - } + private SentimentAnalysisRequestConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -58,7 +56,7 @@ private SentimentAnalysisRequestConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig other = (com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig) obj; - boolean result = true; - result = result && (getAnalyzeQueryTextSentiment() == other.getAnalyzeQueryTextSentiment()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getAnalyzeQueryTextSentiment() != other.getAnalyzeQueryTextSentiment()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -353,35 +350,35 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisRequestConfig buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -486,7 +483,7 @@ public Builder clearAnalyzeQueryTextSentiment() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java index 1770eb1c50b0..a07d81bc966e 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SentimentAnalysisResult.java @@ -67,7 +67,7 @@ private SentimentAnalysisResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,13 +185,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult other = (com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult) obj; - boolean result = true; - result = result && (hasQueryTextSentiment() == other.hasQueryTextSentiment()); + if (hasQueryTextSentiment() != other.hasQueryTextSentiment()) return false; if (hasQueryTextSentiment()) { - result = result && getQueryTextSentiment().equals(other.getQueryTextSentiment()); + if (!getQueryTextSentiment().equals(other.getQueryTextSentiment())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -396,35 +395,35 @@ public com.google.cloud.dialogflow.v2beta1.SentimentAnalysisResult 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 @@ -473,7 +472,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.Sentiment queryTextSentiment_ = null; + private com.google.cloud.dialogflow.v2beta1.Sentiment queryTextSentiment_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Sentiment, com.google.cloud.dialogflow.v2beta1.Sentiment.Builder, @@ -657,7 +656,7 @@ public com.google.cloud.dialogflow.v2beta1.SentimentOrBuilder getQueryTextSentim @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java index 6337218467ed..8663f97bd17d 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java @@ -72,7 +72,7 @@ private SessionEntityType( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { entities_ = new java.util.ArrayList< com.google.cloud.dialogflow.v2beta1.EntityType.Entity>(); @@ -86,7 +86,7 @@ private SessionEntityType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -98,7 +98,7 @@ private SessionEntityType( } 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)) { entities_ = java.util.Collections.unmodifiableList(entities_); } this.unknownFields = unknownFields.build(); @@ -512,12 +512,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SessionEntityType other = (com.google.cloud.dialogflow.v2beta1.SessionEntityType) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && entityOverrideMode_ == other.entityOverrideMode_; - result = result && getEntitiesList().equals(other.getEntitiesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (entityOverrideMode_ != other.entityOverrideMode_) return false; + if (!getEntitiesList().equals(other.getEntitiesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -729,7 +728,7 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType buildPartial() { result.name_ = name_; result.entityOverrideMode_ = entityOverrideMode_; if (entitiesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { entities_ = java.util.Collections.unmodifiableList(entities_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -744,35 +743,35 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType 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 @@ -1078,7 +1077,7 @@ public Builder clearEntityOverrideMode() { java.util.Collections.emptyList(); private void ensureEntitiesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { entities_ = new java.util.ArrayList( entities_); @@ -1445,10 +1444,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities com.google.cloud.dialogflow.v2beta1.EntityType.Entity, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder, com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>( - entities_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + entities_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); entities_ = null; } return entitiesBuilder_; @@ -1456,7 +1452,7 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java index a51ee5701169..7dcbc92cf2ef 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java @@ -33,7 +33,6 @@ private StreamingDetectIntentRequest(com.google.protobuf.GeneratedMessageV3.Buil private StreamingDetectIntentRequest() { session_ = ""; - singleUtterance_ = false; inputAudio_ = com.google.protobuf.ByteString.EMPTY; } @@ -130,7 +129,7 @@ private StreamingDetectIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -479,24 +478,23 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest other = (com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasQueryParams() == other.hasQueryParams()); + if (!getSession().equals(other.getSession())) return false; + if (hasQueryParams() != other.hasQueryParams()) return false; if (hasQueryParams()) { - result = result && getQueryParams().equals(other.getQueryParams()); + if (!getQueryParams().equals(other.getQueryParams())) return false; } - result = result && (hasQueryInput() == other.hasQueryInput()); + if (hasQueryInput() != other.hasQueryInput()) return false; if (hasQueryInput()) { - result = result && getQueryInput().equals(other.getQueryInput()); + if (!getQueryInput().equals(other.getQueryInput())) return false; } - result = result && (getSingleUtterance() == other.getSingleUtterance()); - result = result && (hasOutputAudioConfig() == other.hasOutputAudioConfig()); + if (getSingleUtterance() != other.getSingleUtterance()) return false; + if (hasOutputAudioConfig() != other.hasOutputAudioConfig()) return false; if (hasOutputAudioConfig()) { - result = result && getOutputAudioConfig().equals(other.getOutputAudioConfig()); + if (!getOutputAudioConfig().equals(other.getOutputAudioConfig())) return false; } - result = result && getInputAudio().equals(other.getInputAudio()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInputAudio().equals(other.getInputAudio())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -755,35 +753,35 @@ public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentRequest buildPar @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -990,7 +988,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.QueryParameters queryParams_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryParameters queryParams_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryParameters, com.google.cloud.dialogflow.v2beta1.QueryParameters.Builder, @@ -1172,7 +1170,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara return queryParamsBuilder_; } - private com.google.cloud.dialogflow.v2beta1.QueryInput queryInput_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryInput queryInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryInput, com.google.cloud.dialogflow.v2beta1.QueryInput.Builder, @@ -1455,7 +1453,7 @@ public Builder clearSingleUtterance() { return this; } - private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_ = null; + private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.OutputAudioConfig, com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder, @@ -1714,7 +1712,7 @@ public Builder clearInputAudio() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java index 627a7ee4c465..72d0985e56d2 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java @@ -143,7 +143,7 @@ private StreamingDetectIntentResponse( } case 58: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -155,7 +155,7 @@ private StreamingDetectIntentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -167,7 +167,7 @@ private StreamingDetectIntentResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); } this.unknownFields = unknownFields.build(); @@ -616,29 +616,28 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse other = (com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse) obj; - boolean result = true; - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasRecognitionResult() == other.hasRecognitionResult()); + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasRecognitionResult() != other.hasRecognitionResult()) return false; if (hasRecognitionResult()) { - result = result && getRecognitionResult().equals(other.getRecognitionResult()); + if (!getRecognitionResult().equals(other.getRecognitionResult())) return false; } - result = result && (hasQueryResult() == other.hasQueryResult()); + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = - result && getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList()); - result = result && (hasWebhookStatus() == other.hasWebhookStatus()); + if (!getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList())) + return false; + if (hasWebhookStatus() != other.hasWebhookStatus()) return false; if (hasWebhookStatus()) { - result = result && getWebhookStatus().equals(other.getWebhookStatus()); + if (!getWebhookStatus().equals(other.getWebhookStatus())) return false; } - result = result && getOutputAudio().equals(other.getOutputAudio()); - result = result && (hasOutputAudioConfig() == other.hasOutputAudioConfig()); + if (!getOutputAudio().equals(other.getOutputAudio())) return false; + if (hasOutputAudioConfig() != other.hasOutputAudioConfig()) return false; if (hasOutputAudioConfig()) { - result = result && getOutputAudioConfig().equals(other.getOutputAudioConfig()); + if (!getOutputAudioConfig().equals(other.getOutputAudioConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -910,7 +909,7 @@ public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse buildPa result.queryResult_ = queryResultBuilder_.build(); } if (alternativeQueryResultsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); bitField0_ = (bitField0_ & ~0x00000008); @@ -937,35 +936,35 @@ public com.google.cloud.dialogflow.v2beta1.StreamingDetectIntentResponse buildPa @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1161,8 +1160,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult recognitionResult_ = - null; + private com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult recognitionResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult, com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult.Builder, @@ -1358,7 +1356,7 @@ public Builder clearRecognitionResult() { return recognitionResultBuilder_; } - private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryResult, com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, @@ -1553,7 +1551,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr alternativeQueryResults_ = java.util.Collections.emptyList(); private void ensureAlternativeQueryResultsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = new java.util.ArrayList( alternativeQueryResults_); @@ -2048,7 +2046,7 @@ public Builder removeAlternativeQueryResults(int index) { com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>( alternativeQueryResults_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); alternativeQueryResults_ = null; @@ -2056,7 +2054,7 @@ public Builder removeAlternativeQueryResults(int index) { return alternativeQueryResultsBuilder_; } - private com.google.rpc.Status webhookStatus_ = null; + private com.google.rpc.Status webhookStatus_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> webhookStatusBuilder_; @@ -2274,7 +2272,7 @@ public Builder clearOutputAudio() { return this; } - private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_ = null; + private com.google.cloud.dialogflow.v2beta1.OutputAudioConfig outputAudioConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.OutputAudioConfig, com.google.cloud.dialogflow.v2beta1.OutputAudioConfig.Builder, @@ -2480,7 +2478,7 @@ public Builder clearOutputAudioConfig() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java index 52ff4c29846d..684e0f007140 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java @@ -44,8 +44,6 @@ private StreamingRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builde private StreamingRecognitionResult() { messageType_ = 0; transcript_ = ""; - isFinal_ = false; - confidence_ = 0F; } @java.lang.Override @@ -98,7 +96,7 @@ private StreamingRecognitionResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -478,16 +476,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult other = (com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult) obj; - boolean result = true; - result = result && messageType_ == other.messageType_; - result = result && getTranscript().equals(other.getTranscript()); - result = result && (getIsFinal() == other.getIsFinal()); - result = - result - && (java.lang.Float.floatToIntBits(getConfidence()) - == java.lang.Float.floatToIntBits(other.getConfidence())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (messageType_ != other.messageType_) return false; + if (!getTranscript().equals(other.getTranscript())) return false; + if (getIsFinal() != other.getIsFinal()) return false; + if (java.lang.Float.floatToIntBits(getConfidence()) + != java.lang.Float.floatToIntBits(other.getConfidence())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -716,35 +711,35 @@ public com.google.cloud.dialogflow.v2beta1.StreamingRecognitionResult 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 @@ -1112,7 +1107,7 @@ public Builder clearConfidence() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java index 31c5978700ca..5db72bbb86a4 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SynthesizeSpeechConfig.java @@ -23,9 +23,6 @@ private SynthesizeSpeechConfig(com.google.protobuf.GeneratedMessageV3.Builder } private SynthesizeSpeechConfig() { - speakingRate_ = 0D; - pitch_ = 0D; - volumeGainDb_ = 0D; effectsProfileId_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -88,7 +85,7 @@ private SynthesizeSpeechConfig( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -97,7 +94,7 @@ private SynthesizeSpeechConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -109,7 +106,7 @@ private SynthesizeSpeechConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -364,26 +361,19 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig other = (com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig) obj; - boolean result = true; - 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 && getEffectsProfileIdList().equals(other.getEffectsProfileIdList()); - result = result && (hasVoice() == other.hasVoice()); + 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 (!getEffectsProfileIdList().equals(other.getEffectsProfileIdList())) return false; + if (hasVoice() != other.hasVoice()) return false; if (hasVoice()) { - result = result && getVoice().equals(other.getVoice()); + if (!getVoice().equals(other.getVoice())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -607,7 +597,7 @@ public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig buildPartial() result.speakingRate_ = speakingRate_; result.pitch_ = pitch_; result.volumeGainDb_ = volumeGainDb_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { effectsProfileId_ = effectsProfileId_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -624,35 +614,35 @@ public com.google.cloud.dialogflow.v2beta1.SynthesizeSpeechConfig 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 @@ -894,7 +884,7 @@ public Builder clearVolumeGainDb() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureEffectsProfileIdIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { effectsProfileId_ = new com.google.protobuf.LazyStringArrayList(effectsProfileId_); bitField0_ |= 0x00000008; } @@ -1051,7 +1041,7 @@ public Builder addEffectsProfileIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams voice_ = null; + private com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams voice_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams, com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams.Builder, @@ -1235,7 +1225,7 @@ public com.google.cloud.dialogflow.v2beta1.VoiceSelectionParamsOrBuilder getVoic @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java index 7dbe2549d1a2..69ebeabf20d8 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java @@ -67,7 +67,7 @@ private TextInput( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,11 +244,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.TextInput other = (com.google.cloud.dialogflow.v2beta1.TextInput) obj; - boolean result = true; - result = result && getText().equals(other.getText()); - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getText().equals(other.getText())) return false; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.cloud.dialogflow.v2beta1.TextInput 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 @@ -736,7 +735,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java index 348f2b866211..3f5133e3c582 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java @@ -60,7 +60,7 @@ private TrainAgentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.TrainAgentRequest other = (com.google.cloud.dialogflow.v2beta1.TrainAgentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.dialogflow.v2beta1.TrainAgentRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setParentBytes(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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java index dc91d6426ae5..fda4efbc30d2 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java @@ -82,7 +82,7 @@ private UpdateContextRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,17 +245,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.UpdateContextRequest other = (com.google.cloud.dialogflow.v2beta1.UpdateContextRequest) obj; - boolean result = true; - result = result && (hasContext() == other.hasContext()); + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -475,35 +474,35 @@ public com.google.cloud.dialogflow.v2beta1.UpdateContextRequest 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 @@ -555,7 +554,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.Context context_ = null; + private com.google.cloud.dialogflow.v2beta1.Context context_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Context, com.google.cloud.dialogflow.v2beta1.Context.Builder, @@ -736,7 +735,7 @@ public com.google.cloud.dialogflow.v2beta1.ContextOrBuilder getContextOrBuilder( return contextBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -917,7 +916,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java index 6a5753d337fe..93eb23a4701b 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java @@ -91,7 +91,7 @@ private UpdateEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -314,18 +314,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest) obj; - boolean result = true; - result = result && (hasEntityType() == other.hasEntityType()); + if (hasEntityType() != other.hasEntityType()) return false; if (hasEntityType()) { - result = result && getEntityType().equals(other.getEntityType()); + if (!getEntityType().equals(other.getEntityType())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -550,35 +549,35 @@ public com.google.cloud.dialogflow.v2beta1.UpdateEntityTypeRequest buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -634,7 +633,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.EntityType entityType_ = null; + private com.google.cloud.dialogflow.v2beta1.EntityType entityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.EntityType, com.google.cloud.dialogflow.v2beta1.EntityType.Builder, @@ -939,7 +938,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1120,7 +1119,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java index ba58397801ce..5aab713cb957 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java @@ -99,7 +99,7 @@ private UpdateIntentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -360,19 +360,18 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest other = (com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest) obj; - boolean result = true; - result = result && (hasIntent() == other.hasIntent()); + if (hasIntent() != other.hasIntent()) return false; if (hasIntent()) { - result = result && getIntent().equals(other.getIntent()); + if (!getIntent().equals(other.getIntent())) return false; } - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && intentView_ == other.intentView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (intentView_ != other.intentView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -602,35 +601,35 @@ public com.google.cloud.dialogflow.v2beta1.UpdateIntentRequest 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 @@ -689,7 +688,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.Intent intent_ = null; + private com.google.cloud.dialogflow.v2beta1.Intent intent_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.Intent, com.google.cloud.dialogflow.v2beta1.Intent.Builder, @@ -993,7 +992,7 @@ public Builder setLanguageCodeBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1250,7 +1249,7 @@ public Builder clearIntentView() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java index cd5c443c6a60..dfc289930e27 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java @@ -84,7 +84,7 @@ private UpdateSessionEntityTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -263,17 +263,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest other = (com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest) obj; - boolean result = true; - result = result && (hasSessionEntityType() == other.hasSessionEntityType()); + if (hasSessionEntityType() != other.hasSessionEntityType()) return false; if (hasSessionEntityType()) { - result = result && getSessionEntityType().equals(other.getSessionEntityType()); + if (!getSessionEntityType().equals(other.getSessionEntityType())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -497,35 +496,35 @@ public com.google.cloud.dialogflow.v2beta1.UpdateSessionEntityTypeRequest buildP @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -581,7 +580,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.dialogflow.v2beta1.SessionEntityType sessionEntityType_ = null; + private com.google.cloud.dialogflow.v2beta1.SessionEntityType sessionEntityType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.SessionEntityType, com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder, @@ -812,7 +811,7 @@ public Builder clearSessionEntityType() { return sessionEntityTypeBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -993,7 +992,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java index ff39617913fd..fd0bec463980 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/VoiceSelectionParams.java @@ -67,7 +67,7 @@ private VoiceSelectionParams( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -239,11 +239,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams other = (com.google.cloud.dialogflow.v2beta1.VoiceSelectionParams) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && ssmlGender_ == other.ssmlGender_; - result = result && unknownFields.equals(other.unknownFields); - return result; + 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 @@ -442,35 +441,35 @@ public com.google.cloud.dialogflow.v2beta1.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 @@ -722,7 +721,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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java index 6a8352004cc9..366f0d0d863d 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java @@ -102,7 +102,7 @@ private WebhookRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -114,7 +114,7 @@ private WebhookRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -126,7 +126,7 @@ private WebhookRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); } this.unknownFields = unknownFields.build(); @@ -483,22 +483,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.WebhookRequest other = (com.google.cloud.dialogflow.v2beta1.WebhookRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && getResponseId().equals(other.getResponseId()); - result = result && (hasQueryResult() == other.hasQueryResult()); + if (!getSession().equals(other.getSession())) return false; + if (!getResponseId().equals(other.getResponseId())) return false; + if (hasQueryResult() != other.hasQueryResult()) return false; if (hasQueryResult()) { - result = result && getQueryResult().equals(other.getQueryResult()); + if (!getQueryResult().equals(other.getQueryResult())) return false; } - result = - result && getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList()); - result = result && (hasOriginalDetectIntentRequest() == other.hasOriginalDetectIntentRequest()); + if (!getAlternativeQueryResultsList().equals(other.getAlternativeQueryResultsList())) + return false; + if (hasOriginalDetectIntentRequest() != other.hasOriginalDetectIntentRequest()) return false; if (hasOriginalDetectIntentRequest()) { - result = - result && getOriginalDetectIntentRequest().equals(other.getOriginalDetectIntentRequest()); + if (!getOriginalDetectIntentRequest().equals(other.getOriginalDetectIntentRequest())) + return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -730,7 +729,7 @@ public com.google.cloud.dialogflow.v2beta1.WebhookRequest buildPartial() { result.queryResult_ = queryResultBuilder_.build(); } if (alternativeQueryResultsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = java.util.Collections.unmodifiableList(alternativeQueryResults_); bitField0_ = (bitField0_ & ~0x00000008); @@ -751,35 +750,35 @@ public com.google.cloud.dialogflow.v2beta1.WebhookRequest 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 @@ -1071,7 +1070,7 @@ public Builder setResponseIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_ = null; + private com.google.cloud.dialogflow.v2beta1.QueryResult queryResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.QueryResult, com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, @@ -1266,7 +1265,7 @@ public com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder getQueryResultOr alternativeQueryResults_ = java.util.Collections.emptyList(); private void ensureAlternativeQueryResultsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { alternativeQueryResults_ = new java.util.ArrayList( alternativeQueryResults_); @@ -1635,7 +1634,7 @@ public Builder removeAlternativeQueryResults(int index) { com.google.cloud.dialogflow.v2beta1.QueryResult.Builder, com.google.cloud.dialogflow.v2beta1.QueryResultOrBuilder>( alternativeQueryResults_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); alternativeQueryResults_ = null; @@ -1644,7 +1643,7 @@ public Builder removeAlternativeQueryResults(int index) { } private com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest - originalDetectIntentRequest_ = null; + originalDetectIntentRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest, com.google.cloud.dialogflow.v2beta1.OriginalDetectIntentRequest.Builder, @@ -1861,7 +1860,7 @@ public Builder clearOriginalDetectIntentRequest() { @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-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java index 5cf212de6c52..2a63e8a788cb 100644 --- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java +++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java @@ -27,7 +27,6 @@ private WebhookResponse() { fulfillmentMessages_ = java.util.Collections.emptyList(); source_ = ""; outputContexts_ = java.util.Collections.emptyList(); - endInteraction_ = false; } @java.lang.Override @@ -63,7 +62,7 @@ private WebhookResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -97,7 +96,7 @@ private WebhookResponse( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { outputContexts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; @@ -130,7 +129,7 @@ private WebhookResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -142,10 +141,10 @@ private WebhookResponse( } 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)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); } this.unknownFields = unknownFields.build(); @@ -643,22 +642,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dialogflow.v2beta1.WebhookResponse other = (com.google.cloud.dialogflow.v2beta1.WebhookResponse) obj; - boolean result = true; - result = result && getFulfillmentText().equals(other.getFulfillmentText()); - result = result && getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList()); - result = result && getSource().equals(other.getSource()); - result = result && (hasPayload() == other.hasPayload()); + if (!getFulfillmentText().equals(other.getFulfillmentText())) return false; + if (!getFulfillmentMessagesList().equals(other.getFulfillmentMessagesList())) return false; + if (!getSource().equals(other.getSource())) return false; + if (hasPayload() != other.hasPayload()) return false; if (hasPayload()) { - result = result && getPayload().equals(other.getPayload()); + if (!getPayload().equals(other.getPayload())) return false; } - result = result && getOutputContextsList().equals(other.getOutputContextsList()); - result = result && (hasFollowupEventInput() == other.hasFollowupEventInput()); + if (!getOutputContextsList().equals(other.getOutputContextsList())) return false; + if (hasFollowupEventInput() != other.hasFollowupEventInput()) return false; if (hasFollowupEventInput()) { - result = result && getFollowupEventInput().equals(other.getFollowupEventInput()); + if (!getFollowupEventInput().equals(other.getFollowupEventInput())) return false; } - result = result && (getEndInteraction() == other.getEndInteraction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEndInteraction() != other.getEndInteraction()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -899,7 +897,7 @@ public com.google.cloud.dialogflow.v2beta1.WebhookResponse buildPartial() { int to_bitField0_ = 0; result.fulfillmentText_ = fulfillmentText_; if (fulfillmentMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = java.util.Collections.unmodifiableList(fulfillmentMessages_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -914,7 +912,7 @@ public com.google.cloud.dialogflow.v2beta1.WebhookResponse buildPartial() { result.payload_ = payloadBuilder_.build(); } if (outputContextsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { outputContexts_ = java.util.Collections.unmodifiableList(outputContexts_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -935,35 +933,35 @@ public com.google.cloud.dialogflow.v2beta1.WebhookResponse 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 @@ -1185,7 +1183,7 @@ public Builder setFulfillmentTextBytes(com.google.protobuf.ByteString value) { fulfillmentMessages_ = java.util.Collections.emptyList(); private void ensureFulfillmentMessagesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { fulfillmentMessages_ = new java.util.ArrayList( fulfillmentMessages_); @@ -1573,7 +1571,7 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder addFulfillment com.google.cloud.dialogflow.v2beta1.Intent.Message.Builder, com.google.cloud.dialogflow.v2beta1.Intent.MessageOrBuilder>( fulfillmentMessages_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); fulfillmentMessages_ = null; @@ -1675,7 +1673,7 @@ public Builder setSourceBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct payload_ = null; + private com.google.protobuf.Struct payload_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2043,7 +2041,7 @@ public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { java.util.Collections.emptyList(); private void ensureOutputContextsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { outputContexts_ = new java.util.ArrayList(outputContexts_); bitField0_ |= 0x00000010; @@ -2404,7 +2402,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil com.google.cloud.dialogflow.v2beta1.Context.Builder, com.google.cloud.dialogflow.v2beta1.ContextOrBuilder>( outputContexts_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); outputContexts_ = null; @@ -2412,7 +2410,7 @@ public com.google.cloud.dialogflow.v2beta1.Context.Builder addOutputContextsBuil return outputContextsBuilder_; } - private com.google.cloud.dialogflow.v2beta1.EventInput followupEventInput_ = null; + private com.google.cloud.dialogflow.v2beta1.EventInput followupEventInput_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.dialogflow.v2beta1.EventInput, com.google.cloud.dialogflow.v2beta1.EventInput.Builder, @@ -2656,7 +2654,7 @@ public Builder clearEndInteraction() { @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-dialogflow/synth.metadata b/google-cloud-clients/google-cloud-dialogflow/synth.metadata index 72aa7278ac5a..edd1821f80b4 100644 --- a/google-cloud-clients/google-cloud-dialogflow/synth.metadata +++ b/google-cloud-clients/google-cloud-dialogflow/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:42:39.272940Z", + "updateTime": "2019-03-29T07:42:51.662505Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],