From 0de7d2550aa67498085830bf4e34788cb5b40962 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 29 Mar 2019 00:49:46 -0700 Subject: [PATCH] Regenerate logging client --- .../logging/v2/CreateExclusionRequest.java | 29 +++--- .../logging/v2/CreateLogMetricRequest.java | 29 +++--- .../google/logging/v2/CreateSinkRequest.java | 32 ++++--- .../logging/v2/DeleteExclusionRequest.java | 23 +++-- .../logging/v2/DeleteLogMetricRequest.java | 23 +++-- .../google/logging/v2/DeleteLogRequest.java | 23 +++-- .../google/logging/v2/DeleteSinkRequest.java | 23 +++-- .../logging/v2/GetExclusionRequest.java | 23 +++-- .../logging/v2/GetLogMetricRequest.java | 23 +++-- .../com/google/logging/v2/GetSinkRequest.java | 23 +++-- .../logging/v2/ListExclusionsRequest.java | 28 +++--- .../logging/v2/ListExclusionsResponse.java | 38 ++++---- .../logging/v2/ListLogEntriesRequest.java | 50 +++++------ .../logging/v2/ListLogEntriesResponse.java | 38 ++++---- .../logging/v2/ListLogMetricsRequest.java | 28 +++--- .../logging/v2/ListLogMetricsResponse.java | 38 ++++---- .../google/logging/v2/ListLogsRequest.java | 28 +++--- .../google/logging/v2/ListLogsResponse.java | 33 ++++--- ...stMonitoredResourceDescriptorsRequest.java | 26 +++--- ...tMonitoredResourceDescriptorsResponse.java | 35 ++++---- .../google/logging/v2/ListSinksRequest.java | 28 +++--- .../google/logging/v2/ListSinksResponse.java | 38 ++++---- .../java/com/google/logging/v2/LogEntry.java | 89 +++++++++---------- .../google/logging/v2/LogEntryOperation.java | 31 +++---- .../logging/v2/LogEntrySourceLocation.java | 28 +++--- .../com/google/logging/v2/LogExclusion.java | 30 +++---- .../java/com/google/logging/v2/LogMetric.java | 47 +++++----- .../java/com/google/logging/v2/LogSink.java | 46 +++++----- .../logging/v2/UpdateExclusionRequest.java | 35 ++++---- .../logging/v2/UpdateLogMetricRequest.java | 29 +++--- .../google/logging/v2/UpdateSinkRequest.java | 38 ++++---- .../v2/WriteLogEntriesPartialErrors.java | 25 +++--- .../logging/v2/WriteLogEntriesRequest.java | 56 ++++++------ .../logging/v2/WriteLogEntriesResponse.java | 21 +++-- .../google-cloud-logging/synth.metadata | 10 +-- 35 files changed, 539 insertions(+), 605 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java index db3c6471220a..d80f2ba82bed 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java @@ -74,7 +74,7 @@ private CreateExclusionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -254,14 +254,13 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.CreateExclusionRequest other = (com.google.logging.v2.CreateExclusionRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasExclusion() == other.hasExclusion()); + if (!getParent().equals(other.getParent())) return false; + if (hasExclusion() != other.hasExclusion()) return false; if (hasExclusion()) { - result = result && getExclusion().equals(other.getExclusion()); + if (!getExclusion().equals(other.getExclusion())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -469,35 +468,35 @@ public com.google.logging.v2.CreateExclusionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -667,7 +666,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.logging.v2.LogExclusion exclusion_ = null; + private com.google.logging.v2.LogExclusion exclusion_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogExclusion, com.google.logging.v2.LogExclusion.Builder, @@ -859,7 +858,7 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java index d34bbf0a0fc3..e0252c487f25 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java @@ -74,7 +74,7 @@ private CreateLogMetricRequest( } 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.logging.v2.CreateLogMetricRequest other = (com.google.logging.v2.CreateLogMetricRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasMetric() == other.hasMetric()); + if (!getParent().equals(other.getParent())) return false; + if (hasMetric() != other.hasMetric()) return false; if (hasMetric()) { - result = result && getMetric().equals(other.getMetric()); + if (!getMetric().equals(other.getMetric())) 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.logging.v2.CreateLogMetricRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -644,7 +643,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.logging.v2.LogMetric metric_ = null; + private com.google.logging.v2.LogMetric metric_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogMetric, com.google.logging.v2.LogMetric.Builder, @@ -830,7 +829,7 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java index c454cf8294c9..c1c6911f371e 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java @@ -24,7 +24,6 @@ private CreateSinkRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private CreateSinkRequest() { parent_ = ""; - uniqueWriterIdentity_ = false; } @java.lang.Override @@ -79,7 +78,7 @@ private CreateSinkRequest( } 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.logging.v2.CreateSinkRequest other = (com.google.logging.v2.CreateSinkRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasSink() == other.hasSink()); + if (!getParent().equals(other.getParent())) return false; + if (hasSink() != other.hasSink()) return false; if (hasSink()) { - result = result && getSink().equals(other.getSink()); + if (!getSink().equals(other.getSink())) return false; } - result = result && (getUniqueWriterIdentity() == other.getUniqueWriterIdentity()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getUniqueWriterIdentity() != other.getUniqueWriterIdentity()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -508,35 +506,35 @@ public com.google.logging.v2.CreateSinkRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 +707,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.logging.v2.LogSink sink_ = null; + private com.google.logging.v2.LogSink sink_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogSink, com.google.logging.v2.LogSink.Builder, @@ -968,7 +966,7 @@ public Builder clearUniqueWriterIdentity() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java index 2bd10c994322..896ebe0a5a3f 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java @@ -59,7 +59,7 @@ private DeleteExclusionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -189,10 +189,9 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.DeleteExclusionRequest other = (com.google.logging.v2.DeleteExclusionRequest) 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 @@ -385,35 +384,35 @@ public com.google.logging.v2.DeleteExclusionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 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-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java index 4372b519e71a..4983af4ba8ab 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java @@ -59,7 +59,7 @@ private DeleteLogMetricRequest( } 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.logging.v2.DeleteLogMetricRequest other = (com.google.logging.v2.DeleteLogMetricRequest) obj; - boolean result = true; - result = result && getMetricName().equals(other.getMetricName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMetricName().equals(other.getMetricName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.logging.v2.DeleteLogMetricRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 setMetricNameBytes(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-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java index c1cb8b8a4cb0..0ec7f51e9b92 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java @@ -59,7 +59,7 @@ private DeleteLogRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -196,10 +196,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.DeleteLogRequest other = (com.google.logging.v2.DeleteLogRequest) obj; - boolean result = true; - result = result && getLogName().equals(other.getLogName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLogName().equals(other.getLogName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -392,35 +391,35 @@ public com.google.logging.v2.DeleteLogRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 setLogNameBytes(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-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java index 0a34d90610b8..e782ff0f9aa6 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java @@ -59,7 +59,7 @@ private DeleteSinkRequest( } 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.logging.v2.DeleteSinkRequest other = (com.google.logging.v2.DeleteSinkRequest) obj; - boolean result = true; - result = result && getSinkName().equals(other.getSinkName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSinkName().equals(other.getSinkName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -386,35 +385,35 @@ public com.google.logging.v2.DeleteSinkRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -588,7 +587,7 @@ public Builder setSinkNameBytes(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-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java index 4cd82e7fb778..9b9a3b72d7ae 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java @@ -59,7 +59,7 @@ private GetExclusionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -189,10 +189,9 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.GetExclusionRequest other = (com.google.logging.v2.GetExclusionRequest) 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 @@ -385,35 +384,35 @@ public com.google.logging.v2.GetExclusionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 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-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java index 54d3f1591834..76808678d110 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java @@ -59,7 +59,7 @@ private GetLogMetricRequest( } 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.logging.v2.GetLogMetricRequest other = (com.google.logging.v2.GetLogMetricRequest) obj; - boolean result = true; - result = result && getMetricName().equals(other.getMetricName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMetricName().equals(other.getMetricName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.logging.v2.GetLogMetricRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 setMetricNameBytes(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-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java index 909f31d11f56..db11f1bc0934 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java @@ -59,7 +59,7 @@ private GetSinkRequest( } 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.logging.v2.GetSinkRequest other = (com.google.logging.v2.GetSinkRequest) obj; - boolean result = true; - result = result && getSinkName().equals(other.getSinkName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSinkName().equals(other.getSinkName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -382,35 +381,35 @@ public com.google.logging.v2.GetSinkRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -579,7 +578,7 @@ public Builder setSinkNameBytes(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-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java index a3dadd0e8746..a76017f35c1c 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java @@ -25,7 +25,6 @@ private ListExclusionsRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListExclusionsRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; } @java.lang.Override @@ -73,7 +72,7 @@ private ListExclusionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -279,12 +278,11 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListExclusionsRequest other = (com.google.logging.v2.ListExclusionsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -487,35 +485,35 @@ public com.google.logging.v2.ListExclusionsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -845,7 +843,7 @@ public Builder clearPageSize() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java index 3f5687ff7017..d7c877ad98a3 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java @@ -53,7 +53,7 @@ private ListExclusionsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { exclusions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListExclusionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListExclusionsResponse( } 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)) { exclusions_ = java.util.Collections.unmodifiableList(exclusions_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListExclusionsResponse other = (com.google.logging.v2.ListExclusionsResponse) obj; - boolean result = true; - result = result && getExclusionsList().equals(other.getExclusionsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getExclusionsList().equals(other.getExclusionsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public com.google.logging.v2.ListExclusionsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (exclusionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { exclusions_ = java.util.Collections.unmodifiableList(exclusions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -490,35 +489,35 @@ public com.google.logging.v2.ListExclusionsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -599,7 +598,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureExclusionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { exclusions_ = new java.util.ArrayList(exclusions_); bitField0_ |= 0x00000001; } @@ -937,10 +936,7 @@ public java.util.List getExclusionsB com.google.logging.v2.LogExclusion, com.google.logging.v2.LogExclusion.Builder, com.google.logging.v2.LogExclusionOrBuilder>( - exclusions_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + exclusions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); exclusions_ = null; } return exclusionsBuilder_; @@ -1052,7 +1048,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-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java index 089c9edfe418..7f1076b1ab39 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java @@ -27,7 +27,6 @@ private ListLogEntriesRequest() { resourceNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; filter_ = ""; orderBy_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -58,7 +57,7 @@ private ListLogEntriesRequest( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { projectIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -94,7 +93,7 @@ private ListLogEntriesRequest( case 66: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { resourceNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -103,7 +102,7 @@ private ListLogEntriesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,10 +114,10 @@ private ListLogEntriesRequest( } 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)) { projectIds_ = projectIds_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { resourceNames_ = resourceNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -547,15 +546,14 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListLogEntriesRequest other = (com.google.logging.v2.ListLogEntriesRequest) obj; - boolean result = true; - result = result && getProjectIdsList().equals(other.getProjectIdsList()); - result = result && getResourceNamesList().equals(other.getResourceNamesList()); - result = result && getFilter().equals(other.getFilter()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectIdsList().equals(other.getProjectIdsList())) return false; + if (!getResourceNamesList().equals(other.getResourceNamesList())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!getOrderBy().equals(other.getOrderBy())) 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 @@ -767,12 +765,12 @@ public com.google.logging.v2.ListLogEntriesRequest buildPartial() { new com.google.logging.v2.ListLogEntriesRequest(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { projectIds_ = projectIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.projectIds_ = projectIds_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { resourceNames_ = resourceNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -788,35 +786,35 @@ public com.google.logging.v2.ListLogEntriesRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -901,7 +899,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureProjectIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { projectIds_ = new com.google.protobuf.LazyStringArrayList(projectIds_); bitField0_ |= 0x00000001; } @@ -1089,7 +1087,7 @@ public Builder addProjectIdsBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureResourceNamesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { resourceNames_ = new com.google.protobuf.LazyStringArrayList(resourceNames_); bitField0_ |= 0x00000002; } @@ -1686,7 +1684,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-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java index 080fe59f6db3..6d0fb7fafdec 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java @@ -53,7 +53,7 @@ private ListLogEntriesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entries_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListLogEntriesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListLogEntriesResponse( } 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)) { entries_ = java.util.Collections.unmodifiableList(entries_); } this.unknownFields = unknownFields.build(); @@ -290,11 +290,10 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListLogEntriesResponse other = (com.google.logging.v2.ListLogEntriesResponse) obj; - boolean result = true; - result = result && getEntriesList().equals(other.getEntriesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntriesList().equals(other.getEntriesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -495,7 +494,7 @@ public com.google.logging.v2.ListLogEntriesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -511,35 +510,35 @@ public com.google.logging.v2.ListLogEntriesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -620,7 +619,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entries_ = new java.util.ArrayList(entries_); bitField0_ |= 0x00000001; } @@ -992,10 +991,7 @@ public java.util.List getEntriesBuilderL com.google.logging.v2.LogEntry, com.google.logging.v2.LogEntry.Builder, com.google.logging.v2.LogEntryOrBuilder>( - entries_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; @@ -1137,7 +1133,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-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java index 72c71079c097..b5fb76b5e7f1 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java @@ -25,7 +25,6 @@ private ListLogMetricsRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListLogMetricsRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; } @java.lang.Override @@ -73,7 +72,7 @@ private ListLogMetricsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -273,12 +272,11 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListLogMetricsRequest other = (com.google.logging.v2.ListLogMetricsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,35 +479,35 @@ public com.google.logging.v2.ListLogMetricsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -824,7 +822,7 @@ public Builder clearPageSize() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java index d6057d5f509c..28156990d877 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java @@ -53,7 +53,7 @@ private ListLogMetricsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { metrics_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListLogMetricsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListLogMetricsResponse( } 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)) { metrics_ = java.util.Collections.unmodifiableList(metrics_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListLogMetricsResponse other = (com.google.logging.v2.ListLogMetricsResponse) obj; - boolean result = true; - result = result && getMetricsList().equals(other.getMetricsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMetricsList().equals(other.getMetricsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -473,7 +472,7 @@ public com.google.logging.v2.ListLogMetricsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (metricsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { metrics_ = java.util.Collections.unmodifiableList(metrics_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -489,35 +488,35 @@ public com.google.logging.v2.ListLogMetricsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -598,7 +597,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureMetricsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { metrics_ = new java.util.ArrayList(metrics_); bitField0_ |= 0x00000001; } @@ -934,10 +933,7 @@ public java.util.List getMetricsBuilder com.google.logging.v2.LogMetric, com.google.logging.v2.LogMetric.Builder, com.google.logging.v2.LogMetricOrBuilder>( - metrics_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + metrics_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); metrics_ = null; } return metricsBuilder_; @@ -1049,7 +1045,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java index 82082366e14d..cfc0d24988b3 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java @@ -24,7 +24,6 @@ private ListLogsRequest(com.google.protobuf.GeneratedMessageV3.Builder builde private ListLogsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListLogsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -278,12 +277,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.ListLogsRequest other = (com.google.logging.v2.ListLogsRequest) 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.logging.v2.ListLogsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -843,7 +841,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-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java index a63f23875bfe..25783b9137ea 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java @@ -61,7 +61,7 @@ private ListLogsResponse( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { logNames_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListLogsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListLogsResponse( } 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)) { logNames_ = logNames_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -267,11 +267,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.ListLogsResponse other = (com.google.logging.v2.ListLogsResponse) obj; - boolean result = true; - result = result && getLogNamesList().equals(other.getLogNamesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLogNamesList().equals(other.getLogNamesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,7 +464,7 @@ public com.google.logging.v2.ListLogsResponse buildPartial() { new com.google.logging.v2.ListLogsResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { logNames_ = logNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -478,35 +477,35 @@ public com.google.logging.v2.ListLogsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -570,7 +569,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLogNamesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { logNames_ = new com.google.protobuf.LazyStringArrayList(logNames_); bitField0_ |= 0x00000001; } @@ -833,7 +832,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-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java index de4f8f556b93..48de9639d0fc 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java @@ -25,7 +25,6 @@ private ListMonitoredResourceDescriptorsRequest( } private ListMonitoredResourceDescriptorsRequest() { - pageSize_ = 0; pageToken_ = ""; } @@ -67,7 +66,7 @@ private ListMonitoredResourceDescriptorsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -216,11 +215,10 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListMonitoredResourceDescriptorsRequest other = (com.google.logging.v2.ListMonitoredResourceDescriptorsRequest) obj; - boolean result = true; - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + 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 @@ -420,35 +418,35 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest 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 @@ -664,7 +662,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-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java index e7660eb49994..3220a7aaecaa 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java @@ -55,7 +55,7 @@ private ListMonitoredResourceDescriptorsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { resourceDescriptors_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -74,7 +74,7 @@ private ListMonitoredResourceDescriptorsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private ListMonitoredResourceDescriptorsResponse( } 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)) { resourceDescriptors_ = java.util.Collections.unmodifiableList(resourceDescriptors_); } this.unknownFields = unknownFields.build(); @@ -274,11 +274,10 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.ListMonitoredResourceDescriptorsResponse other = (com.google.logging.v2.ListMonitoredResourceDescriptorsResponse) obj; - boolean result = true; - result = result && getResourceDescriptorsList().equals(other.getResourceDescriptorsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResourceDescriptorsList().equals(other.getResourceDescriptorsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,7 +480,7 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildParti int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (resourceDescriptorsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { resourceDescriptors_ = java.util.Collections.unmodifiableList(resourceDescriptors_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -497,35 +496,35 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse 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 @@ -610,7 +609,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResourceDescriptorsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { resourceDescriptors_ = new java.util.ArrayList( resourceDescriptors_); @@ -958,7 +957,7 @@ public com.google.api.MonitoredResourceDescriptor.Builder addResourceDescriptors com.google.api.MonitoredResourceDescriptor.Builder, com.google.api.MonitoredResourceDescriptorOrBuilder>( resourceDescriptors_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); resourceDescriptors_ = null; @@ -1072,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-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java index 7309ed1ed10f..bca587d34d71 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java @@ -25,7 +25,6 @@ private ListSinksRequest(com.google.protobuf.GeneratedMessageV3.Builder build private ListSinksRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; } @java.lang.Override @@ -73,7 +72,7 @@ private ListSinksRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -278,12 +277,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.ListSinksRequest other = (com.google.logging.v2.ListSinksRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -486,35 +484,35 @@ public com.google.logging.v2.ListSinksRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -844,7 +842,7 @@ public Builder clearPageSize() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java index 18dd7fccdd69..6c05069f849b 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java @@ -53,7 +53,7 @@ private ListSinksResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { sinks_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListSinksResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListSinksResponse( } 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)) { sinks_ = java.util.Collections.unmodifiableList(sinks_); } this.unknownFields = unknownFields.build(); @@ -266,11 +266,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.ListSinksResponse other = (com.google.logging.v2.ListSinksResponse) obj; - boolean result = true; - result = result && getSinksList().equals(other.getSinksList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSinksList().equals(other.getSinksList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -471,7 +470,7 @@ public com.google.logging.v2.ListSinksResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (sinksBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { sinks_ = java.util.Collections.unmodifiableList(sinks_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -487,35 +486,35 @@ public com.google.logging.v2.ListSinksResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( 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 mergeFrom( java.util.Collections.emptyList(); private void ensureSinksIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { sinks_ = new java.util.ArrayList(sinks_); bitField0_ |= 0x00000001; } @@ -930,10 +929,7 @@ public java.util.List getSinksBuilderList com.google.logging.v2.LogSink, com.google.logging.v2.LogSink.Builder, com.google.logging.v2.LogSinkOrBuilder>( - sinks_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + sinks_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); sinks_ = null; } return sinksBuilder_; @@ -1045,7 +1041,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-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java index 6082d414ce3d..9750a7ec2b01 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java @@ -28,7 +28,6 @@ private LogEntry() { insertId_ = ""; trace_ = ""; spanId_ = ""; - traceSampled_ = false; } @java.lang.Override @@ -152,7 +151,7 @@ private LogEntry( } case 90: { - if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) { + if (!((mutable_bitField0_ & 0x00000400) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000400; @@ -254,7 +253,7 @@ private LogEntry( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1356,59 +1355,57 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.LogEntry other = (com.google.logging.v2.LogEntry) obj; - boolean result = true; - result = result && getLogName().equals(other.getLogName()); - result = result && (hasResource() == other.hasResource()); + if (!getLogName().equals(other.getLogName())) return false; + if (hasResource() != other.hasResource()) return false; if (hasResource()) { - result = result && getResource().equals(other.getResource()); + if (!getResource().equals(other.getResource())) return false; } - result = result && (hasTimestamp() == other.hasTimestamp()); + if (hasTimestamp() != other.hasTimestamp()) return false; if (hasTimestamp()) { - result = result && getTimestamp().equals(other.getTimestamp()); + if (!getTimestamp().equals(other.getTimestamp())) return false; } - result = result && (hasReceiveTimestamp() == other.hasReceiveTimestamp()); + if (hasReceiveTimestamp() != other.hasReceiveTimestamp()) return false; if (hasReceiveTimestamp()) { - result = result && getReceiveTimestamp().equals(other.getReceiveTimestamp()); + if (!getReceiveTimestamp().equals(other.getReceiveTimestamp())) return false; } - result = result && severity_ == other.severity_; - result = result && getInsertId().equals(other.getInsertId()); - result = result && (hasHttpRequest() == other.hasHttpRequest()); + if (severity_ != other.severity_) return false; + if (!getInsertId().equals(other.getInsertId())) return false; + if (hasHttpRequest() != other.hasHttpRequest()) return false; if (hasHttpRequest()) { - result = result && getHttpRequest().equals(other.getHttpRequest()); + if (!getHttpRequest().equals(other.getHttpRequest())) return false; } - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && (hasMetadata() == other.hasMetadata()); + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (hasMetadata() != other.hasMetadata()) return false; if (hasMetadata()) { - result = result && getMetadata().equals(other.getMetadata()); + if (!getMetadata().equals(other.getMetadata())) return false; } - result = result && (hasOperation() == other.hasOperation()); + if (hasOperation() != other.hasOperation()) return false; if (hasOperation()) { - result = result && getOperation().equals(other.getOperation()); + if (!getOperation().equals(other.getOperation())) return false; } - result = result && getTrace().equals(other.getTrace()); - result = result && getSpanId().equals(other.getSpanId()); - result = result && (getTraceSampled() == other.getTraceSampled()); - result = result && (hasSourceLocation() == other.hasSourceLocation()); + if (!getTrace().equals(other.getTrace())) return false; + if (!getSpanId().equals(other.getSpanId())) return false; + if (getTraceSampled() != other.getTraceSampled()) return false; + if (hasSourceLocation() != other.hasSourceLocation()) return false; if (hasSourceLocation()) { - result = result && getSourceLocation().equals(other.getSourceLocation()); + if (!getSourceLocation().equals(other.getSourceLocation())) return false; } - result = result && getPayloadCase().equals(other.getPayloadCase()); - if (!result) return false; + if (!getPayloadCase().equals(other.getPayloadCase())) return false; switch (payloadCase_) { case 2: - result = result && getProtoPayload().equals(other.getProtoPayload()); + if (!getProtoPayload().equals(other.getProtoPayload())) return false; break; case 3: - result = result && getTextPayload().equals(other.getTextPayload()); + if (!getTextPayload().equals(other.getTextPayload())) return false; break; case 6: - result = result && getJsonPayload().equals(other.getJsonPayload()); + if (!getJsonPayload().equals(other.getJsonPayload())) 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 @@ -1794,35 +1791,35 @@ public com.google.logging.v2.LogEntry buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2128,7 +2125,7 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.api.MonitoredResource resource_ = null; + private com.google.api.MonitoredResource resource_; private com.google.protobuf.SingleFieldBuilderV3< com.google.api.MonitoredResource, com.google.api.MonitoredResource.Builder, @@ -2862,7 +2859,7 @@ public com.google.protobuf.StructOrBuilder getJsonPayloadOrBuilder() { return jsonPayloadBuilder_; } - private com.google.protobuf.Timestamp timestamp_ = null; + private com.google.protobuf.Timestamp timestamp_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3136,7 +3133,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() { return timestampBuilder_; } - private com.google.protobuf.Timestamp receiveTimestamp_ = null; + private com.google.protobuf.Timestamp receiveTimestamp_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3517,7 +3514,7 @@ public Builder setInsertIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.logging.type.HttpRequest httpRequest_ = null; + private com.google.logging.type.HttpRequest httpRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.type.HttpRequest, com.google.logging.type.HttpRequest.Builder, @@ -3866,7 +3863,7 @@ public Builder putAllLabels(java.util.Map va return this; } - private com.google.api.MonitoredResourceMetadata metadata_ = null; + private com.google.api.MonitoredResourceMetadata metadata_; private com.google.protobuf.SingleFieldBuilderV3< com.google.api.MonitoredResourceMetadata, com.google.api.MonitoredResourceMetadata.Builder, @@ -4065,7 +4062,7 @@ public com.google.api.MonitoredResourceMetadataOrBuilder getMetadataOrBuilder() return metadataBuilder_; } - private com.google.logging.v2.LogEntryOperation operation_ = null; + private com.google.logging.v2.LogEntryOperation operation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogEntryOperation, com.google.logging.v2.LogEntryOperation.Builder, @@ -4532,7 +4529,7 @@ public Builder clearTraceSampled() { return this; } - private com.google.logging.v2.LogEntrySourceLocation sourceLocation_ = null; + private com.google.logging.v2.LogEntrySourceLocation sourceLocation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogEntrySourceLocation, com.google.logging.v2.LogEntrySourceLocation.Builder, @@ -4725,7 +4722,7 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java index bcf252d533d3..aedee00024a1 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java @@ -26,8 +26,6 @@ private LogEntryOperation(com.google.protobuf.GeneratedMessageV3.Builder buil private LogEntryOperation() { id_ = ""; producer_ = ""; - first_ = false; - last_ = false; } @java.lang.Override @@ -80,7 +78,7 @@ private LogEntryOperation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -296,13 +294,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.LogEntryOperation other = (com.google.logging.v2.LogEntryOperation) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getProducer().equals(other.getProducer()); - result = result && (getFirst() == other.getFirst()); - result = result && (getLast() == other.getLast()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getId().equals(other.getId())) return false; + if (!getProducer().equals(other.getProducer())) return false; + if (getFirst() != other.getFirst()) return false; + if (getLast() != other.getLast()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -511,35 +508,35 @@ public com.google.logging.v2.LogEntryOperation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -890,7 +887,7 @@ public Builder clearLast() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java index 8db0f8ccf805..c61e7ce19666 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java @@ -25,7 +25,6 @@ private LogEntrySourceLocation(com.google.protobuf.GeneratedMessageV3.Builder private LogEntrySourceLocation() { file_ = ""; - line_ = 0L; function_ = ""; } @@ -74,7 +73,7 @@ private LogEntrySourceLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -277,12 +276,11 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.LogEntrySourceLocation other = (com.google.logging.v2.LogEntrySourceLocation) obj; - boolean result = true; - result = result && getFile().equals(other.getFile()); - result = result && (getLine() == other.getLine()); - result = result && getFunction().equals(other.getFunction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFile().equals(other.getFile())) return false; + if (getLine() != other.getLine()) return false; + if (!getFunction().equals(other.getFunction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -486,35 +484,35 @@ public com.google.logging.v2.LogEntrySourceLocation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -836,7 +834,7 @@ public Builder setFunctionBytes(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-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java index 9ec4db1107cd..5f5d47f8d540 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java @@ -31,7 +31,6 @@ private LogExclusion() { name_ = ""; description_ = ""; filter_ = ""; - disabled_ = false; } @java.lang.Override @@ -86,7 +85,7 @@ private LogExclusion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -345,13 +344,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.LogExclusion other = (com.google.logging.v2.LogExclusion) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDescription().equals(other.getDescription()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getDisabled() == other.getDisabled()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getDisabled() != other.getDisabled()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -562,35 +560,35 @@ public com.google.logging.v2.LogExclusion buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1031,7 +1029,7 @@ public Builder clearDisabled() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java index 20260bfadf74..9285cb007e73 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java @@ -111,7 +111,7 @@ private LogMetric( } case 58: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { labelExtractors_ = com.google.protobuf.MapField.newMapField( LabelExtractorsDefaultEntryHolder.defaultEntry); @@ -144,7 +144,7 @@ private LogMetric( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -948,23 +948,22 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.LogMetric other = (com.google.logging.v2.LogMetric) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDescription().equals(other.getDescription()); - result = result && getFilter().equals(other.getFilter()); - result = result && (hasMetricDescriptor() == other.hasMetricDescriptor()); + if (!getName().equals(other.getName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (hasMetricDescriptor() != other.hasMetricDescriptor()) return false; if (hasMetricDescriptor()) { - result = result && getMetricDescriptor().equals(other.getMetricDescriptor()); + if (!getMetricDescriptor().equals(other.getMetricDescriptor())) return false; } - result = result && getValueExtractor().equals(other.getValueExtractor()); - result = result && internalGetLabelExtractors().equals(other.internalGetLabelExtractors()); - result = result && (hasBucketOptions() == other.hasBucketOptions()); + if (!getValueExtractor().equals(other.getValueExtractor())) return false; + if (!internalGetLabelExtractors().equals(other.internalGetLabelExtractors())) return false; + if (hasBucketOptions() != other.hasBucketOptions()) return false; if (hasBucketOptions()) { - result = result && getBucketOptions().equals(other.getBucketOptions()); + if (!getBucketOptions().equals(other.getBucketOptions())) return false; } - result = result && version_ == other.version_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (version_ != other.version_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1239,35 +1238,35 @@ public com.google.logging.v2.LogMetric buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1701,7 +1700,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.api.MetricDescriptor metricDescriptor_ = null; + private com.google.api.MetricDescriptor metricDescriptor_; private com.google.protobuf.SingleFieldBuilderV3< com.google.api.MetricDescriptor, com.google.api.MetricDescriptor.Builder, @@ -2433,7 +2432,7 @@ public Builder putAllLabelExtractors(java.util.Map buil private UpdateSinkRequest() { sinkName_ = ""; - uniqueWriterIdentity_ = false; } @java.lang.Override @@ -94,7 +93,7 @@ private UpdateSinkRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -379,19 +378,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.logging.v2.UpdateSinkRequest other = (com.google.logging.v2.UpdateSinkRequest) obj; - boolean result = true; - result = result && getSinkName().equals(other.getSinkName()); - result = result && (hasSink() == other.hasSink()); + if (!getSinkName().equals(other.getSinkName())) return false; + if (hasSink() != other.hasSink()) return false; if (hasSink()) { - result = result && getSink().equals(other.getSink()); + if (!getSink().equals(other.getSink())) return false; } - result = result && (getUniqueWriterIdentity() == other.getUniqueWriterIdentity()); - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (getUniqueWriterIdentity() != other.getUniqueWriterIdentity()) 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 @@ -619,35 +617,35 @@ public com.google.logging.v2.UpdateSinkRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -828,7 +826,7 @@ public Builder setSinkNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.logging.v2.LogSink sink_ = null; + private com.google.logging.v2.LogSink sink_; private com.google.protobuf.SingleFieldBuilderV3< com.google.logging.v2.LogSink, com.google.logging.v2.LogSink.Builder, @@ -1085,7 +1083,7 @@ public Builder clearUniqueWriterIdentity() { 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, @@ -1356,7 +1354,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-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java index 66c69e8337c0..7afe59907418 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java @@ -50,7 +50,7 @@ private WriteLogEntriesPartialErrors( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { logEntryErrors_ = com.google.protobuf.MapField.newMapField( LogEntryErrorsDefaultEntryHolder.defaultEntry); @@ -68,7 +68,7 @@ private WriteLogEntriesPartialErrors( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,10 +272,9 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.WriteLogEntriesPartialErrors other = (com.google.logging.v2.WriteLogEntriesPartialErrors) obj; - boolean result = true; - result = result && internalGetLogEntryErrors().equals(other.internalGetLogEntryErrors()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetLogEntryErrors().equals(other.internalGetLogEntryErrors())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -491,35 +490,35 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -746,7 +745,7 @@ public Builder putAllLogEntryErrors( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java index aa450dc1d997..84f77d014caa 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java @@ -25,8 +25,6 @@ private WriteLogEntriesRequest(com.google.protobuf.GeneratedMessageV3.Builder private WriteLogEntriesRequest() { logName_ = ""; entries_ = java.util.Collections.emptyList(); - partialSuccess_ = false; - dryRun_ = false; } @java.lang.Override @@ -77,7 +75,7 @@ private WriteLogEntriesRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000004; @@ -90,7 +88,7 @@ private WriteLogEntriesRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { entries_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -110,7 +108,7 @@ private WriteLogEntriesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -122,7 +120,7 @@ private WriteLogEntriesRequest( } 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)) { entries_ = java.util.Collections.unmodifiableList(entries_); } this.unknownFields = unknownFields.build(); @@ -659,18 +657,17 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.WriteLogEntriesRequest other = (com.google.logging.v2.WriteLogEntriesRequest) obj; - boolean result = true; - result = result && getLogName().equals(other.getLogName()); - result = result && (hasResource() == other.hasResource()); + if (!getLogName().equals(other.getLogName())) return false; + if (hasResource() != other.hasResource()) return false; if (hasResource()) { - result = result && getResource().equals(other.getResource()); - } - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && getEntriesList().equals(other.getEntriesList()); - result = result && (getPartialSuccess() == other.getPartialSuccess()); - result = result && (getDryRun() == other.getDryRun()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResource().equals(other.getResource())) return false; + } + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!getEntriesList().equals(other.getEntriesList())) return false; + if (getPartialSuccess() != other.getPartialSuccess()) return false; + if (getDryRun() != other.getDryRun()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -922,7 +919,7 @@ public com.google.logging.v2.WriteLogEntriesRequest buildPartial() { result.labels_ = internalGetLabels(); result.labels_.makeImmutable(); if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -939,35 +936,35 @@ public com.google.logging.v2.WriteLogEntriesRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1208,7 +1205,7 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.api.MonitoredResource resource_ = null; + private com.google.api.MonitoredResource resource_; private com.google.protobuf.SingleFieldBuilderV3< com.google.api.MonitoredResource, com.google.api.MonitoredResource.Builder, @@ -1611,7 +1608,7 @@ public Builder putAllLabels(java.util.Map va java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { entries_ = new java.util.ArrayList(entries_); bitField0_ |= 0x00000008; } @@ -2289,10 +2286,7 @@ public java.util.List getEntriesBuilderL com.google.logging.v2.LogEntry, com.google.logging.v2.LogEntry.Builder, com.google.logging.v2.LogEntryOrBuilder>( - entries_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + entries_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; @@ -2406,7 +2400,7 @@ public Builder clearDryRun() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java index 30b2e5871998..cc4019c47909 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java @@ -50,7 +50,7 @@ private WriteLogEntriesResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { com.google.logging.v2.WriteLogEntriesResponse other = (com.google.logging.v2.WriteLogEntriesResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -312,35 +311,35 @@ public com.google.logging.v2.WriteLogEntriesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -386,7 +385,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-logging/synth.metadata b/google-cloud-clients/google-cloud-logging/synth.metadata index c7439d108386..a2937c8617c6 100644 --- a/google-cloud-clients/google-cloud-logging/synth.metadata +++ b/google-cloud-clients/google-cloud-logging/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:49:07.553230Z", + "updateTime": "2019-03-29T07:49:46.160589Z", "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" } } ],