diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java index 4001dd39bb56..d37c7fa4f1bc 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java @@ -67,7 +67,7 @@ private GetTraceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -236,11 +236,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v1.GetTraceRequest other = (com.google.devtools.cloudtrace.v1.GetTraceRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getTraceId().equals(other.getTraceId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getTraceId().equals(other.getTraceId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -438,35 +437,35 @@ public com.google.devtools.cloudtrace.v1.GetTraceRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -710,7 +709,7 @@ public Builder setTraceIdBytes(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-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java index 0d51cac34fb1..fe44ce34101d 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java @@ -26,7 +26,6 @@ private ListTracesRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private ListTracesRequest() { projectId_ = ""; view_ = 0; - pageSize_ = 0; pageToken_ = ""; filter_ = ""; orderBy_ = ""; @@ -128,7 +127,7 @@ private ListTracesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -809,23 +808,22 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v1.ListTracesRequest other = (com.google.devtools.cloudtrace.v1.ListTracesRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && view_ == other.view_; - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (hasStartTime() == other.hasStartTime()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (view_ != other.view_) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && getFilter().equals(other.getFilter()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFilter().equals(other.getFilter())) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1074,35 +1072,35 @@ public com.google.devtools.cloudtrace.v1.ListTracesRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1502,7 +1500,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1686,7 +1684,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2240,7 +2238,7 @@ public Builder setOrderByBytes(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-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java index 56b72f64bd72..bdfef799269f 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java @@ -53,7 +53,7 @@ private ListTracesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { traces_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListTracesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListTracesResponse( } 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)) { traces_ = java.util.Collections.unmodifiableList(traces_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v1.ListTracesResponse other = (com.google.devtools.cloudtrace.v1.ListTracesResponse) obj; - boolean result = true; - result = result && getTracesList().equals(other.getTracesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTracesList().equals(other.getTracesList())) 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.devtools.cloudtrace.v1.ListTracesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (tracesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { traces_ = java.util.Collections.unmodifiableList(traces_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -490,35 +489,35 @@ public com.google.devtools.cloudtrace.v1.ListTracesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -601,7 +600,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureTracesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { traces_ = new java.util.ArrayList(traces_); bitField0_ |= 0x00000001; } @@ -939,10 +938,7 @@ public java.util.List getTraces com.google.devtools.cloudtrace.v1.Trace, com.google.devtools.cloudtrace.v1.Trace.Builder, com.google.devtools.cloudtrace.v1.TraceOrBuilder>( - traces_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + traces_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); traces_ = null; } return tracesBuilder_; @@ -1054,7 +1050,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java index a9be21cfe609..bf0f8a42cf03 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java @@ -75,7 +75,7 @@ private PatchTracesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,14 +242,13 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v1.PatchTracesRequest other = (com.google.devtools.cloudtrace.v1.PatchTracesRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && (hasTraces() == other.hasTraces()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (hasTraces() != other.hasTraces()) return false; if (hasTraces()) { - result = result && getTraces().equals(other.getTraces()); + if (!getTraces().equals(other.getTraces())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -457,35 +456,35 @@ public com.google.devtools.cloudtrace.v1.PatchTracesRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -632,7 +631,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.devtools.cloudtrace.v1.Traces traces_ = null; + private com.google.devtools.cloudtrace.v1.Traces traces_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v1.Traces, com.google.devtools.cloudtrace.v1.Traces.Builder, @@ -815,7 +814,7 @@ public com.google.devtools.cloudtrace.v1.TracesOrBuilder getTracesOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java index 453bbb4932b0..bec438a1e6b2 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java @@ -70,7 +70,7 @@ private Trace( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { spans_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -81,7 +81,7 @@ private Trace( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -93,7 +93,7 @@ private Trace( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { spans_ = java.util.Collections.unmodifiableList(spans_); } this.unknownFields = unknownFields.build(); @@ -325,12 +325,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.devtools.cloudtrace.v1.Trace other = (com.google.devtools.cloudtrace.v1.Trace) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getTraceId().equals(other.getTraceId()); - result = result && getSpansList().equals(other.getSpansList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getTraceId().equals(other.getTraceId())) return false; + if (!getSpansList().equals(other.getSpansList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -539,7 +538,7 @@ public com.google.devtools.cloudtrace.v1.Trace buildPartial() { result.projectId_ = projectId_; result.traceId_ = traceId_; if (spansBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { spans_ = java.util.Collections.unmodifiableList(spans_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -554,35 +553,35 @@ public com.google.devtools.cloudtrace.v1.Trace buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -860,7 +859,7 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSpansIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { spans_ = new java.util.ArrayList(spans_); bitField0_ |= 0x00000004; } @@ -1199,10 +1198,7 @@ public com.google.devtools.cloudtrace.v1.TraceSpan.Builder addSpansBuilder(int i com.google.devtools.cloudtrace.v1.TraceSpan, com.google.devtools.cloudtrace.v1.TraceSpan.Builder, com.google.devtools.cloudtrace.v1.TraceSpanOrBuilder>( - spans_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + spans_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); spans_ = null; } return spansBuilder_; @@ -1210,7 +1206,7 @@ public com.google.devtools.cloudtrace.v1.TraceSpan.Builder addSpansBuilder(int i @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java index 4e951bdedd98..029c328f3d2c 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java @@ -27,10 +27,8 @@ private TraceSpan(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private TraceSpan() { - spanId_ = 0L; kind_ = 0; name_ = ""; - parentSpanId_ = 0L; } @java.lang.Override @@ -113,7 +111,7 @@ private TraceSpan( } case 58: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000040; @@ -126,7 +124,7 @@ private TraceSpan( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -822,22 +820,21 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v1.TraceSpan other = (com.google.devtools.cloudtrace.v1.TraceSpan) obj; - boolean result = true; - result = result && (getSpanId() == other.getSpanId()); - result = result && kind_ == other.kind_; - result = result && getName().equals(other.getName()); - result = result && (hasStartTime() == other.hasStartTime()); + if (getSpanId() != other.getSpanId()) return false; + if (kind_ != other.kind_) return false; + if (!getName().equals(other.getName())) return false; + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && (getParentSpanId() == other.getParentSpanId()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getParentSpanId() != other.getParentSpanId()) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1109,35 +1106,35 @@ public com.google.devtools.cloudtrace.v1.TraceSpan buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1462,7 +1459,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1637,7 +1634,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2220,7 +2217,7 @@ public Builder putAllLabels(java.util.Map va @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java index a2999414af8b..7690527d88d1 100644 --- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java +++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java @@ -52,7 +52,7 @@ private Traces( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { traces_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private Traces( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private Traces( } 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)) { traces_ = java.util.Collections.unmodifiableList(traces_); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.devtools.cloudtrace.v1.Traces other = (com.google.devtools.cloudtrace.v1.Traces) obj; - boolean result = true; - result = result && getTracesList().equals(other.getTracesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTracesList().equals(other.getTracesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -405,7 +404,7 @@ public com.google.devtools.cloudtrace.v1.Traces buildPartial() { new com.google.devtools.cloudtrace.v1.Traces(this); int from_bitField0_ = bitField0_; if (tracesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { traces_ = java.util.Collections.unmodifiableList(traces_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -419,35 +418,35 @@ public com.google.devtools.cloudtrace.v1.Traces buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -524,7 +523,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureTracesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { traces_ = new java.util.ArrayList(traces_); bitField0_ |= 0x00000001; } @@ -862,10 +861,7 @@ public java.util.List getTraces com.google.devtools.cloudtrace.v1.Trace, com.google.devtools.cloudtrace.v1.Trace.Builder, com.google.devtools.cloudtrace.v1.TraceOrBuilder>( - traces_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + traces_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); traces_ = null; } return tracesBuilder_; @@ -873,7 +869,7 @@ public java.util.List getTraces @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java index 175386b5b77b..b612f057b4bf 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java @@ -80,7 +80,7 @@ private AttributeValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -296,24 +296,22 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.AttributeValue other = (com.google.devtools.cloudtrace.v2.AttributeValue) obj; - boolean result = true; - result = result && getValueCase().equals(other.getValueCase()); - if (!result) return false; + if (!getValueCase().equals(other.getValueCase())) return false; switch (valueCase_) { case 1: - result = result && getStringValue().equals(other.getStringValue()); + if (!getStringValue().equals(other.getStringValue())) return false; break; case 2: - result = result && (getIntValue() == other.getIntValue()); + if (getIntValue() != other.getIntValue()) return false; break; case 3: - result = result && (getBoolValue() == other.getBoolValue()); + if (getBoolValue() != other.getBoolValue()) 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 @@ -533,35 +531,35 @@ public com.google.devtools.cloudtrace.v2.AttributeValue buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -941,7 +939,7 @@ public Builder clearBoolValue() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java index 83fd1fcb7c8a..2bb2156a3dfb 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java @@ -60,7 +60,7 @@ private BatchWriteSpansRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { spans_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private BatchWriteSpansRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private BatchWriteSpansRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { spans_ = java.util.Collections.unmodifiableList(spans_); } this.unknownFields = unknownFields.build(); @@ -272,11 +272,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest other = (com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getSpansList().equals(other.getSpansList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getSpansList().equals(other.getSpansList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,7 +478,7 @@ public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (spansBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { spans_ = java.util.Collections.unmodifiableList(spans_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -494,35 +493,35 @@ public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -704,7 +703,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureSpansIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { spans_ = new java.util.ArrayList(spans_); bitField0_ |= 0x00000002; } @@ -1060,10 +1059,7 @@ public java.util.List getSpansBu com.google.devtools.cloudtrace.v2.Span, com.google.devtools.cloudtrace.v2.Span.Builder, com.google.devtools.cloudtrace.v2.SpanOrBuilder>( - spans_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + spans_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); spans_ = null; } return spansBuilder_; @@ -1071,7 +1067,7 @@ public java.util.List getSpansBu @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java index 40b945f82d18..cfeec8d78c51 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java @@ -84,7 +84,7 @@ private Module( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -254,17 +254,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.devtools.cloudtrace.v2.Module other = (com.google.devtools.cloudtrace.v2.Module) obj; - boolean result = true; - result = result && (hasModule() == other.hasModule()); + if (hasModule() != other.hasModule()) return false; if (hasModule()) { - result = result && getModule().equals(other.getModule()); + if (!getModule().equals(other.getModule())) return false; } - result = result && (hasBuildId() == other.hasBuildId()); + if (hasBuildId() != other.hasBuildId()) return false; if (hasBuildId()) { - result = result && getBuildId().equals(other.getBuildId()); + if (!getBuildId().equals(other.getBuildId())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,35 +481,35 @@ public com.google.devtools.cloudtrace.v2.Module buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -560,7 +559,7 @@ public Builder mergeFrom( return this; } - private com.google.devtools.cloudtrace.v2.TruncatableString module_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString module_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -751,7 +750,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getModuleOrB return moduleBuilder_; } - private com.google.devtools.cloudtrace.v2.TruncatableString buildId_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString buildId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -944,7 +943,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getBuildIdOr @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java index 267f38bdc171..976bfc5263bb 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java @@ -237,7 +237,7 @@ private Span( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -398,9 +398,7 @@ private Attributes(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Attributes() { - droppedAttributesCount_ = 0; - } + private Attributes() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -428,7 +426,7 @@ private Attributes( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { attributeMap_ = com.google.protobuf.MapField.newMapField( AttributeMapDefaultEntryHolder.defaultEntry); @@ -452,7 +450,7 @@ private Attributes( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -708,11 +706,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.Attributes other = (com.google.devtools.cloudtrace.v2.Span.Attributes) obj; - boolean result = true; - result = result && internalGetAttributeMap().equals(other.internalGetAttributeMap()); - result = result && (getDroppedAttributesCount() == other.getDroppedAttributesCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetAttributeMap().equals(other.internalGetAttributeMap())) return false; + if (getDroppedAttributesCount() != other.getDroppedAttributesCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -937,23 +934,23 @@ public com.google.devtools.cloudtrace.v2.Span.Attributes buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -961,13 +958,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1289,7 +1286,7 @@ public Builder clearDroppedAttributesCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1543,7 +1540,7 @@ private TimeEvent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1729,7 +1726,7 @@ private Annotation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1902,17 +1899,16 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation other = (com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation) obj; - boolean result = true; - result = result && (hasDescription() == other.hasDescription()); + if (hasDescription() != other.hasDescription()) return false; if (hasDescription()) { - result = result && getDescription().equals(other.getDescription()); + if (!getDescription().equals(other.getDescription())) return false; } - result = result && (hasAttributes() == other.hasAttributes()); + if (hasAttributes() != other.hasAttributes()) return false; if (hasAttributes()) { - result = result && getAttributes().equals(other.getAttributes()); + if (!getAttributes().equals(other.getAttributes())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2134,23 +2130,23 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -2158,13 +2154,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2219,7 +2215,7 @@ public Builder mergeFrom( return this; } - private com.google.devtools.cloudtrace.v2.TruncatableString description_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString description_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -2411,7 +2407,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableString.Builder getDescriptio return descriptionBuilder_; } - private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_ = null; + private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Span.Attributes, com.google.devtools.cloudtrace.v2.Span.Attributes.Builder, @@ -2605,7 +2601,7 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2742,9 +2738,6 @@ private MessageEvent(com.google.protobuf.GeneratedMessageV3.Builder builder) private MessageEvent() { type_ = 0; - id_ = 0L; - uncompressedSizeBytes_ = 0L; - compressedSizeBytes_ = 0L; } @java.lang.Override @@ -2795,7 +2788,7 @@ private MessageEvent( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -3125,13 +3118,12 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent other = (com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent) obj; - boolean result = true; - result = result && type_ == other.type_; - result = result && (getId() == other.getId()); - result = result && (getUncompressedSizeBytes() == other.getUncompressedSizeBytes()); - result = result && (getCompressedSizeBytes() == other.getCompressedSizeBytes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (type_ != other.type_) return false; + if (getId() != other.getId()) return false; + if (getUncompressedSizeBytes() != other.getUncompressedSizeBytes()) return false; + if (getCompressedSizeBytes() != other.getCompressedSizeBytes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3346,23 +3338,23 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent 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 @@ -3370,13 +3362,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3665,7 +3657,7 @@ public Builder clearCompressedSizeBytes() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3949,25 +3941,23 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.TimeEvent other = (com.google.devtools.cloudtrace.v2.Span.TimeEvent) obj; - boolean result = true; - result = result && (hasTime() == other.hasTime()); + if (hasTime() != other.hasTime()) return false; if (hasTime()) { - result = result && getTime().equals(other.getTime()); + if (!getTime().equals(other.getTime())) return false; } - result = result && getValueCase().equals(other.getValueCase()); - if (!result) return false; + if (!getValueCase().equals(other.getValueCase())) return false; switch (valueCase_) { case 2: - result = result && getAnnotation().equals(other.getAnnotation()); + if (!getAnnotation().equals(other.getAnnotation())) return false; break; case 3: - result = result && getMessageEvent().equals(other.getMessageEvent()); + if (!getMessageEvent().equals(other.getMessageEvent())) 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 @@ -4201,23 +4191,23 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -4225,13 +4215,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -4310,7 +4300,7 @@ public Builder clearValue() { return this; } - private com.google.protobuf.Timestamp time_ = null; + private com.google.protobuf.Timestamp time_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -4905,7 +4895,7 @@ public Builder clearMessageEvent() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -5058,8 +5048,6 @@ private TimeEvents(com.google.protobuf.GeneratedMessageV3.Builder builder) { private TimeEvents() { timeEvent_ = java.util.Collections.emptyList(); - droppedAnnotationsCount_ = 0; - droppedMessageEventsCount_ = 0; } @java.lang.Override @@ -5088,7 +5076,7 @@ private TimeEvents( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { timeEvent_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -5111,7 +5099,7 @@ private TimeEvents( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -5123,7 +5111,7 @@ private TimeEvents( } 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)) { timeEvent_ = java.util.Collections.unmodifiableList(timeEvent_); } this.unknownFields = unknownFields.build(); @@ -5302,12 +5290,11 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.TimeEvents other = (com.google.devtools.cloudtrace.v2.Span.TimeEvents) obj; - boolean result = true; - result = result && getTimeEventList().equals(other.getTimeEventList()); - result = result && (getDroppedAnnotationsCount() == other.getDroppedAnnotationsCount()); - result = result && (getDroppedMessageEventsCount() == other.getDroppedMessageEventsCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTimeEventList().equals(other.getTimeEventList())) return false; + if (getDroppedAnnotationsCount() != other.getDroppedAnnotationsCount()) return false; + if (getDroppedMessageEventsCount() != other.getDroppedMessageEventsCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -5516,7 +5503,7 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvents buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (timeEventBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { timeEvent_ = java.util.Collections.unmodifiableList(timeEvent_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -5533,23 +5520,23 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvents buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -5557,13 +5544,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -5648,7 +5635,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureTimeEventIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { timeEvent_ = new java.util.ArrayList(timeEvent_); bitField0_ |= 0x00000001; @@ -5995,10 +5982,7 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Builder addTimeEventBuil com.google.devtools.cloudtrace.v2.Span.TimeEvent, com.google.devtools.cloudtrace.v2.Span.TimeEvent.Builder, com.google.devtools.cloudtrace.v2.Span.TimeEventOrBuilder>( - timeEvent_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + timeEvent_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); timeEvent_ = null; } return timeEventBuilder_; @@ -6101,7 +6085,7 @@ public Builder clearDroppedMessageEventsCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6344,7 +6328,7 @@ private Link( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6747,16 +6731,15 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.Link other = (com.google.devtools.cloudtrace.v2.Span.Link) obj; - boolean result = true; - result = result && getTraceId().equals(other.getTraceId()); - result = result && getSpanId().equals(other.getSpanId()); - result = result && type_ == other.type_; - result = result && (hasAttributes() == other.hasAttributes()); + if (!getTraceId().equals(other.getTraceId())) return false; + if (!getSpanId().equals(other.getSpanId())) return false; + if (type_ != other.type_) return false; + if (hasAttributes() != other.hasAttributes()) return false; if (hasAttributes()) { - result = result && getAttributes().equals(other.getAttributes()); + if (!getAttributes().equals(other.getAttributes())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -6979,23 +6962,23 @@ public com.google.devtools.cloudtrace.v2.Span.Link buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -7003,13 +6986,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -7333,7 +7316,7 @@ public Builder clearType() { return this; } - private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_ = null; + private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Span.Attributes, com.google.devtools.cloudtrace.v2.Span.Attributes.Builder, @@ -7527,7 +7510,7 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -7667,7 +7650,6 @@ private Links(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Links() { link_ = java.util.Collections.emptyList(); - droppedLinksCount_ = 0; } @java.lang.Override @@ -7696,7 +7678,7 @@ private Links( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { link_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -7712,7 +7694,7 @@ private Links( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7724,7 +7706,7 @@ private Links( } 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)) { link_ = java.util.Collections.unmodifiableList(link_); } this.unknownFields = unknownFields.build(); @@ -7879,11 +7861,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.Span.Links other = (com.google.devtools.cloudtrace.v2.Span.Links) obj; - boolean result = true; - result = result && getLinkList().equals(other.getLinkList()); - result = result && (getDroppedLinksCount() == other.getDroppedLinksCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLinkList().equals(other.getLinkList())) return false; + if (getDroppedLinksCount() != other.getDroppedLinksCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8087,7 +8068,7 @@ public com.google.devtools.cloudtrace.v2.Span.Links buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (linkBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { link_ = java.util.Collections.unmodifiableList(link_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -8103,23 +8084,23 @@ public com.google.devtools.cloudtrace.v2.Span.Links buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -8127,13 +8108,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -8213,7 +8194,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureLinkIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { link_ = new java.util.ArrayList(link_); bitField0_ |= 0x00000001; } @@ -8552,10 +8533,7 @@ public com.google.devtools.cloudtrace.v2.Span.Link.Builder addLinkBuilder(int in com.google.devtools.cloudtrace.v2.Span.Link, com.google.devtools.cloudtrace.v2.Span.Link.Builder, com.google.devtools.cloudtrace.v2.Span.LinkOrBuilder>( - link_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + link_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); link_ = null; } return linkBuilder_; @@ -8611,7 +8589,7 @@ public Builder clearDroppedLinksCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -9371,52 +9349,51 @@ public boolean equals(final java.lang.Object obj) { } com.google.devtools.cloudtrace.v2.Span other = (com.google.devtools.cloudtrace.v2.Span) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getSpanId().equals(other.getSpanId()); - result = result && getParentSpanId().equals(other.getParentSpanId()); - result = result && (hasDisplayName() == other.hasDisplayName()); + if (!getName().equals(other.getName())) return false; + if (!getSpanId().equals(other.getSpanId())) return false; + if (!getParentSpanId().equals(other.getParentSpanId())) return false; + if (hasDisplayName() != other.hasDisplayName()) return false; if (hasDisplayName()) { - result = result && getDisplayName().equals(other.getDisplayName()); + if (!getDisplayName().equals(other.getDisplayName())) return false; } - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && (hasAttributes() == other.hasAttributes()); + if (hasAttributes() != other.hasAttributes()) return false; if (hasAttributes()) { - result = result && getAttributes().equals(other.getAttributes()); + if (!getAttributes().equals(other.getAttributes())) return false; } - result = result && (hasStackTrace() == other.hasStackTrace()); + if (hasStackTrace() != other.hasStackTrace()) return false; if (hasStackTrace()) { - result = result && getStackTrace().equals(other.getStackTrace()); + if (!getStackTrace().equals(other.getStackTrace())) return false; } - result = result && (hasTimeEvents() == other.hasTimeEvents()); + if (hasTimeEvents() != other.hasTimeEvents()) return false; if (hasTimeEvents()) { - result = result && getTimeEvents().equals(other.getTimeEvents()); + if (!getTimeEvents().equals(other.getTimeEvents())) return false; } - result = result && (hasLinks() == other.hasLinks()); + if (hasLinks() != other.hasLinks()) return false; if (hasLinks()) { - result = result && getLinks().equals(other.getLinks()); + if (!getLinks().equals(other.getLinks())) return false; } - result = result && (hasStatus() == other.hasStatus()); + if (hasStatus() != other.hasStatus()) return false; if (hasStatus()) { - result = result && getStatus().equals(other.getStatus()); + if (!getStatus().equals(other.getStatus())) return false; } - result = result && (hasSameProcessAsParentSpan() == other.hasSameProcessAsParentSpan()); + if (hasSameProcessAsParentSpan() != other.hasSameProcessAsParentSpan()) return false; if (hasSameProcessAsParentSpan()) { - result = result && getSameProcessAsParentSpan().equals(other.getSameProcessAsParentSpan()); + if (!getSameProcessAsParentSpan().equals(other.getSameProcessAsParentSpan())) return false; } - result = result && (hasChildSpanCount() == other.hasChildSpanCount()); + if (hasChildSpanCount() != other.hasChildSpanCount()) return false; if (hasChildSpanCount()) { - result = result && getChildSpanCount().equals(other.getChildSpanCount()); + if (!getChildSpanCount().equals(other.getChildSpanCount())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9774,35 +9751,35 @@ public com.google.devtools.cloudtrace.v2.Span buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -10200,7 +10177,7 @@ public Builder setParentSpanIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.devtools.cloudtrace.v2.TruncatableString displayName_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString displayName_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -10436,7 +10413,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getDisplayNa return displayNameBuilder_; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -10629,7 +10606,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -10822,7 +10799,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { return endTimeBuilder_; } - private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_ = null; + private com.google.devtools.cloudtrace.v2.Span.Attributes attributes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Span.Attributes, com.google.devtools.cloudtrace.v2.Span.Attributes.Builder, @@ -11013,7 +10990,7 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO return attributesBuilder_; } - private com.google.devtools.cloudtrace.v2.StackTrace stackTrace_ = null; + private com.google.devtools.cloudtrace.v2.StackTrace stackTrace_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.StackTrace, com.google.devtools.cloudtrace.v2.StackTrace.Builder, @@ -11195,7 +11172,7 @@ public com.google.devtools.cloudtrace.v2.StackTraceOrBuilder getStackTraceOrBuil return stackTraceBuilder_; } - private com.google.devtools.cloudtrace.v2.Span.TimeEvents timeEvents_ = null; + private com.google.devtools.cloudtrace.v2.Span.TimeEvents timeEvents_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Span.TimeEvents, com.google.devtools.cloudtrace.v2.Span.TimeEvents.Builder, @@ -11386,7 +11363,7 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEventsOrBuilder getTimeEventsO return timeEventsBuilder_; } - private com.google.devtools.cloudtrace.v2.Span.Links links_ = null; + private com.google.devtools.cloudtrace.v2.Span.Links links_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Span.Links, com.google.devtools.cloudtrace.v2.Span.Links.Builder, @@ -11567,7 +11544,7 @@ public com.google.devtools.cloudtrace.v2.Span.LinksOrBuilder getLinksOrBuilder() return linksBuilder_; } - private com.google.rpc.Status status_ = null; + private com.google.rpc.Status status_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> statusBuilder_; @@ -11736,7 +11713,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() { return statusBuilder_; } - private com.google.protobuf.BoolValue sameProcessAsParentSpan_ = null; + private com.google.protobuf.BoolValue sameProcessAsParentSpan_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.BoolValue, com.google.protobuf.BoolValue.Builder, @@ -11945,7 +11922,7 @@ public com.google.protobuf.BoolValueOrBuilder getSameProcessAsParentSpanOrBuilde return sameProcessAsParentSpanBuilder_; } - private com.google.protobuf.Int32Value childSpanCount_ = null; + private com.google.protobuf.Int32Value childSpanCount_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, @@ -12137,7 +12114,7 @@ public com.google.protobuf.Int32ValueOrBuilder getChildSpanCountOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java index d90023b2332e..0a87f8807eb5 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java @@ -22,9 +22,7 @@ private StackTrace(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private StackTrace() { - stackTraceHashId_ = 0L; - } + private StackTrace() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -74,7 +72,7 @@ private StackTrace( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -320,10 +318,7 @@ private StackFrame(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private StackFrame() { - lineNumber_ = 0L; - columnNumber_ = 0L; - } + private StackFrame() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -445,7 +440,7 @@ private StackFrame( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -809,31 +804,30 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.StackTrace.StackFrame other = (com.google.devtools.cloudtrace.v2.StackTrace.StackFrame) obj; - boolean result = true; - result = result && (hasFunctionName() == other.hasFunctionName()); + if (hasFunctionName() != other.hasFunctionName()) return false; if (hasFunctionName()) { - result = result && getFunctionName().equals(other.getFunctionName()); + if (!getFunctionName().equals(other.getFunctionName())) return false; } - result = result && (hasOriginalFunctionName() == other.hasOriginalFunctionName()); + if (hasOriginalFunctionName() != other.hasOriginalFunctionName()) return false; if (hasOriginalFunctionName()) { - result = result && getOriginalFunctionName().equals(other.getOriginalFunctionName()); + if (!getOriginalFunctionName().equals(other.getOriginalFunctionName())) return false; } - result = result && (hasFileName() == other.hasFileName()); + if (hasFileName() != other.hasFileName()) return false; if (hasFileName()) { - result = result && getFileName().equals(other.getFileName()); + if (!getFileName().equals(other.getFileName())) return false; } - result = result && (getLineNumber() == other.getLineNumber()); - result = result && (getColumnNumber() == other.getColumnNumber()); - result = result && (hasLoadModule() == other.hasLoadModule()); + if (getLineNumber() != other.getLineNumber()) return false; + if (getColumnNumber() != other.getColumnNumber()) return false; + if (hasLoadModule() != other.hasLoadModule()) return false; if (hasLoadModule()) { - result = result && getLoadModule().equals(other.getLoadModule()); + if (!getLoadModule().equals(other.getLoadModule())) return false; } - result = result && (hasSourceVersion() == other.hasSourceVersion()); + if (hasSourceVersion() != other.hasSourceVersion()) return false; if (hasSourceVersion()) { - result = result && getSourceVersion().equals(other.getSourceVersion()); + if (!getSourceVersion().equals(other.getSourceVersion())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1109,23 +1103,23 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1133,13 +1127,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1206,7 +1200,7 @@ public Builder mergeFrom( return this; } - private com.google.devtools.cloudtrace.v2.TruncatableString functionName_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString functionName_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -1398,7 +1392,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableString.Builder getFunctionNa return functionNameBuilder_; } - private com.google.devtools.cloudtrace.v2.TruncatableString originalFunctionName_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString originalFunctionName_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -1603,7 +1597,7 @@ public Builder clearOriginalFunctionName() { return originalFunctionNameBuilder_; } - private com.google.devtools.cloudtrace.v2.TruncatableString fileName_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString fileName_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -1885,7 +1879,7 @@ public Builder clearColumnNumber() { return this; } - private com.google.devtools.cloudtrace.v2.Module loadModule_ = null; + private com.google.devtools.cloudtrace.v2.Module loadModule_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.Module, com.google.devtools.cloudtrace.v2.Module.Builder, @@ -2067,7 +2061,7 @@ public com.google.devtools.cloudtrace.v2.ModuleOrBuilder getLoadModuleOrBuilder( return loadModuleBuilder_; } - private com.google.devtools.cloudtrace.v2.TruncatableString sourceVersion_ = null; + private com.google.devtools.cloudtrace.v2.TruncatableString sourceVersion_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.TruncatableString, com.google.devtools.cloudtrace.v2.TruncatableString.Builder, @@ -2253,7 +2247,7 @@ public com.google.devtools.cloudtrace.v2.TruncatableString.Builder getSourceVers @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2393,7 +2387,6 @@ private StackFrames(com.google.protobuf.GeneratedMessageV3.Builder builder) { private StackFrames() { frame_ = java.util.Collections.emptyList(); - droppedFramesCount_ = 0; } @java.lang.Override @@ -2422,7 +2415,7 @@ private StackFrames( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { frame_ = new java.util.ArrayList< com.google.devtools.cloudtrace.v2.StackTrace.StackFrame>(); @@ -2441,7 +2434,7 @@ private StackFrames( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2453,7 +2446,7 @@ private StackFrames( } 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)) { frame_ = java.util.Collections.unmodifiableList(frame_); } this.unknownFields = unknownFields.build(); @@ -2611,11 +2604,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.StackTrace.StackFrames other = (com.google.devtools.cloudtrace.v2.StackTrace.StackFrames) obj; - boolean result = true; - result = result && getFrameList().equals(other.getFrameList()); - result = result && (getDroppedFramesCount() == other.getDroppedFramesCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFrameList().equals(other.getFrameList())) return false; + if (getDroppedFramesCount() != other.getDroppedFramesCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2819,7 +2811,7 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (frameBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { frame_ = java.util.Collections.unmodifiableList(frame_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -2835,23 +2827,23 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -2859,13 +2851,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2947,7 +2939,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFrameIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { frame_ = new java.util.ArrayList( frame_); @@ -3302,10 +3294,7 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame.Builder addFrameB com.google.devtools.cloudtrace.v2.StackTrace.StackFrame, com.google.devtools.cloudtrace.v2.StackTrace.StackFrame.Builder, com.google.devtools.cloudtrace.v2.StackTrace.StackFrameOrBuilder>( - frame_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + frame_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); frame_ = null; } return frameBuilder_; @@ -3364,7 +3353,7 @@ public Builder clearDroppedFramesCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3527,14 +3516,13 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.StackTrace other = (com.google.devtools.cloudtrace.v2.StackTrace) obj; - boolean result = true; - result = result && (hasStackFrames() == other.hasStackFrames()); + if (hasStackFrames() != other.hasStackFrames()) return false; if (hasStackFrames()) { - result = result && getStackFrames().equals(other.getStackFrames()); + if (!getStackFrames().equals(other.getStackFrames())) return false; } - result = result && (getStackTraceHashId() == other.getStackTraceHashId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getStackTraceHashId() != other.getStackTraceHashId()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3742,35 +3730,35 @@ public com.google.devtools.cloudtrace.v2.StackTrace buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3820,7 +3808,7 @@ public Builder mergeFrom( return this; } - private com.google.devtools.cloudtrace.v2.StackTrace.StackFrames stackFrames_ = null; + private com.google.devtools.cloudtrace.v2.StackTrace.StackFrames stackFrames_; private com.google.protobuf.SingleFieldBuilderV3< com.google.devtools.cloudtrace.v2.StackTrace.StackFrames, com.google.devtools.cloudtrace.v2.StackTrace.StackFrames.Builder, @@ -4069,7 +4057,7 @@ public Builder clearStackTraceHashId() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java index fdbcf65f7acc..d962789c2a5e 100644 --- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java +++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java @@ -24,7 +24,6 @@ private TruncatableString(com.google.protobuf.GeneratedMessageV3.Builder buil private TruncatableString() { value_ = ""; - truncatedByteCount_ = 0; } @java.lang.Override @@ -65,7 +64,7 @@ private TruncatableString( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -217,11 +216,10 @@ public boolean equals(final java.lang.Object obj) { com.google.devtools.cloudtrace.v2.TruncatableString other = (com.google.devtools.cloudtrace.v2.TruncatableString) obj; - boolean result = true; - result = result && getValue().equals(other.getValue()); - result = result && (getTruncatedByteCount() == other.getTruncatedByteCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValue().equals(other.getValue())) return false; + if (getTruncatedByteCount() != other.getTruncatedByteCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -419,35 +417,35 @@ public com.google.devtools.cloudtrace.v2.TruncatableString buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -668,7 +666,7 @@ public Builder clearTruncatedByteCount() { @java.lang.Override public 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-trace/synth.metadata b/google-cloud-clients/google-cloud-trace/synth.metadata index 2a460ece0251..053498878c70 100644 --- a/google-cloud-clients/google-cloud-trace/synth.metadata +++ b/google-cloud-clients/google-cloud-trace/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:59:19.919927Z", + "updateTime": "2019-03-29T08:00:28.306795Z", "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" } } ],