diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java index 77dfd9117fbc..9f61bec7c249 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java @@ -47,6 +47,13 @@ private CreateExclusionRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private CreateExclusionRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private CreateExclusionRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_fieldAccessorTable @@ -187,7 +186,6 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -197,7 +195,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -209,7 +206,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -337,7 +333,6 @@ public static com.google.logging.v2.CreateExclusionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -345,7 +340,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.CreateExclusionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -373,7 +367,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_fieldAccessorTable @@ -396,7 +389,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -410,18 +402,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.CreateExclusionRequest getDefaultInstanceForType() { return com.google.logging.v2.CreateExclusionRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.CreateExclusionRequest build() { com.google.logging.v2.CreateExclusionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -430,7 +419,6 @@ public com.google.logging.v2.CreateExclusionRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.CreateExclusionRequest buildPartial() { com.google.logging.v2.CreateExclusionRequest result = new com.google.logging.v2.CreateExclusionRequest(this); result.parent_ = parent_; @@ -443,39 +431,32 @@ public com.google.logging.v2.CreateExclusionRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.CreateExclusionRequest) { return mergeFrom((com.google.logging.v2.CreateExclusionRequest)other); @@ -499,12 +480,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateExclusionRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -798,13 +777,11 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { } return exclusionBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -826,7 +803,6 @@ public static com.google.logging.v2.CreateExclusionRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CreateExclusionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -844,7 +820,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.CreateExclusionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java index 836d17451734..cc5a6e06a05b 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java @@ -47,6 +47,13 @@ private CreateLogMetricRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private CreateLogMetricRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private CreateLogMetricRequest( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_fieldAccessorTable @@ -181,7 +180,6 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -191,7 +189,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -203,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -331,7 +327,6 @@ public static com.google.logging.v2.CreateLogMetricRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -339,7 +334,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.CreateLogMetricRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -367,7 +361,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_fieldAccessorTable @@ -390,7 +383,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -404,18 +396,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.CreateLogMetricRequest getDefaultInstanceForType() { return com.google.logging.v2.CreateLogMetricRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.CreateLogMetricRequest build() { com.google.logging.v2.CreateLogMetricRequest result = buildPartial(); if (!result.isInitialized()) { @@ -424,7 +413,6 @@ public com.google.logging.v2.CreateLogMetricRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.CreateLogMetricRequest buildPartial() { com.google.logging.v2.CreateLogMetricRequest result = new com.google.logging.v2.CreateLogMetricRequest(this); result.parent_ = parent_; @@ -437,39 +425,32 @@ public com.google.logging.v2.CreateLogMetricRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.CreateLogMetricRequest) { return mergeFrom((com.google.logging.v2.CreateLogMetricRequest)other); @@ -493,12 +474,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateLogMetricRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -777,13 +756,11 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { } return metricBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -805,7 +782,6 @@ public static com.google.logging.v2.CreateLogMetricRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CreateLogMetricRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -823,7 +799,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.CreateLogMetricRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java index 9dd5482aaf26..d2b76a787b3e 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java @@ -48,6 +48,13 @@ private CreateSinkRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -72,13 +79,6 @@ private CreateSinkRequest( uniqueWriterIdentity_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -96,7 +96,6 @@ private CreateSinkRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_fieldAccessorTable @@ -215,7 +214,6 @@ public boolean getUniqueWriterIdentity() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -225,7 +223,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -240,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -377,7 +373,6 @@ public static com.google.logging.v2.CreateSinkRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -385,7 +380,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.CreateSinkRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -413,7 +407,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_fieldAccessorTable @@ -436,7 +429,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -452,18 +444,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.CreateSinkRequest getDefaultInstanceForType() { return com.google.logging.v2.CreateSinkRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.CreateSinkRequest build() { com.google.logging.v2.CreateSinkRequest result = buildPartial(); if (!result.isInitialized()) { @@ -472,7 +461,6 @@ public com.google.logging.v2.CreateSinkRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.CreateSinkRequest buildPartial() { com.google.logging.v2.CreateSinkRequest result = new com.google.logging.v2.CreateSinkRequest(this); result.parent_ = parent_; @@ -486,39 +474,32 @@ public com.google.logging.v2.CreateSinkRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.CreateSinkRequest) { return mergeFrom((com.google.logging.v2.CreateSinkRequest)other); @@ -545,12 +526,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateSinkRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -909,13 +888,11 @@ public Builder clearUniqueWriterIdentity() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -937,7 +914,6 @@ public static com.google.logging.v2.CreateSinkRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public CreateSinkRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -955,7 +931,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.CreateSinkRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java index 3bda797775c7..401fa96a2a9b 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java @@ -47,12 +47,6 @@ private DeleteExclusionRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private DeleteExclusionRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private DeleteExclusionRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_fieldAccessorTable @@ -138,7 +137,6 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -148,7 +146,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -157,7 +154,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -272,7 +268,6 @@ public static com.google.logging.v2.DeleteExclusionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -280,7 +275,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.DeleteExclusionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -308,7 +302,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_fieldAccessorTable @@ -331,7 +324,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -339,18 +331,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.DeleteExclusionRequest getDefaultInstanceForType() { return com.google.logging.v2.DeleteExclusionRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.DeleteExclusionRequest build() { com.google.logging.v2.DeleteExclusionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -359,7 +348,6 @@ public com.google.logging.v2.DeleteExclusionRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.DeleteExclusionRequest buildPartial() { com.google.logging.v2.DeleteExclusionRequest result = new com.google.logging.v2.DeleteExclusionRequest(this); result.name_ = name_; @@ -367,39 +355,32 @@ public com.google.logging.v2.DeleteExclusionRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.DeleteExclusionRequest) { return mergeFrom((com.google.logging.v2.DeleteExclusionRequest)other); @@ -420,12 +401,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteExclusionRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -557,13 +536,11 @@ public Builder setNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -585,7 +562,6 @@ public static com.google.logging.v2.DeleteExclusionRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public DeleteExclusionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -603,7 +579,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.DeleteExclusionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java index efc313242363..1bc434af0cb5 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java @@ -47,12 +47,6 @@ private DeleteLogMetricRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - metricName_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private DeleteLogMetricRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + metricName_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private DeleteLogMetricRequest( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_fieldAccessorTable @@ -130,7 +129,6 @@ public java.lang.String getMetricName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -140,7 +138,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getMetricNameBytes().isEmpty()) { @@ -149,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -264,7 +260,6 @@ public static com.google.logging.v2.DeleteLogMetricRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -272,7 +267,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.DeleteLogMetricRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -300,7 +294,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_fieldAccessorTable @@ -323,7 +316,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); metricName_ = ""; @@ -331,18 +323,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.DeleteLogMetricRequest getDefaultInstanceForType() { return com.google.logging.v2.DeleteLogMetricRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.DeleteLogMetricRequest build() { com.google.logging.v2.DeleteLogMetricRequest result = buildPartial(); if (!result.isInitialized()) { @@ -351,7 +340,6 @@ public com.google.logging.v2.DeleteLogMetricRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.DeleteLogMetricRequest buildPartial() { com.google.logging.v2.DeleteLogMetricRequest result = new com.google.logging.v2.DeleteLogMetricRequest(this); result.metricName_ = metricName_; @@ -359,39 +347,32 @@ public com.google.logging.v2.DeleteLogMetricRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.DeleteLogMetricRequest) { return mergeFrom((com.google.logging.v2.DeleteLogMetricRequest)other); @@ -412,12 +393,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogMetricRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -529,13 +508,11 @@ public Builder setMetricNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -557,7 +534,6 @@ public static com.google.logging.v2.DeleteLogMetricRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public DeleteLogMetricRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -575,7 +551,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.DeleteLogMetricRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java index df99d2ba7247..2f7d243c0688 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java @@ -47,12 +47,6 @@ private DeleteLogRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - logName_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private DeleteLogRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + logName_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private DeleteLogRequest( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_fieldAccessorTable @@ -146,7 +145,6 @@ public java.lang.String getLogName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -156,7 +154,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getLogNameBytes().isEmpty()) { @@ -165,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -280,7 +276,6 @@ public static com.google.logging.v2.DeleteLogRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -288,7 +283,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.DeleteLogRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -316,7 +310,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_fieldAccessorTable @@ -339,7 +332,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); logName_ = ""; @@ -347,18 +339,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.DeleteLogRequest getDefaultInstanceForType() { return com.google.logging.v2.DeleteLogRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.DeleteLogRequest build() { com.google.logging.v2.DeleteLogRequest result = buildPartial(); if (!result.isInitialized()) { @@ -367,7 +356,6 @@ public com.google.logging.v2.DeleteLogRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.DeleteLogRequest buildPartial() { com.google.logging.v2.DeleteLogRequest result = new com.google.logging.v2.DeleteLogRequest(this); result.logName_ = logName_; @@ -375,39 +363,32 @@ public com.google.logging.v2.DeleteLogRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.DeleteLogRequest) { return mergeFrom((com.google.logging.v2.DeleteLogRequest)other); @@ -428,12 +409,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -585,13 +564,11 @@ public Builder setLogNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -613,7 +590,6 @@ public static com.google.logging.v2.DeleteLogRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public DeleteLogRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -631,7 +607,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.DeleteLogRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java index 4e272fd1eee7..44bf390eab11 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java @@ -47,12 +47,6 @@ private DeleteSinkRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - sinkName_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private DeleteSinkRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + sinkName_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private DeleteSinkRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_fieldAccessorTable @@ -140,7 +139,6 @@ public java.lang.String getSinkName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -150,7 +148,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getSinkNameBytes().isEmpty()) { @@ -159,7 +156,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -274,7 +270,6 @@ public static com.google.logging.v2.DeleteSinkRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -282,7 +277,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.DeleteSinkRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -310,7 +304,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_fieldAccessorTable @@ -333,7 +326,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); sinkName_ = ""; @@ -341,18 +333,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.DeleteSinkRequest getDefaultInstanceForType() { return com.google.logging.v2.DeleteSinkRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.DeleteSinkRequest build() { com.google.logging.v2.DeleteSinkRequest result = buildPartial(); if (!result.isInitialized()) { @@ -361,7 +350,6 @@ public com.google.logging.v2.DeleteSinkRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.DeleteSinkRequest buildPartial() { com.google.logging.v2.DeleteSinkRequest result = new com.google.logging.v2.DeleteSinkRequest(this); result.sinkName_ = sinkName_; @@ -369,39 +357,32 @@ public com.google.logging.v2.DeleteSinkRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.DeleteSinkRequest) { return mergeFrom((com.google.logging.v2.DeleteSinkRequest)other); @@ -422,12 +403,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteSinkRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -564,13 +543,11 @@ public Builder setSinkNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -592,7 +569,6 @@ public static com.google.logging.v2.DeleteSinkRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public DeleteSinkRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -610,7 +586,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.DeleteSinkRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java index 26b7bc78d6be..07a28453c822 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java @@ -47,12 +47,6 @@ private GetExclusionRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private GetExclusionRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private GetExclusionRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_fieldAccessorTable @@ -138,7 +137,6 @@ public java.lang.String getName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -148,7 +146,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -157,7 +154,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -272,7 +268,6 @@ public static com.google.logging.v2.GetExclusionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -280,7 +275,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.GetExclusionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -308,7 +302,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_fieldAccessorTable @@ -331,7 +324,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -339,18 +331,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.GetExclusionRequest getDefaultInstanceForType() { return com.google.logging.v2.GetExclusionRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.GetExclusionRequest build() { com.google.logging.v2.GetExclusionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -359,7 +348,6 @@ public com.google.logging.v2.GetExclusionRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.GetExclusionRequest buildPartial() { com.google.logging.v2.GetExclusionRequest result = new com.google.logging.v2.GetExclusionRequest(this); result.name_ = name_; @@ -367,39 +355,32 @@ public com.google.logging.v2.GetExclusionRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.GetExclusionRequest) { return mergeFrom((com.google.logging.v2.GetExclusionRequest)other); @@ -420,12 +401,10 @@ public Builder mergeFrom(com.google.logging.v2.GetExclusionRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -557,13 +536,11 @@ public Builder setNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -585,7 +562,6 @@ public static com.google.logging.v2.GetExclusionRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public GetExclusionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -603,7 +579,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.GetExclusionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java index 0d750e73a754..dfe219851d2f 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java @@ -47,12 +47,6 @@ private GetLogMetricRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - metricName_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private GetLogMetricRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + metricName_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private GetLogMetricRequest( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_fieldAccessorTable @@ -130,7 +129,6 @@ public java.lang.String getMetricName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -140,7 +138,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getMetricNameBytes().isEmpty()) { @@ -149,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -264,7 +260,6 @@ public static com.google.logging.v2.GetLogMetricRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -272,7 +267,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.GetLogMetricRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -300,7 +294,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_fieldAccessorTable @@ -323,7 +316,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); metricName_ = ""; @@ -331,18 +323,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.GetLogMetricRequest getDefaultInstanceForType() { return com.google.logging.v2.GetLogMetricRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.GetLogMetricRequest build() { com.google.logging.v2.GetLogMetricRequest result = buildPartial(); if (!result.isInitialized()) { @@ -351,7 +340,6 @@ public com.google.logging.v2.GetLogMetricRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.GetLogMetricRequest buildPartial() { com.google.logging.v2.GetLogMetricRequest result = new com.google.logging.v2.GetLogMetricRequest(this); result.metricName_ = metricName_; @@ -359,39 +347,32 @@ public com.google.logging.v2.GetLogMetricRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.GetLogMetricRequest) { return mergeFrom((com.google.logging.v2.GetLogMetricRequest)other); @@ -412,12 +393,10 @@ public Builder mergeFrom(com.google.logging.v2.GetLogMetricRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -529,13 +508,11 @@ public Builder setMetricNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -557,7 +534,6 @@ public static com.google.logging.v2.GetLogMetricRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public GetLogMetricRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -575,7 +551,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.GetLogMetricRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java index d7b0c10b53a6..46903bae84a7 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java @@ -47,12 +47,6 @@ private GetSinkRequest( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - sinkName_ = s; - break; - } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -60,6 +54,12 @@ private GetSinkRequest( } break; } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + sinkName_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -77,7 +77,6 @@ private GetSinkRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_fieldAccessorTable @@ -138,7 +137,6 @@ public java.lang.String getSinkName() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -148,7 +146,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getSinkNameBytes().isEmpty()) { @@ -157,7 +154,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -272,7 +268,6 @@ public static com.google.logging.v2.GetSinkRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -280,7 +275,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.GetSinkRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -308,7 +302,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_fieldAccessorTable @@ -331,7 +324,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); sinkName_ = ""; @@ -339,18 +331,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.GetSinkRequest getDefaultInstanceForType() { return com.google.logging.v2.GetSinkRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.GetSinkRequest build() { com.google.logging.v2.GetSinkRequest result = buildPartial(); if (!result.isInitialized()) { @@ -359,7 +348,6 @@ public com.google.logging.v2.GetSinkRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.GetSinkRequest buildPartial() { com.google.logging.v2.GetSinkRequest result = new com.google.logging.v2.GetSinkRequest(this); result.sinkName_ = sinkName_; @@ -367,39 +355,32 @@ public com.google.logging.v2.GetSinkRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.GetSinkRequest) { return mergeFrom((com.google.logging.v2.GetSinkRequest)other); @@ -420,12 +401,10 @@ public Builder mergeFrom(com.google.logging.v2.GetSinkRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -557,13 +536,11 @@ public Builder setSinkNameBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -585,7 +562,6 @@ public static com.google.logging.v2.GetSinkRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public GetSinkRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -603,7 +579,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.GetSinkRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java index 16cfd7602c47..052bd618f0f7 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java @@ -49,6 +49,13 @@ private ListExclusionsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private ListExclusionsRequest( pageSize_ = input.readInt32(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListExclusionsRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_fieldAccessorTable @@ -212,7 +211,6 @@ public int getPageSize() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -222,7 +220,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -237,7 +234,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -367,7 +363,6 @@ public static com.google.logging.v2.ListExclusionsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -375,7 +370,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListExclusionsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -403,7 +397,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_fieldAccessorTable @@ -426,7 +419,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -438,18 +430,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListExclusionsRequest getDefaultInstanceForType() { return com.google.logging.v2.ListExclusionsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListExclusionsRequest build() { com.google.logging.v2.ListExclusionsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -458,7 +447,6 @@ public com.google.logging.v2.ListExclusionsRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListExclusionsRequest buildPartial() { com.google.logging.v2.ListExclusionsRequest result = new com.google.logging.v2.ListExclusionsRequest(this); result.parent_ = parent_; @@ -468,39 +456,32 @@ public com.google.logging.v2.ListExclusionsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListExclusionsRequest) { return mergeFrom((com.google.logging.v2.ListExclusionsRequest)other); @@ -528,12 +509,10 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -808,13 +787,11 @@ public Builder clearPageSize() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -836,7 +813,6 @@ public static com.google.logging.v2.ListExclusionsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListExclusionsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -854,7 +830,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListExclusionsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java index 9ed3778aa72c..8ec5ebccadad 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java @@ -48,6 +48,13 @@ private ListExclusionsResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { exclusions_ = new java.util.ArrayList(); @@ -63,13 +70,6 @@ private ListExclusionsResponse( nextPageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListExclusionsResponse( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_fieldAccessorTable @@ -201,7 +200,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -211,7 +209,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < exclusions_.size(); i++) { @@ -223,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -348,7 +344,6 @@ public static com.google.logging.v2.ListExclusionsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -356,7 +351,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListExclusionsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -384,7 +378,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_fieldAccessorTable @@ -408,7 +401,6 @@ private void maybeForceBuilderInitialization() { getExclusionsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (exclusionsBuilder_ == null) { @@ -422,18 +414,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListExclusionsResponse getDefaultInstanceForType() { return com.google.logging.v2.ListExclusionsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListExclusionsResponse build() { com.google.logging.v2.ListExclusionsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -442,7 +431,6 @@ public com.google.logging.v2.ListExclusionsResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListExclusionsResponse buildPartial() { com.google.logging.v2.ListExclusionsResponse result = new com.google.logging.v2.ListExclusionsResponse(this); int from_bitField0_ = bitField0_; @@ -462,39 +450,32 @@ public com.google.logging.v2.ListExclusionsResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListExclusionsResponse) { return mergeFrom((com.google.logging.v2.ListExclusionsResponse)other); @@ -541,12 +522,10 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -976,13 +955,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1004,7 +981,6 @@ public static com.google.logging.v2.ListExclusionsResponse getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListExclusionsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1022,7 +998,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListExclusionsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java index 3ad50866f4f4..f57d70531ed0 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java @@ -52,6 +52,13 @@ private ListLogEntriesRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { @@ -93,13 +100,6 @@ private ListLogEntriesRequest( resourceNames_.add(s); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -123,7 +123,6 @@ private ListLogEntriesRequest( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_fieldAccessorTable @@ -432,7 +431,6 @@ public java.lang.String getPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -442,7 +440,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < projectIds_.size(); i++) { @@ -466,7 +463,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -631,7 +627,6 @@ public static com.google.logging.v2.ListLogEntriesRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -639,7 +634,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogEntriesRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -667,7 +661,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_fieldAccessorTable @@ -690,7 +683,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); projectIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -708,18 +700,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesRequest getDefaultInstanceForType() { return com.google.logging.v2.ListLogEntriesRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogEntriesRequest build() { com.google.logging.v2.ListLogEntriesRequest result = buildPartial(); if (!result.isInitialized()) { @@ -728,7 +717,6 @@ public com.google.logging.v2.ListLogEntriesRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesRequest buildPartial() { com.google.logging.v2.ListLogEntriesRequest result = new com.google.logging.v2.ListLogEntriesRequest(this); int from_bitField0_ = bitField0_; @@ -752,39 +740,32 @@ public com.google.logging.v2.ListLogEntriesRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogEntriesRequest) { return mergeFrom((com.google.logging.v2.ListLogEntriesRequest)other); @@ -836,12 +817,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1591,13 +1570,11 @@ public Builder setPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1619,7 +1596,6 @@ public static com.google.logging.v2.ListLogEntriesRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogEntriesRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1637,7 +1613,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java index 30344960d4ab..6fd409b26e0d 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java @@ -48,6 +48,13 @@ private ListLogEntriesResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { entries_ = new java.util.ArrayList(); @@ -63,13 +70,6 @@ private ListLogEntriesResponse( nextPageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListLogEntriesResponse( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_fieldAccessorTable @@ -223,7 +222,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -233,7 +231,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < entries_.size(); i++) { @@ -245,7 +242,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -370,7 +366,6 @@ public static com.google.logging.v2.ListLogEntriesResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -378,7 +373,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogEntriesResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -406,7 +400,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_fieldAccessorTable @@ -430,7 +423,6 @@ private void maybeForceBuilderInitialization() { getEntriesFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (entriesBuilder_ == null) { @@ -444,18 +436,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesResponse getDefaultInstanceForType() { return com.google.logging.v2.ListLogEntriesResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogEntriesResponse build() { com.google.logging.v2.ListLogEntriesResponse result = buildPartial(); if (!result.isInitialized()) { @@ -464,7 +453,6 @@ public com.google.logging.v2.ListLogEntriesResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesResponse buildPartial() { com.google.logging.v2.ListLogEntriesResponse result = new com.google.logging.v2.ListLogEntriesResponse(this); int from_bitField0_ = bitField0_; @@ -484,39 +472,32 @@ public com.google.logging.v2.ListLogEntriesResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogEntriesResponse) { return mergeFrom((com.google.logging.v2.ListLogEntriesResponse)other); @@ -563,12 +544,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1064,13 +1043,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1092,7 +1069,6 @@ public static com.google.logging.v2.ListLogEntriesResponse getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogEntriesResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1110,7 +1086,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogEntriesResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java index 8f1ca7795f52..527d5b5c013a 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java @@ -49,6 +49,13 @@ private ListLogMetricsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private ListLogMetricsRequest( pageSize_ = input.readInt32(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListLogMetricsRequest( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_fieldAccessorTable @@ -206,7 +205,6 @@ public int getPageSize() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -216,7 +214,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -231,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -361,7 +357,6 @@ public static com.google.logging.v2.ListLogMetricsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -369,7 +364,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogMetricsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -397,7 +391,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_fieldAccessorTable @@ -420,7 +413,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -432,18 +424,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsRequest getDefaultInstanceForType() { return com.google.logging.v2.ListLogMetricsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogMetricsRequest build() { com.google.logging.v2.ListLogMetricsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -452,7 +441,6 @@ public com.google.logging.v2.ListLogMetricsRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsRequest buildPartial() { com.google.logging.v2.ListLogMetricsRequest result = new com.google.logging.v2.ListLogMetricsRequest(this); result.parent_ = parent_; @@ -462,39 +450,32 @@ public com.google.logging.v2.ListLogMetricsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogMetricsRequest) { return mergeFrom((com.google.logging.v2.ListLogMetricsRequest)other); @@ -522,12 +503,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -787,13 +766,11 @@ public Builder clearPageSize() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -815,7 +792,6 @@ public static com.google.logging.v2.ListLogMetricsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogMetricsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -833,7 +809,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java index 88a5299afb9c..f697b3b9278c 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java @@ -48,6 +48,13 @@ private ListLogMetricsResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { metrics_ = new java.util.ArrayList(); @@ -63,13 +70,6 @@ private ListLogMetricsResponse( nextPageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListLogMetricsResponse( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_fieldAccessorTable @@ -201,7 +200,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -211,7 +209,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < metrics_.size(); i++) { @@ -223,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -348,7 +344,6 @@ public static com.google.logging.v2.ListLogMetricsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -356,7 +351,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogMetricsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -384,7 +378,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_fieldAccessorTable @@ -408,7 +401,6 @@ private void maybeForceBuilderInitialization() { getMetricsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (metricsBuilder_ == null) { @@ -422,18 +414,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsResponse getDefaultInstanceForType() { return com.google.logging.v2.ListLogMetricsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogMetricsResponse build() { com.google.logging.v2.ListLogMetricsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -442,7 +431,6 @@ public com.google.logging.v2.ListLogMetricsResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsResponse buildPartial() { com.google.logging.v2.ListLogMetricsResponse result = new com.google.logging.v2.ListLogMetricsResponse(this); int from_bitField0_ = bitField0_; @@ -462,39 +450,32 @@ public com.google.logging.v2.ListLogMetricsResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogMetricsResponse) { return mergeFrom((com.google.logging.v2.ListLogMetricsResponse)other); @@ -541,12 +522,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -976,13 +955,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1004,7 +981,6 @@ public static com.google.logging.v2.ListLogMetricsResponse getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogMetricsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1022,7 +998,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogMetricsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java index 3fbdc57bcc53..8fee36c9a7b1 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java @@ -49,6 +49,13 @@ private ListLogsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private ListLogsRequest( pageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListLogsRequest( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_fieldAccessorTable @@ -212,7 +211,6 @@ public java.lang.String getPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -222,7 +220,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -237,7 +234,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -367,7 +363,6 @@ public static com.google.logging.v2.ListLogsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -375,7 +370,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -403,7 +397,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_fieldAccessorTable @@ -426,7 +419,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -438,18 +430,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogsRequest getDefaultInstanceForType() { return com.google.logging.v2.ListLogsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogsRequest build() { com.google.logging.v2.ListLogsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -458,7 +447,6 @@ public com.google.logging.v2.ListLogsRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogsRequest buildPartial() { com.google.logging.v2.ListLogsRequest result = new com.google.logging.v2.ListLogsRequest(this); result.parent_ = parent_; @@ -468,39 +456,32 @@ public com.google.logging.v2.ListLogsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogsRequest) { return mergeFrom((com.google.logging.v2.ListLogsRequest)other); @@ -528,12 +509,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -808,13 +787,11 @@ public Builder setPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -836,7 +813,6 @@ public static com.google.logging.v2.ListLogsRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -854,7 +830,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java index 9f95d1fab938..6cd4fdf42a78 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java @@ -48,6 +48,13 @@ private ListLogsResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 18: { java.lang.String s = input.readStringRequireUtf8(); @@ -63,13 +70,6 @@ private ListLogsResponse( logNames_.add(s); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListLogsResponse( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_fieldAccessorTable @@ -199,7 +198,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -209,7 +207,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNextPageTokenBytes().isEmpty()) { @@ -221,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -350,7 +346,6 @@ public static com.google.logging.v2.ListLogsResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -358,7 +353,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListLogsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -386,7 +380,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_fieldAccessorTable @@ -409,7 +402,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); logNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; @@ -419,18 +411,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListLogsResponse getDefaultInstanceForType() { return com.google.logging.v2.ListLogsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListLogsResponse build() { com.google.logging.v2.ListLogsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -439,7 +428,6 @@ public com.google.logging.v2.ListLogsResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListLogsResponse buildPartial() { com.google.logging.v2.ListLogsResponse result = new com.google.logging.v2.ListLogsResponse(this); int from_bitField0_ = bitField0_; @@ -455,39 +443,32 @@ public com.google.logging.v2.ListLogsResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListLogsResponse) { return mergeFrom((com.google.logging.v2.ListLogsResponse)other); @@ -518,12 +499,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -789,13 +768,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -817,7 +794,6 @@ public static com.google.logging.v2.ListLogsResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListLogsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -835,7 +811,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListLogsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java index 74b81c0d39f4..361f9f3b4f5a 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java @@ -48,6 +48,13 @@ private ListMonitoredResourceDescriptorsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 8: { pageSize_ = input.readInt32(); @@ -59,13 +66,6 @@ private ListMonitoredResourceDescriptorsRequest( pageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +83,6 @@ private ListMonitoredResourceDescriptorsRequest( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable @@ -155,7 +154,6 @@ public java.lang.String getPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -165,7 +163,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (pageSize_ != 0) { @@ -177,7 +174,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -300,7 +296,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsRequest pars .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -308,7 +303,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListMonitoredResourceDescriptorsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -336,7 +330,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable @@ -359,7 +352,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); pageSize_ = 0; @@ -369,18 +361,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() { return com.google.logging.v2.ListMonitoredResourceDescriptorsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest build() { com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -389,7 +378,6 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest buildPartial() { com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result = new com.google.logging.v2.ListMonitoredResourceDescriptorsRequest(this); result.pageSize_ = pageSize_; @@ -398,39 +386,32 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest buildPartia return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListMonitoredResourceDescriptorsRequest) { return mergeFrom((com.google.logging.v2.ListMonitoredResourceDescriptorsRequest)other); @@ -454,12 +435,10 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -625,13 +604,11 @@ public Builder setPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -653,7 +630,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getD private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListMonitoredResourceDescriptorsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -671,7 +647,6 @@ public com.google.protobuf.Parser getPa return PARSER; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java index e70a38005dee..7fcfe51ac236 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java @@ -48,6 +48,13 @@ private ListMonitoredResourceDescriptorsResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { resourceDescriptors_ = new java.util.ArrayList(); @@ -63,13 +70,6 @@ private ListMonitoredResourceDescriptorsResponse( nextPageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListMonitoredResourceDescriptorsResponse( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable @@ -201,7 +200,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -211,7 +209,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < resourceDescriptors_.size(); i++) { @@ -223,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -348,7 +344,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsResponse par .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -356,7 +351,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListMonitoredResourceDescriptorsResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -384,7 +378,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable @@ -408,7 +401,6 @@ private void maybeForceBuilderInitialization() { getResourceDescriptorsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (resourceDescriptorsBuilder_ == null) { @@ -422,18 +414,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() { return com.google.logging.v2.ListMonitoredResourceDescriptorsResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse build() { com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result = buildPartial(); if (!result.isInitialized()) { @@ -442,7 +431,6 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildPartial() { com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result = new com.google.logging.v2.ListMonitoredResourceDescriptorsResponse(this); int from_bitField0_ = bitField0_; @@ -462,39 +450,32 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildParti return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListMonitoredResourceDescriptorsResponse) { return mergeFrom((com.google.logging.v2.ListMonitoredResourceDescriptorsResponse)other); @@ -541,12 +522,10 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -976,13 +955,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1004,7 +981,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsResponse get private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListMonitoredResourceDescriptorsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1022,7 +998,6 @@ public com.google.protobuf.Parser getP return PARSER; } - @java.lang.Override public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java index fe3bfa4c1f0d..6a52edd4fb21 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java @@ -49,6 +49,13 @@ private ListSinksRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private ListSinksRequest( pageSize_ = input.readInt32(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListSinksRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_fieldAccessorTable @@ -212,7 +211,6 @@ public int getPageSize() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -222,7 +220,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -237,7 +234,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -367,7 +363,6 @@ public static com.google.logging.v2.ListSinksRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -375,7 +370,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListSinksRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -403,7 +397,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_fieldAccessorTable @@ -426,7 +419,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -438,18 +430,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.ListSinksRequest getDefaultInstanceForType() { return com.google.logging.v2.ListSinksRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListSinksRequest build() { com.google.logging.v2.ListSinksRequest result = buildPartial(); if (!result.isInitialized()) { @@ -458,7 +447,6 @@ public com.google.logging.v2.ListSinksRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.ListSinksRequest buildPartial() { com.google.logging.v2.ListSinksRequest result = new com.google.logging.v2.ListSinksRequest(this); result.parent_ = parent_; @@ -468,39 +456,32 @@ public com.google.logging.v2.ListSinksRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListSinksRequest) { return mergeFrom((com.google.logging.v2.ListSinksRequest)other); @@ -528,12 +509,10 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -808,13 +787,11 @@ public Builder clearPageSize() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -836,7 +813,6 @@ public static com.google.logging.v2.ListSinksRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListSinksRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -854,7 +830,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListSinksRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java index 602b6b98c5bf..139502775f9a 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java @@ -48,6 +48,13 @@ private ListSinksResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { sinks_ = new java.util.ArrayList(); @@ -63,13 +70,6 @@ private ListSinksResponse( nextPageToken_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private ListSinksResponse( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_fieldAccessorTable @@ -201,7 +200,6 @@ public java.lang.String getNextPageToken() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -211,7 +209,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < sinks_.size(); i++) { @@ -223,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -348,7 +344,6 @@ public static com.google.logging.v2.ListSinksResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -356,7 +351,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.ListSinksResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -384,7 +378,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_fieldAccessorTable @@ -408,7 +401,6 @@ private void maybeForceBuilderInitialization() { getSinksFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (sinksBuilder_ == null) { @@ -422,18 +414,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.ListSinksResponse getDefaultInstanceForType() { return com.google.logging.v2.ListSinksResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.ListSinksResponse build() { com.google.logging.v2.ListSinksResponse result = buildPartial(); if (!result.isInitialized()) { @@ -442,7 +431,6 @@ public com.google.logging.v2.ListSinksResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.ListSinksResponse buildPartial() { com.google.logging.v2.ListSinksResponse result = new com.google.logging.v2.ListSinksResponse(this); int from_bitField0_ = bitField0_; @@ -462,39 +450,32 @@ public com.google.logging.v2.ListSinksResponse buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.ListSinksResponse) { return mergeFrom((com.google.logging.v2.ListSinksResponse)other); @@ -541,12 +522,10 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -976,13 +955,11 @@ public Builder setNextPageTokenBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1004,7 +981,6 @@ public static com.google.logging.v2.ListSinksResponse getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ListSinksResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1022,7 +998,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.ListSinksResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java index 374ad8a5b193..444f8e561c03 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java @@ -51,6 +51,13 @@ private LogEntry( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 18: { com.google.protobuf.Any.Builder subBuilder = null; if (payloadCase_ == 2) { @@ -219,13 +226,6 @@ private LogEntry( spanId_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -244,7 +244,6 @@ private LogEntry( } @SuppressWarnings({"rawtypes"}) - @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -255,7 +254,6 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_fieldAccessorTable @@ -679,7 +677,6 @@ public int getSeverityValue() { * .google.logging.type.LogSeverity severity = 10; */ public com.google.logging.type.LogSeverity getSeverity() { - @SuppressWarnings("deprecation") com.google.logging.type.LogSeverity result = com.google.logging.type.LogSeverity.valueOf(severity_); return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result; } @@ -1076,7 +1073,6 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1086,7 +1082,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (payloadCase_ == 2) { @@ -1143,7 +1138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1439,7 +1433,6 @@ public static com.google.logging.v2.LogEntry parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1447,7 +1440,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogEntry prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1497,7 +1489,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_fieldAccessorTable @@ -1520,7 +1511,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); logName_ = ""; @@ -1581,18 +1571,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_descriptor; } - @java.lang.Override public com.google.logging.v2.LogEntry getDefaultInstanceForType() { return com.google.logging.v2.LogEntry.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogEntry build() { com.google.logging.v2.LogEntry result = buildPartial(); if (!result.isInitialized()) { @@ -1601,7 +1588,6 @@ public com.google.logging.v2.LogEntry build() { return result; } - @java.lang.Override public com.google.logging.v2.LogEntry buildPartial() { com.google.logging.v2.LogEntry result = new com.google.logging.v2.LogEntry(this); int from_bitField0_ = bitField0_; @@ -1671,39 +1657,32 @@ public com.google.logging.v2.LogEntry buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogEntry) { return mergeFrom((com.google.logging.v2.LogEntry)other); @@ -1781,12 +1760,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntry other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3085,7 +3062,6 @@ public Builder setSeverityValue(int value) { * .google.logging.type.LogSeverity severity = 10; */ public com.google.logging.type.LogSeverity getSeverity() { - @SuppressWarnings("deprecation") com.google.logging.type.LogSeverity result = com.google.logging.type.LogSeverity.valueOf(severity_); return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result; } @@ -4257,13 +4233,11 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr } return sourceLocationBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -4285,7 +4259,6 @@ public static com.google.logging.v2.LogEntry getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogEntry parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4303,7 +4276,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogEntry getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java index 38c0ffcb9b31..7e96d49f5bf6 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java @@ -51,6 +51,13 @@ private LogEntryOperation( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -73,13 +80,6 @@ private LogEntryOperation( last_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -97,7 +97,6 @@ private LogEntryOperation( return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_fieldAccessorTable @@ -222,7 +221,6 @@ public boolean getLast() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -232,7 +230,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getIdBytes().isEmpty()) { @@ -250,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -390,7 +386,6 @@ public static com.google.logging.v2.LogEntryOperation parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -398,7 +393,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogEntryOperation prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -427,7 +421,6 @@ public static final class Builder extends return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_fieldAccessorTable @@ -450,7 +443,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); id_ = ""; @@ -464,18 +456,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor; } - @java.lang.Override public com.google.logging.v2.LogEntryOperation getDefaultInstanceForType() { return com.google.logging.v2.LogEntryOperation.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogEntryOperation build() { com.google.logging.v2.LogEntryOperation result = buildPartial(); if (!result.isInitialized()) { @@ -484,7 +473,6 @@ public com.google.logging.v2.LogEntryOperation build() { return result; } - @java.lang.Override public com.google.logging.v2.LogEntryOperation buildPartial() { com.google.logging.v2.LogEntryOperation result = new com.google.logging.v2.LogEntryOperation(this); result.id_ = id_; @@ -495,39 +483,32 @@ public com.google.logging.v2.LogEntryOperation buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogEntryOperation) { return mergeFrom((com.google.logging.v2.LogEntryOperation)other); @@ -558,12 +539,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntryOperation other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -850,13 +829,11 @@ public Builder clearLast() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -878,7 +855,6 @@ public static com.google.logging.v2.LogEntryOperation getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogEntryOperation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -896,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogEntryOperation getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java index abed2c2ed6ce..b16f38eb8768 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java @@ -50,6 +50,13 @@ private LogEntrySourceLocation( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -67,13 +74,6 @@ private LogEntrySourceLocation( function_ = s; break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -91,7 +91,6 @@ private LogEntrySourceLocation( return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_fieldAccessorTable @@ -210,7 +209,6 @@ public java.lang.String getFunction() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -220,7 +218,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getFileBytes().isEmpty()) { @@ -235,7 +232,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -366,7 +362,6 @@ public static com.google.logging.v2.LogEntrySourceLocation parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -374,7 +369,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogEntrySourceLocation prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -403,7 +397,6 @@ public static final class Builder extends return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_fieldAccessorTable @@ -426,7 +419,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); file_ = ""; @@ -438,18 +430,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor; } - @java.lang.Override public com.google.logging.v2.LogEntrySourceLocation getDefaultInstanceForType() { return com.google.logging.v2.LogEntrySourceLocation.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogEntrySourceLocation build() { com.google.logging.v2.LogEntrySourceLocation result = buildPartial(); if (!result.isInitialized()) { @@ -458,7 +447,6 @@ public com.google.logging.v2.LogEntrySourceLocation build() { return result; } - @java.lang.Override public com.google.logging.v2.LogEntrySourceLocation buildPartial() { com.google.logging.v2.LogEntrySourceLocation result = new com.google.logging.v2.LogEntrySourceLocation(this); result.file_ = file_; @@ -468,39 +456,32 @@ public com.google.logging.v2.LogEntrySourceLocation buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogEntrySourceLocation) { return mergeFrom((com.google.logging.v2.LogEntrySourceLocation)other); @@ -528,12 +509,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntrySourceLocation other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -800,13 +779,11 @@ public Builder setFunctionBytes( onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -828,7 +805,6 @@ public static com.google.logging.v2.LogEntrySourceLocation getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogEntrySourceLocation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -846,7 +822,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogEntrySourceLocation getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java index 72a08e50dcf4..3d61de546679 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java @@ -55,6 +55,13 @@ private LogExclusion( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -78,13 +85,6 @@ private LogExclusion( disabled_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -102,7 +102,6 @@ private LogExclusion( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_fieldAccessorTable @@ -271,7 +270,6 @@ public boolean getDisabled() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -281,7 +279,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -299,7 +296,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -437,7 +433,6 @@ public static com.google.logging.v2.LogExclusion parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -445,7 +440,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogExclusion prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -478,7 +472,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_fieldAccessorTable @@ -501,7 +494,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -515,18 +507,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor; } - @java.lang.Override public com.google.logging.v2.LogExclusion getDefaultInstanceForType() { return com.google.logging.v2.LogExclusion.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogExclusion build() { com.google.logging.v2.LogExclusion result = buildPartial(); if (!result.isInitialized()) { @@ -535,7 +524,6 @@ public com.google.logging.v2.LogExclusion build() { return result; } - @java.lang.Override public com.google.logging.v2.LogExclusion buildPartial() { com.google.logging.v2.LogExclusion result = new com.google.logging.v2.LogExclusion(this); result.name_ = name_; @@ -546,39 +534,32 @@ public com.google.logging.v2.LogExclusion buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogExclusion) { return mergeFrom((com.google.logging.v2.LogExclusion)other); @@ -610,12 +591,10 @@ public Builder mergeFrom(com.google.logging.v2.LogExclusion other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -992,13 +971,11 @@ public Builder clearDisabled() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1020,7 +997,6 @@ public static com.google.logging.v2.LogExclusion getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogExclusion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1038,7 +1014,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogExclusion getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java index 800a86b07ce4..bfd9302f2541 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java @@ -56,6 +56,13 @@ private LogMetric( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -125,13 +132,6 @@ private LogMetric( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -150,7 +150,6 @@ private LogMetric( } @SuppressWarnings({"rawtypes"}) - @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -161,7 +160,6 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_fieldAccessorTable @@ -798,13 +796,11 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil * .google.logging.v2.LogMetric.ApiVersion version = 4 [deprecated = true]; */ @java.lang.Deprecated public com.google.logging.v2.LogMetric.ApiVersion getVersion() { - @SuppressWarnings("deprecation") com.google.logging.v2.LogMetric.ApiVersion result = com.google.logging.v2.LogMetric.ApiVersion.valueOf(version_); return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -814,7 +810,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -847,7 +842,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1032,7 +1026,6 @@ public static com.google.logging.v2.LogMetric parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1040,7 +1033,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogMetric prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1095,7 +1087,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_fieldAccessorTable @@ -1118,7 +1109,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -1147,18 +1137,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_descriptor; } - @java.lang.Override public com.google.logging.v2.LogMetric getDefaultInstanceForType() { return com.google.logging.v2.LogMetric.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogMetric build() { com.google.logging.v2.LogMetric result = buildPartial(); if (!result.isInitialized()) { @@ -1167,7 +1154,6 @@ public com.google.logging.v2.LogMetric build() { return result; } - @java.lang.Override public com.google.logging.v2.LogMetric buildPartial() { com.google.logging.v2.LogMetric result = new com.google.logging.v2.LogMetric(this); int from_bitField0_ = bitField0_; @@ -1194,39 +1180,32 @@ public com.google.logging.v2.LogMetric buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogMetric) { return mergeFrom((com.google.logging.v2.LogMetric)other); @@ -1270,12 +1249,10 @@ public Builder mergeFrom(com.google.logging.v2.LogMetric other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2541,7 +2518,6 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil * .google.logging.v2.LogMetric.ApiVersion version = 4 [deprecated = true]; */ @java.lang.Deprecated public com.google.logging.v2.LogMetric.ApiVersion getVersion() { - @SuppressWarnings("deprecation") com.google.logging.v2.LogMetric.ApiVersion result = com.google.logging.v2.LogMetric.ApiVersion.valueOf(version_); return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result; } @@ -2576,13 +2552,11 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2604,7 +2578,6 @@ public static com.google.logging.v2.LogMetric getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogMetric parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2622,7 +2595,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogMetric getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java index 1df7360f6fa0..a61051b7bbec 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java @@ -56,6 +56,13 @@ private LogSink( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -117,13 +124,6 @@ private LogSink( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -141,7 +141,6 @@ private LogSink( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_fieldAccessorTable @@ -464,7 +463,6 @@ public java.lang.String getFilter() { * .google.logging.v2.LogSink.VersionFormat output_version_format = 6 [deprecated = true]; */ @java.lang.Deprecated public com.google.logging.v2.LogSink.VersionFormat getOutputVersionFormat() { - @SuppressWarnings("deprecation") com.google.logging.v2.LogSink.VersionFormat result = com.google.logging.v2.LogSink.VersionFormat.valueOf(outputVersionFormat_); return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result; } @@ -626,7 +624,6 @@ public boolean getIncludeChildren() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -636,7 +633,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -666,7 +662,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -844,7 +839,6 @@ public static com.google.logging.v2.LogSink parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -852,7 +846,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.LogSink prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -884,7 +877,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_fieldAccessorTable @@ -907,7 +899,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -937,18 +928,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor; } - @java.lang.Override public com.google.logging.v2.LogSink getDefaultInstanceForType() { return com.google.logging.v2.LogSink.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.LogSink build() { com.google.logging.v2.LogSink result = buildPartial(); if (!result.isInitialized()) { @@ -957,7 +945,6 @@ public com.google.logging.v2.LogSink build() { return result; } - @java.lang.Override public com.google.logging.v2.LogSink buildPartial() { com.google.logging.v2.LogSink result = new com.google.logging.v2.LogSink(this); result.name_ = name_; @@ -980,39 +967,32 @@ public com.google.logging.v2.LogSink buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.LogSink) { return mergeFrom((com.google.logging.v2.LogSink)other); @@ -1057,12 +1037,10 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1457,7 +1435,6 @@ public Builder setFilterBytes( * .google.logging.v2.LogSink.VersionFormat output_version_format = 6 [deprecated = true]; */ @java.lang.Deprecated public com.google.logging.v2.LogSink.VersionFormat getOutputVersionFormat() { - @SuppressWarnings("deprecation") com.google.logging.v2.LogSink.VersionFormat result = com.google.logging.v2.LogSink.VersionFormat.valueOf(outputVersionFormat_); return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result; } @@ -2018,13 +1995,11 @@ public Builder clearIncludeChildren() { } return endTimeBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2046,7 +2021,6 @@ public static com.google.logging.v2.LogSink getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public LogSink parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2064,7 +2038,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.LogSink getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java index 7555b729a5f8..221e5ab18b70 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java @@ -47,6 +47,13 @@ private UpdateExclusionRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -79,13 +86,6 @@ private UpdateExclusionRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -103,7 +103,6 @@ private UpdateExclusionRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_fieldAccessorTable @@ -248,7 +247,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -258,7 +256,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -273,7 +270,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -414,7 +410,6 @@ public static com.google.logging.v2.UpdateExclusionRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -422,7 +417,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.UpdateExclusionRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -450,7 +444,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_fieldAccessorTable @@ -473,7 +466,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -493,18 +485,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.UpdateExclusionRequest getDefaultInstanceForType() { return com.google.logging.v2.UpdateExclusionRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.UpdateExclusionRequest build() { com.google.logging.v2.UpdateExclusionRequest result = buildPartial(); if (!result.isInitialized()) { @@ -513,7 +502,6 @@ public com.google.logging.v2.UpdateExclusionRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.UpdateExclusionRequest buildPartial() { com.google.logging.v2.UpdateExclusionRequest result = new com.google.logging.v2.UpdateExclusionRequest(this); result.name_ = name_; @@ -531,39 +519,32 @@ public com.google.logging.v2.UpdateExclusionRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.UpdateExclusionRequest) { return mergeFrom((com.google.logging.v2.UpdateExclusionRequest)other); @@ -590,12 +571,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateExclusionRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1087,13 +1066,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { } return updateMaskBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1115,7 +1092,6 @@ public static com.google.logging.v2.UpdateExclusionRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public UpdateExclusionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1133,7 +1109,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.UpdateExclusionRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java index 90d91a58ed42..902161933579 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java @@ -47,6 +47,13 @@ private UpdateLogMetricRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -66,13 +73,6 @@ private UpdateLogMetricRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -90,7 +90,6 @@ private UpdateLogMetricRequest( return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_fieldAccessorTable @@ -182,7 +181,6 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -192,7 +190,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getMetricNameBytes().isEmpty()) { @@ -204,7 +201,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -332,7 +328,6 @@ public static com.google.logging.v2.UpdateLogMetricRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -340,7 +335,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.UpdateLogMetricRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -368,7 +362,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_fieldAccessorTable @@ -391,7 +384,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); metricName_ = ""; @@ -405,18 +397,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.UpdateLogMetricRequest getDefaultInstanceForType() { return com.google.logging.v2.UpdateLogMetricRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.UpdateLogMetricRequest build() { com.google.logging.v2.UpdateLogMetricRequest result = buildPartial(); if (!result.isInitialized()) { @@ -425,7 +414,6 @@ public com.google.logging.v2.UpdateLogMetricRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.UpdateLogMetricRequest buildPartial() { com.google.logging.v2.UpdateLogMetricRequest result = new com.google.logging.v2.UpdateLogMetricRequest(this); result.metricName_ = metricName_; @@ -438,39 +426,32 @@ public com.google.logging.v2.UpdateLogMetricRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.UpdateLogMetricRequest) { return mergeFrom((com.google.logging.v2.UpdateLogMetricRequest)other); @@ -494,12 +475,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateLogMetricRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -779,13 +758,11 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { } return metricBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -807,7 +784,6 @@ public static com.google.logging.v2.UpdateLogMetricRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public UpdateLogMetricRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -825,7 +801,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.UpdateLogMetricRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java index 89c1f152ebaf..ff0d6aec13b3 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java @@ -48,6 +48,13 @@ private UpdateSinkRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -85,13 +92,6 @@ private UpdateSinkRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -109,7 +109,6 @@ private UpdateSinkRequest( return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_fieldAccessorTable @@ -294,7 +293,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -304,7 +302,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getSinkNameBytes().isEmpty()) { @@ -322,7 +319,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -472,7 +468,6 @@ public static com.google.logging.v2.UpdateSinkRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -480,7 +475,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.UpdateSinkRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -508,7 +502,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_fieldAccessorTable @@ -531,7 +524,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); sinkName_ = ""; @@ -553,18 +545,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.UpdateSinkRequest getDefaultInstanceForType() { return com.google.logging.v2.UpdateSinkRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.UpdateSinkRequest build() { com.google.logging.v2.UpdateSinkRequest result = buildPartial(); if (!result.isInitialized()) { @@ -573,7 +562,6 @@ public com.google.logging.v2.UpdateSinkRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.UpdateSinkRequest buildPartial() { com.google.logging.v2.UpdateSinkRequest result = new com.google.logging.v2.UpdateSinkRequest(this); result.sinkName_ = sinkName_; @@ -592,39 +580,32 @@ public com.google.logging.v2.UpdateSinkRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.UpdateSinkRequest) { return mergeFrom((com.google.logging.v2.UpdateSinkRequest)other); @@ -654,12 +635,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateSinkRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1269,13 +1248,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { } return updateMaskBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1297,7 +1274,6 @@ public static com.google.logging.v2.UpdateSinkRequest getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public UpdateSinkRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1315,7 +1291,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.UpdateSinkRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java index 95bd67b20fea..69fa2da11347 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java @@ -46,6 +46,13 @@ private WriteLogEntriesPartialErrors( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { logEntryErrors_ = com.google.protobuf.MapField.newMapField( @@ -59,13 +66,6 @@ private WriteLogEntriesPartialErrors( logEntryErrors__.getKey(), logEntryErrors__.getValue()); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -84,7 +84,6 @@ private WriteLogEntriesPartialErrors( } @SuppressWarnings({"rawtypes"}) - @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -95,7 +94,6 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_fieldAccessorTable @@ -212,7 +210,6 @@ public com.google.rpc.Status getLogEntryErrorsOrThrow( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -222,7 +219,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { com.google.protobuf.GeneratedMessageV3 @@ -234,7 +230,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -358,7 +353,6 @@ public static com.google.logging.v2.WriteLogEntriesPartialErrors parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -366,7 +360,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesPartialErrors prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -416,7 +409,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_fieldAccessorTable @@ -439,25 +431,21 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); internalGetMutableLogEntryErrors().clear(); return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_descriptor; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInstanceForType() { return com.google.logging.v2.WriteLogEntriesPartialErrors.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesPartialErrors build() { com.google.logging.v2.WriteLogEntriesPartialErrors result = buildPartial(); if (!result.isInitialized()) { @@ -466,7 +454,6 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors build() { return result; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() { com.google.logging.v2.WriteLogEntriesPartialErrors result = new com.google.logging.v2.WriteLogEntriesPartialErrors(this); int from_bitField0_ = bitField0_; @@ -476,39 +463,32 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.WriteLogEntriesPartialErrors) { return mergeFrom((com.google.logging.v2.WriteLogEntriesPartialErrors)other); @@ -527,12 +507,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesPartialErrors othe return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -730,13 +708,11 @@ public Builder putAllLogEntryErrors( .putAll(values); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -758,7 +734,6 @@ public static com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInsta private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public WriteLogEntriesPartialErrors parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -776,7 +751,6 @@ public com.google.protobuf.Parser getParserForType return PARSER; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java index 8dfbbed515a4..e0a89d99008b 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java @@ -50,6 +50,13 @@ private WriteLogEntriesRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -101,13 +108,6 @@ private WriteLogEntriesRequest( dryRun_ = input.readBool(); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -129,7 +129,6 @@ private WriteLogEntriesRequest( } @SuppressWarnings({"rawtypes"}) - @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { @@ -140,7 +139,6 @@ protected com.google.protobuf.MapField internalGetMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_fieldAccessorTable @@ -546,7 +544,6 @@ public boolean getDryRun() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -556,7 +553,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getLogNameBytes().isEmpty()) { @@ -583,7 +579,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -755,7 +750,6 @@ public static com.google.logging.v2.WriteLogEntriesRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -763,7 +757,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -813,7 +806,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField( "Invalid map field number: " + number); } } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_fieldAccessorTable @@ -837,7 +829,6 @@ private void maybeForceBuilderInitialization() { getEntriesFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); logName_ = ""; @@ -862,18 +853,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_descriptor; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesRequest getDefaultInstanceForType() { return com.google.logging.v2.WriteLogEntriesRequest.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesRequest build() { com.google.logging.v2.WriteLogEntriesRequest result = buildPartial(); if (!result.isInitialized()) { @@ -882,7 +870,6 @@ public com.google.logging.v2.WriteLogEntriesRequest build() { return result; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesRequest buildPartial() { com.google.logging.v2.WriteLogEntriesRequest result = new com.google.logging.v2.WriteLogEntriesRequest(this); int from_bitField0_ = bitField0_; @@ -911,39 +898,32 @@ public com.google.logging.v2.WriteLogEntriesRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.WriteLogEntriesRequest) { return mergeFrom((com.google.logging.v2.WriteLogEntriesRequest)other); @@ -1001,12 +981,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesRequest other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2282,13 +2260,11 @@ public Builder clearDryRun() { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2310,7 +2286,6 @@ public static com.google.logging.v2.WriteLogEntriesRequest getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public WriteLogEntriesRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2328,7 +2303,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java index 3325ea3548d1..194929fd923c 100644 --- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java +++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java @@ -70,7 +70,6 @@ private WriteLogEntriesResponse( return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_fieldAccessorTable @@ -79,7 +78,6 @@ private WriteLogEntriesResponse( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -89,13 +87,11 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -203,7 +199,6 @@ public static com.google.logging.v2.WriteLogEntriesResponse parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -211,7 +206,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -240,7 +234,6 @@ public static final class Builder extends return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_fieldAccessorTable @@ -263,24 +256,20 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesResponse getDefaultInstanceForType() { return com.google.logging.v2.WriteLogEntriesResponse.getDefaultInstance(); } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesResponse build() { com.google.logging.v2.WriteLogEntriesResponse result = buildPartial(); if (!result.isInitialized()) { @@ -289,46 +278,38 @@ public com.google.logging.v2.WriteLogEntriesResponse build() { return result; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesResponse buildPartial() { com.google.logging.v2.WriteLogEntriesResponse result = new com.google.logging.v2.WriteLogEntriesResponse(this); onBuilt(); return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) 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); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.logging.v2.WriteLogEntriesResponse) { return mergeFrom((com.google.logging.v2.WriteLogEntriesResponse)other); @@ -345,12 +326,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesResponse other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -368,13 +347,11 @@ public Builder mergeFrom( } return this; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -396,7 +373,6 @@ public static com.google.logging.v2.WriteLogEntriesResponse getDefaultInstance() private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public WriteLogEntriesResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -414,7 +390,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.logging.v2.WriteLogEntriesResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java index d5bfccd76c9d..8b05773c3847 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java @@ -23,12 +23,18 @@ private RecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builder buil private RecognitionConfig() { encoding_ = 0; sampleRateHertz_ = 0; + audioChannelCount_ = 0; + enableSeparateRecognitionPerChannel_ = false; languageCode_ = ""; + alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; maxAlternatives_ = 0; profanityFilter_ = false; speechContexts_ = java.util.Collections.emptyList(); enableWordTimeOffsets_ = false; + enableWordConfidence_ = false; enableAutomaticPunctuation_ = false; + enableSpeakerDiarization_ = false; + diarizationSpeakerCount_ = 0; model_ = ""; useEnhanced_ = false; } @@ -92,14 +98,19 @@ private RecognitionConfig( break; } case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { speechContexts_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; + mutable_bitField0_ |= 0x00000100; } speechContexts_.add( input.readMessage(com.google.cloud.speech.v1p1beta1.SpeechContext.parser(), extensionRegistry)); break; } + case 56: { + + audioChannelCount_ = input.readInt32(); + break; + } case 64: { enableWordTimeOffsets_ = input.readBool(); @@ -123,6 +134,11 @@ private RecognitionConfig( enableAutomaticPunctuation_ = input.readBool(); break; } + case 96: { + + enableSeparateRecognitionPerChannel_ = input.readBool(); + break; + } case 106: { java.lang.String s = input.readStringRequireUtf8(); @@ -134,6 +150,30 @@ private RecognitionConfig( useEnhanced_ = input.readBool(); break; } + case 120: { + + enableWordConfidence_ = input.readBool(); + break; + } + case 128: { + + enableSpeakerDiarization_ = input.readBool(); + break; + } + case 136: { + + diarizationSpeakerCount_ = input.readInt32(); + break; + } + case 146: { + java.lang.String s = input.readStringRequireUtf8(); + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000020; + } + alternativeLanguageCodes_.add(s); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -142,9 +182,12 @@ private RecognitionConfig( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); } + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView(); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -483,6 +526,45 @@ public int getSampleRateHertz() { return sampleRateHertz_; } + public static final int AUDIO_CHANNEL_COUNT_FIELD_NUMBER = 7; + private int audioChannelCount_; + /** + *
+   * *Optional* The number of channels in the input audio data.
+   * ONLY set this for MULTI-CHANNEL recognition.
+   * Valid values for LINEAR16 and FLAC are `1`-`8`.
+   * Valid values for OGG_OPUS are '1'-'254'.
+   * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+   * If `0` or omitted, defaults to one channel (mono).
+   * NOTE: We only recognize the first channel by default.
+   * To perform independent recognition on each channel set
+   * enable_separate_recognition_per_channel to 'true'.
+   * 
+ * + * int32 audio_channel_count = 7; + */ + public int getAudioChannelCount() { + return audioChannelCount_; + } + + public static final int ENABLE_SEPARATE_RECOGNITION_PER_CHANNEL_FIELD_NUMBER = 12; + private boolean enableSeparateRecognitionPerChannel_; + /** + *
+   * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+   * to get each channel recognized separately. The recognition result will
+   * contain a channel_tag field to state which channel that result belongs to.
+   * If this is not ‘true’, we will only recognize the first channel.
+   * NOTE: The request is also billed cumulatively for all channels recognized:
+   *     (audio_channel_count times the audio length)
+   * 
+ * + * bool enable_separate_recognition_per_channel = 12; + */ + public boolean getEnableSeparateRecognitionPerChannel() { + return enableSeparateRecognitionPerChannel_; + } + public static final int LANGUAGE_CODE_FIELD_NUMBER = 3; private volatile java.lang.Object languageCode_; /** @@ -533,6 +615,95 @@ public java.lang.String getLanguageCode() { } } + public static final int ALTERNATIVE_LANGUAGE_CODES_FIELD_NUMBER = 18; + private com.google.protobuf.LazyStringList alternativeLanguageCodes_; + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + public com.google.protobuf.ProtocolStringList + getAlternativeLanguageCodesList() { + return alternativeLanguageCodes_; + } + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + public int getAlternativeLanguageCodesCount() { + return alternativeLanguageCodes_.size(); + } + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + public java.lang.String getAlternativeLanguageCodes(int index) { + return alternativeLanguageCodes_.get(index); + } + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + public com.google.protobuf.ByteString + getAlternativeLanguageCodesBytes(int index) { + return alternativeLanguageCodes_.getByteString(index); + } + public static final int MAX_ALTERNATIVES_FIELD_NUMBER = 4; private int maxAlternatives_; /** @@ -638,6 +809,21 @@ public boolean getEnableWordTimeOffsets() { return enableWordTimeOffsets_; } + public static final int ENABLE_WORD_CONFIDENCE_FIELD_NUMBER = 15; + private boolean enableWordConfidence_; + /** + *
+   * *Optional* If `true`, the top result includes a list of words and the
+   * confidence for those words. If `false`, no word-level confidence
+   * information is returned. The default is `false`.
+   * 
+ * + * bool enable_word_confidence = 15; + */ + public boolean getEnableWordConfidence() { + return enableWordConfidence_; + } + public static final int ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER = 11; private boolean enableAutomaticPunctuation_; /** @@ -657,6 +843,41 @@ public boolean getEnableAutomaticPunctuation() { return enableAutomaticPunctuation_; } + public static final int ENABLE_SPEAKER_DIARIZATION_FIELD_NUMBER = 16; + private boolean enableSpeakerDiarization_; + /** + *
+   * *Optional* If 'true', enables speaker detection for each recognized word in
+   * the top alternative of the recognition result using a speaker_tag provided
+   * in the WordInfo.
+   * Note: When this is true, we send all the words from the beginning of the
+   * audio for the top alternative in every consecutive responses.
+   * This is done in order to improve our speaker tags as our models learn to
+   * identify the speakers in the conversation over time.
+   * 
+ * + * bool enable_speaker_diarization = 16; + */ + public boolean getEnableSpeakerDiarization() { + return enableSpeakerDiarization_; + } + + public static final int DIARIZATION_SPEAKER_COUNT_FIELD_NUMBER = 17; + private int diarizationSpeakerCount_; + /** + *
+   * *Optional*
+   * If set, specifies the estimated number of speakers in the conversation.
+   * If not set, defaults to '2'.
+   * Ignored unless enable_speaker_diarization is set to true."
+   * 
+ * + * int32 diarization_speaker_count = 17; + */ + public int getDiarizationSpeakerCount() { + return diarizationSpeakerCount_; + } + public static final int METADATA_FIELD_NUMBER = 9; private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_; /** @@ -846,6 +1067,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < speechContexts_.size(); i++) { output.writeMessage(6, speechContexts_.get(i)); } + if (audioChannelCount_ != 0) { + output.writeInt32(7, audioChannelCount_); + } if (enableWordTimeOffsets_ != false) { output.writeBool(8, enableWordTimeOffsets_); } @@ -855,12 +1079,27 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (enableAutomaticPunctuation_ != false) { output.writeBool(11, enableAutomaticPunctuation_); } + if (enableSeparateRecognitionPerChannel_ != false) { + output.writeBool(12, enableSeparateRecognitionPerChannel_); + } if (!getModelBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 13, model_); } if (useEnhanced_ != false) { output.writeBool(14, useEnhanced_); } + if (enableWordConfidence_ != false) { + output.writeBool(15, enableWordConfidence_); + } + if (enableSpeakerDiarization_ != false) { + output.writeBool(16, enableSpeakerDiarization_); + } + if (diarizationSpeakerCount_ != 0) { + output.writeInt32(17, diarizationSpeakerCount_); + } + for (int i = 0; i < alternativeLanguageCodes_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 18, alternativeLanguageCodes_.getRaw(i)); + } unknownFields.writeTo(output); } @@ -892,6 +1131,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, speechContexts_.get(i)); } + if (audioChannelCount_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(7, audioChannelCount_); + } if (enableWordTimeOffsets_ != false) { size += com.google.protobuf.CodedOutputStream .computeBoolSize(8, enableWordTimeOffsets_); @@ -904,6 +1147,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(11, enableAutomaticPunctuation_); } + if (enableSeparateRecognitionPerChannel_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(12, enableSeparateRecognitionPerChannel_); + } if (!getModelBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, model_); } @@ -911,6 +1158,26 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(14, useEnhanced_); } + if (enableWordConfidence_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(15, enableWordConfidence_); + } + if (enableSpeakerDiarization_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(16, enableSpeakerDiarization_); + } + if (diarizationSpeakerCount_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(17, diarizationSpeakerCount_); + } + { + int dataSize = 0; + for (int i = 0; i < alternativeLanguageCodes_.size(); i++) { + dataSize += computeStringSizeNoTag(alternativeLanguageCodes_.getRaw(i)); + } + size += dataSize; + size += 2 * getAlternativeLanguageCodesList().size(); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -930,8 +1197,14 @@ public boolean equals(final java.lang.Object obj) { result = result && encoding_ == other.encoding_; result = result && (getSampleRateHertz() == other.getSampleRateHertz()); + result = result && (getAudioChannelCount() + == other.getAudioChannelCount()); + result = result && (getEnableSeparateRecognitionPerChannel() + == other.getEnableSeparateRecognitionPerChannel()); result = result && getLanguageCode() .equals(other.getLanguageCode()); + result = result && getAlternativeLanguageCodesList() + .equals(other.getAlternativeLanguageCodesList()); result = result && (getMaxAlternatives() == other.getMaxAlternatives()); result = result && (getProfanityFilter() @@ -940,8 +1213,14 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getSpeechContextsList()); result = result && (getEnableWordTimeOffsets() == other.getEnableWordTimeOffsets()); + result = result && (getEnableWordConfidence() + == other.getEnableWordConfidence()); result = result && (getEnableAutomaticPunctuation() == other.getEnableAutomaticPunctuation()); + result = result && (getEnableSpeakerDiarization() + == other.getEnableSpeakerDiarization()); + result = result && (getDiarizationSpeakerCount() + == other.getDiarizationSpeakerCount()); result = result && (hasMetadata() == other.hasMetadata()); if (hasMetadata()) { result = result && getMetadata() @@ -966,8 +1245,17 @@ public int hashCode() { hash = (53 * hash) + encoding_; hash = (37 * hash) + SAMPLE_RATE_HERTZ_FIELD_NUMBER; hash = (53 * hash) + getSampleRateHertz(); + hash = (37 * hash) + AUDIO_CHANNEL_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getAudioChannelCount(); + hash = (37 * hash) + ENABLE_SEPARATE_RECOGNITION_PER_CHANNEL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEnableSeparateRecognitionPerChannel()); hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER; hash = (53 * hash) + getLanguageCode().hashCode(); + if (getAlternativeLanguageCodesCount() > 0) { + hash = (37 * hash) + ALTERNATIVE_LANGUAGE_CODES_FIELD_NUMBER; + hash = (53 * hash) + getAlternativeLanguageCodesList().hashCode(); + } hash = (37 * hash) + MAX_ALTERNATIVES_FIELD_NUMBER; hash = (53 * hash) + getMaxAlternatives(); hash = (37 * hash) + PROFANITY_FILTER_FIELD_NUMBER; @@ -980,9 +1268,17 @@ public int hashCode() { hash = (37 * hash) + ENABLE_WORD_TIME_OFFSETS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getEnableWordTimeOffsets()); + hash = (37 * hash) + ENABLE_WORD_CONFIDENCE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEnableWordConfidence()); hash = (37 * hash) + ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getEnableAutomaticPunctuation()); + hash = (37 * hash) + ENABLE_SPEAKER_DIARIZATION_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEnableSpeakerDiarization()); + hash = (37 * hash) + DIARIZATION_SPEAKER_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getDiarizationSpeakerCount(); if (hasMetadata()) { hash = (37 * hash) + METADATA_FIELD_NUMBER; hash = (53 * hash) + getMetadata().hashCode(); @@ -1131,22 +1427,34 @@ public Builder clear() { sampleRateHertz_ = 0; + audioChannelCount_ = 0; + + enableSeparateRecognitionPerChannel_ = false; + languageCode_ = ""; + alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000020); maxAlternatives_ = 0; profanityFilter_ = false; if (speechContextsBuilder_ == null) { speechContexts_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000100); } else { speechContextsBuilder_.clear(); } enableWordTimeOffsets_ = false; + enableWordConfidence_ = false; + enableAutomaticPunctuation_ = false; + enableSpeakerDiarization_ = false; + + diarizationSpeakerCount_ = 0; + if (metadataBuilder_ == null) { metadata_ = null; } else { @@ -1183,20 +1491,30 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() { int to_bitField0_ = 0; result.encoding_ = encoding_; result.sampleRateHertz_ = sampleRateHertz_; + result.audioChannelCount_ = audioChannelCount_; + result.enableSeparateRecognitionPerChannel_ = enableSeparateRecognitionPerChannel_; result.languageCode_ = languageCode_; + if (((bitField0_ & 0x00000020) == 0x00000020)) { + alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.alternativeLanguageCodes_ = alternativeLanguageCodes_; result.maxAlternatives_ = maxAlternatives_; result.profanityFilter_ = profanityFilter_; if (speechContextsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000100); } result.speechContexts_ = speechContexts_; } else { result.speechContexts_ = speechContextsBuilder_.build(); } result.enableWordTimeOffsets_ = enableWordTimeOffsets_; + result.enableWordConfidence_ = enableWordConfidence_; result.enableAutomaticPunctuation_ = enableAutomaticPunctuation_; + result.enableSpeakerDiarization_ = enableSpeakerDiarization_; + result.diarizationSpeakerCount_ = diarizationSpeakerCount_; if (metadataBuilder_ == null) { result.metadata_ = metadata_; } else { @@ -1252,10 +1570,26 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth if (other.getSampleRateHertz() != 0) { setSampleRateHertz(other.getSampleRateHertz()); } + if (other.getAudioChannelCount() != 0) { + setAudioChannelCount(other.getAudioChannelCount()); + } + if (other.getEnableSeparateRecognitionPerChannel() != false) { + setEnableSeparateRecognitionPerChannel(other.getEnableSeparateRecognitionPerChannel()); + } if (!other.getLanguageCode().isEmpty()) { languageCode_ = other.languageCode_; onChanged(); } + if (!other.alternativeLanguageCodes_.isEmpty()) { + if (alternativeLanguageCodes_.isEmpty()) { + alternativeLanguageCodes_ = other.alternativeLanguageCodes_; + bitField0_ = (bitField0_ & ~0x00000020); + } else { + ensureAlternativeLanguageCodesIsMutable(); + alternativeLanguageCodes_.addAll(other.alternativeLanguageCodes_); + } + onChanged(); + } if (other.getMaxAlternatives() != 0) { setMaxAlternatives(other.getMaxAlternatives()); } @@ -1266,7 +1600,7 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth if (!other.speechContexts_.isEmpty()) { if (speechContexts_.isEmpty()) { speechContexts_ = other.speechContexts_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureSpeechContextsIsMutable(); speechContexts_.addAll(other.speechContexts_); @@ -1279,7 +1613,7 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth speechContextsBuilder_.dispose(); speechContextsBuilder_ = null; speechContexts_ = other.speechContexts_; - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000100); speechContextsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getSpeechContextsFieldBuilder() : null; @@ -1291,9 +1625,18 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth if (other.getEnableWordTimeOffsets() != false) { setEnableWordTimeOffsets(other.getEnableWordTimeOffsets()); } + if (other.getEnableWordConfidence() != false) { + setEnableWordConfidence(other.getEnableWordConfidence()); + } if (other.getEnableAutomaticPunctuation() != false) { setEnableAutomaticPunctuation(other.getEnableAutomaticPunctuation()); } + if (other.getEnableSpeakerDiarization() != false) { + setEnableSpeakerDiarization(other.getEnableSpeakerDiarization()); + } + if (other.getDiarizationSpeakerCount() != 0) { + setDiarizationSpeakerCount(other.getDiarizationSpeakerCount()); + } if (other.hasMetadata()) { mergeMetadata(other.getMetadata()); } @@ -1462,6 +1805,121 @@ public Builder clearSampleRateHertz() { return this; } + private int audioChannelCount_ ; + /** + *
+     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
+ * + * int32 audio_channel_count = 7; + */ + public int getAudioChannelCount() { + return audioChannelCount_; + } + /** + *
+     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
+ * + * int32 audio_channel_count = 7; + */ + public Builder setAudioChannelCount(int value) { + + audioChannelCount_ = value; + onChanged(); + return this; + } + /** + *
+     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
+ * + * int32 audio_channel_count = 7; + */ + public Builder clearAudioChannelCount() { + + audioChannelCount_ = 0; + onChanged(); + return this; + } + + private boolean enableSeparateRecognitionPerChannel_ ; + /** + *
+     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
+ * + * bool enable_separate_recognition_per_channel = 12; + */ + public boolean getEnableSeparateRecognitionPerChannel() { + return enableSeparateRecognitionPerChannel_; + } + /** + *
+     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
+ * + * bool enable_separate_recognition_per_channel = 12; + */ + public Builder setEnableSeparateRecognitionPerChannel(boolean value) { + + enableSeparateRecognitionPerChannel_ = value; + onChanged(); + return this; + } + /** + *
+     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
+ * + * bool enable_separate_recognition_per_channel = 12; + */ + public Builder clearEnableSeparateRecognitionPerChannel() { + + enableSeparateRecognitionPerChannel_ = false; + onChanged(); + return this; + } + private java.lang.Object languageCode_ = ""; /** *
@@ -1571,6 +2029,235 @@ public Builder setLanguageCodeBytes(
       return this;
     }
 
+    private com.google.protobuf.LazyStringList alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureAlternativeLanguageCodesIsMutable() {
+      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+        alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(alternativeLanguageCodes_);
+        bitField0_ |= 0x00000020;
+       }
+    }
+    /**
+     * 
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public com.google.protobuf.ProtocolStringList + getAlternativeLanguageCodesList() { + return alternativeLanguageCodes_.getUnmodifiableView(); + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public int getAlternativeLanguageCodesCount() { + return alternativeLanguageCodes_.size(); + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public java.lang.String getAlternativeLanguageCodes(int index) { + return alternativeLanguageCodes_.get(index); + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public com.google.protobuf.ByteString + getAlternativeLanguageCodesBytes(int index) { + return alternativeLanguageCodes_.getByteString(index); + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public Builder setAlternativeLanguageCodes( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureAlternativeLanguageCodesIsMutable(); + alternativeLanguageCodes_.set(index, value); + onChanged(); + return this; + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public Builder addAlternativeLanguageCodes( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureAlternativeLanguageCodesIsMutable(); + alternativeLanguageCodes_.add(value); + onChanged(); + return this; + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public Builder addAllAlternativeLanguageCodes( + java.lang.Iterable values) { + ensureAlternativeLanguageCodesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, alternativeLanguageCodes_); + onChanged(); + return this; + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public Builder clearAlternativeLanguageCodes() { + alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + /** + *
+     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
+ * + * repeated string alternative_language_codes = 18; + */ + public Builder addAlternativeLanguageCodesBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureAlternativeLanguageCodesIsMutable(); + alternativeLanguageCodes_.add(value); + onChanged(); + return this; + } + private int maxAlternatives_ ; /** *
@@ -1674,9 +2361,9 @@ public Builder clearProfanityFilter() {
     private java.util.List speechContexts_ =
       java.util.Collections.emptyList();
     private void ensureSpeechContextsIsMutable() {
-      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+      if (!((bitField0_ & 0x00000100) == 0x00000100)) {
         speechContexts_ = new java.util.ArrayList(speechContexts_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00000100;
        }
     }
 
@@ -1870,7 +2557,7 @@ public Builder addAllSpeechContexts(
     public Builder clearSpeechContexts() {
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         speechContextsBuilder_.clear();
@@ -1975,7 +2662,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext.Builder addSpeechContexts
         speechContextsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
             com.google.cloud.speech.v1p1beta1.SpeechContext, com.google.cloud.speech.v1p1beta1.SpeechContext.Builder, com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder>(
                 speechContexts_,
-                ((bitField0_ & 0x00000020) == 0x00000020),
+                ((bitField0_ & 0x00000100) == 0x00000100),
                 getParentForChildren(),
                 isClean());
         speechContexts_ = null;
@@ -2030,6 +2717,50 @@ public Builder clearEnableWordTimeOffsets() {
       return this;
     }
 
+    private boolean enableWordConfidence_ ;
+    /**
+     * 
+     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
+ * + * bool enable_word_confidence = 15; + */ + public boolean getEnableWordConfidence() { + return enableWordConfidence_; + } + /** + *
+     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
+ * + * bool enable_word_confidence = 15; + */ + public Builder setEnableWordConfidence(boolean value) { + + enableWordConfidence_ = value; + onChanged(); + return this; + } + /** + *
+     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
+ * + * bool enable_word_confidence = 15; + */ + public Builder clearEnableWordConfidence() { + + enableWordConfidence_ = false; + onChanged(); + return this; + } + private boolean enableAutomaticPunctuation_ ; /** *
@@ -2086,6 +2817,109 @@ public Builder clearEnableAutomaticPunctuation() {
       return this;
     }
 
+    private boolean enableSpeakerDiarization_ ;
+    /**
+     * 
+     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
+ * + * bool enable_speaker_diarization = 16; + */ + public boolean getEnableSpeakerDiarization() { + return enableSpeakerDiarization_; + } + /** + *
+     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
+ * + * bool enable_speaker_diarization = 16; + */ + public Builder setEnableSpeakerDiarization(boolean value) { + + enableSpeakerDiarization_ = value; + onChanged(); + return this; + } + /** + *
+     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
+ * + * bool enable_speaker_diarization = 16; + */ + public Builder clearEnableSpeakerDiarization() { + + enableSpeakerDiarization_ = false; + onChanged(); + return this; + } + + private int diarizationSpeakerCount_ ; + /** + *
+     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
+ * + * int32 diarization_speaker_count = 17; + */ + public int getDiarizationSpeakerCount() { + return diarizationSpeakerCount_; + } + /** + *
+     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
+ * + * int32 diarization_speaker_count = 17; + */ + public Builder setDiarizationSpeakerCount(int value) { + + diarizationSpeakerCount_ = value; + onChanged(); + return this; + } + /** + *
+     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
+ * + * int32 diarization_speaker_count = 17; + */ + public Builder clearDiarizationSpeakerCount() { + + diarizationSpeakerCount_ = 0; + onChanged(); + return this; + } + private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_ = null; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.speech.v1p1beta1.RecognitionMetadata, com.google.cloud.speech.v1p1beta1.RecognitionMetadata.Builder, com.google.cloud.speech.v1p1beta1.RecognitionMetadataOrBuilder> metadataBuilder_; diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java index 91c355cfa3fc..31216fcceb26 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java @@ -43,6 +43,37 @@ public interface RecognitionConfigOrBuilder extends */ int getSampleRateHertz(); + /** + *
+   * *Optional* The number of channels in the input audio data.
+   * ONLY set this for MULTI-CHANNEL recognition.
+   * Valid values for LINEAR16 and FLAC are `1`-`8`.
+   * Valid values for OGG_OPUS are '1'-'254'.
+   * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+   * If `0` or omitted, defaults to one channel (mono).
+   * NOTE: We only recognize the first channel by default.
+   * To perform independent recognition on each channel set
+   * enable_separate_recognition_per_channel to 'true'.
+   * 
+ * + * int32 audio_channel_count = 7; + */ + int getAudioChannelCount(); + + /** + *
+   * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+   * to get each channel recognized separately. The recognition result will
+   * contain a channel_tag field to state which channel that result belongs to.
+   * If this is not ‘true’, we will only recognize the first channel.
+   * NOTE: The request is also billed cumulatively for all channels recognized:
+   *     (audio_channel_count times the audio length)
+   * 
+ * + * bool enable_separate_recognition_per_channel = 12; + */ + boolean getEnableSeparateRecognitionPerChannel(); + /** *
    * *Required* The language of the supplied audio as a
@@ -69,6 +100,85 @@ public interface RecognitionConfigOrBuilder extends
   com.google.protobuf.ByteString
       getLanguageCodeBytes();
 
+  /**
+   * 
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + java.util.List + getAlternativeLanguageCodesList(); + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + int getAlternativeLanguageCodesCount(); + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + java.lang.String getAlternativeLanguageCodes(int index); + /** + *
+   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
+ * + * repeated string alternative_language_codes = 18; + */ + com.google.protobuf.ByteString + getAlternativeLanguageCodesBytes(int index); + /** *
    * *Optional* Maximum number of recognition hypotheses to be returned.
@@ -151,6 +261,17 @@ com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder getSpeechContextsOrBuil
    */
   boolean getEnableWordTimeOffsets();
 
+  /**
+   * 
+   * *Optional* If `true`, the top result includes a list of words and the
+   * confidence for those words. If `false`, no word-level confidence
+   * information is returned. The default is `false`.
+   * 
+ * + * bool enable_word_confidence = 15; + */ + boolean getEnableWordConfidence(); + /** *
    * *Optional* If 'true', adds punctuation to recognition result hypotheses.
@@ -166,6 +287,33 @@ com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder getSpeechContextsOrBuil
    */
   boolean getEnableAutomaticPunctuation();
 
+  /**
+   * 
+   * *Optional* If 'true', enables speaker detection for each recognized word in
+   * the top alternative of the recognition result using a speaker_tag provided
+   * in the WordInfo.
+   * Note: When this is true, we send all the words from the beginning of the
+   * audio for the top alternative in every consecutive responses.
+   * This is done in order to improve our speaker tags as our models learn to
+   * identify the speakers in the conversation over time.
+   * 
+ * + * bool enable_speaker_diarization = 16; + */ + boolean getEnableSpeakerDiarization(); + + /** + *
+   * *Optional*
+   * If set, specifies the estimated number of speakers in the conversation.
+   * If not set, defaults to '2'.
+   * Ignored unless enable_speaker_diarization is set to true."
+   * 
+ * + * int32 diarization_speaker_count = 17; + */ + int getDiarizationSpeakerCount(); + /** *
    * *Optional* Metadata regarding this request.
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
index 2b7a093fd995..f64d1ab6b196 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
@@ -125,97 +125,106 @@ public static void registerAllExtensions(
       "nitionConfig\022@\n\006config\030\001 \001(\01320.google.cl" +
       "oud.speech.v1p1beta1.RecognitionConfig\022\030" +
       "\n\020single_utterance\030\002 \001(\010\022\027\n\017interim_resu" +
-      "lts\030\003 \001(\010\"\323\004\n\021RecognitionConfig\022P\n\010encod" +
+      "lts\030\003 \001(\010\"\254\006\n\021RecognitionConfig\022P\n\010encod" +
       "ing\030\001 \001(\0162>.google.cloud.speech.v1p1beta" +
       "1.RecognitionConfig.AudioEncoding\022\031\n\021sam" +
-      "ple_rate_hertz\030\002 \001(\005\022\025\n\rlanguage_code\030\003 " +
-      "\001(\t\022\030\n\020max_alternatives\030\004 \001(\005\022\030\n\020profani" +
-      "ty_filter\030\005 \001(\010\022E\n\017speech_contexts\030\006 \003(\013" +
-      "2,.google.cloud.speech.v1p1beta1.SpeechC" +
-      "ontext\022 \n\030enable_word_time_offsets\030\010 \001(\010" +
-      "\022$\n\034enable_automatic_punctuation\030\013 \001(\010\022D" +
-      "\n\010metadata\030\t \001(\01322.google.cloud.speech.v" +
-      "1p1beta1.RecognitionMetadata\022\r\n\005model\030\r " +
-      "\001(\t\022\024\n\014use_enhanced\030\016 \001(\010\"\213\001\n\rAudioEncod" +
-      "ing\022\030\n\024ENCODING_UNSPECIFIED\020\000\022\014\n\010LINEAR1" +
-      "6\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n\006AMR" +
-      "_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026SPEEX_WITH_HEADER" +
-      "_BYTE\020\007\"\323\010\n\023RecognitionMetadata\022\\\n\020inter" +
-      "action_type\030\001 \001(\0162B.google.cloud.speech." +
-      "v1p1beta1.RecognitionMetadata.Interactio" +
-      "nType\022$\n\034industry_naics_code_of_audio\030\003 " +
-      "\001(\r\022b\n\023microphone_distance\030\004 \001(\0162E.googl" +
-      "e.cloud.speech.v1p1beta1.RecognitionMeta" +
-      "data.MicrophoneDistance\022a\n\023original_medi" +
-      "a_type\030\005 \001(\0162D.google.cloud.speech.v1p1b" +
-      "eta1.RecognitionMetadata.OriginalMediaTy" +
-      "pe\022e\n\025recording_device_type\030\006 \001(\0162F.goog" +
+      "ple_rate_hertz\030\002 \001(\005\022\033\n\023audio_channel_co" +
+      "unt\030\007 \001(\005\022/\n\'enable_separate_recognition" +
+      "_per_channel\030\014 \001(\010\022\025\n\rlanguage_code\030\003 \001(" +
+      "\t\022\"\n\032alternative_language_codes\030\022 \003(\t\022\030\n" +
+      "\020max_alternatives\030\004 \001(\005\022\030\n\020profanity_fil" +
+      "ter\030\005 \001(\010\022E\n\017speech_contexts\030\006 \003(\0132,.goo" +
+      "gle.cloud.speech.v1p1beta1.SpeechContext" +
+      "\022 \n\030enable_word_time_offsets\030\010 \001(\010\022\036\n\026en" +
+      "able_word_confidence\030\017 \001(\010\022$\n\034enable_aut" +
+      "omatic_punctuation\030\013 \001(\010\022\"\n\032enable_speak" +
+      "er_diarization\030\020 \001(\010\022!\n\031diarization_spea" +
+      "ker_count\030\021 \001(\005\022D\n\010metadata\030\t \001(\01322.goog" +
       "le.cloud.speech.v1p1beta1.RecognitionMet" +
-      "adata.RecordingDeviceType\022\035\n\025recording_d" +
-      "evice_name\030\007 \001(\t\022\032\n\022original_mime_type\030\010" +
-      " \001(\t\022\025\n\robfuscated_id\030\t \001(\003\022\023\n\013audio_top" +
-      "ic\030\n \001(\t\"\305\001\n\017InteractionType\022 \n\034INTERACT" +
-      "ION_TYPE_UNSPECIFIED\020\000\022\016\n\nDISCUSSION\020\001\022\020" +
-      "\n\014PRESENTATION\020\002\022\016\n\nPHONE_CALL\020\003\022\r\n\tVOIC" +
-      "EMAIL\020\004\022\033\n\027PROFESSIONALLY_PRODUCED\020\005\022\020\n\014" +
-      "VOICE_SEARCH\020\006\022\021\n\rVOICE_COMMAND\020\007\022\r\n\tDIC" +
-      "TATION\020\010\"d\n\022MicrophoneDistance\022#\n\037MICROP" +
-      "HONE_DISTANCE_UNSPECIFIED\020\000\022\r\n\tNEARFIELD" +
-      "\020\001\022\014\n\010MIDFIELD\020\002\022\014\n\010FARFIELD\020\003\"N\n\021Origin" +
-      "alMediaType\022#\n\037ORIGINAL_MEDIA_TYPE_UNSPE" +
-      "CIFIED\020\000\022\t\n\005AUDIO\020\001\022\t\n\005VIDEO\020\002\"\244\001\n\023Recor" +
-      "dingDeviceType\022%\n!RECORDING_DEVICE_TYPE_" +
-      "UNSPECIFIED\020\000\022\016\n\nSMARTPHONE\020\001\022\006\n\002PC\020\002\022\016\n" +
-      "\nPHONE_LINE\020\003\022\013\n\007VEHICLE\020\004\022\030\n\024OTHER_OUTD" +
-      "OOR_DEVICE\020\005\022\027\n\023OTHER_INDOOR_DEVICE\020\006\" \n" +
-      "\rSpeechContext\022\017\n\007phrases\030\001 \003(\t\"D\n\020Recog" +
-      "nitionAudio\022\021\n\007content\030\001 \001(\014H\000\022\r\n\003uri\030\002 " +
-      "\001(\tH\000B\016\n\014audio_source\"\\\n\021RecognizeRespon" +
-      "se\022G\n\007results\030\002 \003(\01326.google.cloud.speec" +
-      "h.v1p1beta1.SpeechRecognitionResult\"g\n\034L" +
-      "ongRunningRecognizeResponse\022G\n\007results\030\002" +
-      " \003(\01326.google.cloud.speech.v1p1beta1.Spe" +
-      "echRecognitionResult\"\236\001\n\034LongRunningReco" +
-      "gnizeMetadata\022\030\n\020progress_percent\030\001 \001(\005\022" +
-      ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti" +
-      "mestamp\0224\n\020last_update_time\030\003 \001(\0132\032.goog" +
-      "le.protobuf.Timestamp\"\277\002\n\032StreamingRecog" +
-      "nizeResponse\022!\n\005error\030\001 \001(\0132\022.google.rpc" +
-      ".Status\022J\n\007results\030\002 \003(\01329.google.cloud." +
-      "speech.v1p1beta1.StreamingRecognitionRes" +
-      "ult\022d\n\021speech_event_type\030\004 \001(\0162I.google." +
-      "cloud.speech.v1p1beta1.StreamingRecogniz" +
-      "eResponse.SpeechEventType\"L\n\017SpeechEvent" +
-      "Type\022\034\n\030SPEECH_EVENT_UNSPECIFIED\020\000\022\033\n\027EN" +
-      "D_OF_SINGLE_UTTERANCE\020\001\"\224\001\n\032StreamingRec" +
-      "ognitionResult\022Q\n\014alternatives\030\001 \003(\0132;.g" +
+      "adata\022\r\n\005model\030\r \001(\t\022\024\n\014use_enhanced\030\016 \001" +
+      "(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING_UNSPECI" +
+      "FIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020" +
+      "\003\022\007\n\003AMR\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026" +
+      "SPEEX_WITH_HEADER_BYTE\020\007\"\323\010\n\023Recognition" +
+      "Metadata\022\\\n\020interaction_type\030\001 \001(\0162B.goo" +
+      "gle.cloud.speech.v1p1beta1.RecognitionMe" +
+      "tadata.InteractionType\022$\n\034industry_naics" +
+      "_code_of_audio\030\003 \001(\r\022b\n\023microphone_dista" +
+      "nce\030\004 \001(\0162E.google.cloud.speech.v1p1beta" +
+      "1.RecognitionMetadata.MicrophoneDistance" +
+      "\022a\n\023original_media_type\030\005 \001(\0162D.google.c" +
+      "loud.speech.v1p1beta1.RecognitionMetadat" +
+      "a.OriginalMediaType\022e\n\025recording_device_" +
+      "type\030\006 \001(\0162F.google.cloud.speech.v1p1bet" +
+      "a1.RecognitionMetadata.RecordingDeviceTy" +
+      "pe\022\035\n\025recording_device_name\030\007 \001(\t\022\032\n\022ori" +
+      "ginal_mime_type\030\010 \001(\t\022\025\n\robfuscated_id\030\t" +
+      " \001(\003\022\023\n\013audio_topic\030\n \001(\t\"\305\001\n\017Interactio" +
+      "nType\022 \n\034INTERACTION_TYPE_UNSPECIFIED\020\000\022" +
+      "\016\n\nDISCUSSION\020\001\022\020\n\014PRESENTATION\020\002\022\016\n\nPHO" +
+      "NE_CALL\020\003\022\r\n\tVOICEMAIL\020\004\022\033\n\027PROFESSIONAL" +
+      "LY_PRODUCED\020\005\022\020\n\014VOICE_SEARCH\020\006\022\021\n\rVOICE" +
+      "_COMMAND\020\007\022\r\n\tDICTATION\020\010\"d\n\022MicrophoneD" +
+      "istance\022#\n\037MICROPHONE_DISTANCE_UNSPECIFI" +
+      "ED\020\000\022\r\n\tNEARFIELD\020\001\022\014\n\010MIDFIELD\020\002\022\014\n\010FAR" +
+      "FIELD\020\003\"N\n\021OriginalMediaType\022#\n\037ORIGINAL" +
+      "_MEDIA_TYPE_UNSPECIFIED\020\000\022\t\n\005AUDIO\020\001\022\t\n\005" +
+      "VIDEO\020\002\"\244\001\n\023RecordingDeviceType\022%\n!RECOR" +
+      "DING_DEVICE_TYPE_UNSPECIFIED\020\000\022\016\n\nSMARTP" +
+      "HONE\020\001\022\006\n\002PC\020\002\022\016\n\nPHONE_LINE\020\003\022\013\n\007VEHICL" +
+      "E\020\004\022\030\n\024OTHER_OUTDOOR_DEVICE\020\005\022\027\n\023OTHER_I" +
+      "NDOOR_DEVICE\020\006\" \n\rSpeechContext\022\017\n\007phras" +
+      "es\030\001 \003(\t\"D\n\020RecognitionAudio\022\021\n\007content\030" +
+      "\001 \001(\014H\000\022\r\n\003uri\030\002 \001(\tH\000B\016\n\014audio_source\"\\" +
+      "\n\021RecognizeResponse\022G\n\007results\030\002 \003(\01326.g" +
       "oogle.cloud.speech.v1p1beta1.SpeechRecog" +
-      "nitionAlternative\022\020\n\010is_final\030\002 \001(\010\022\021\n\ts" +
-      "tability\030\003 \001(\002\"l\n\027SpeechRecognitionResul" +
-      "t\022Q\n\014alternatives\030\001 \003(\0132;.google.cloud.s" +
-      "peech.v1p1beta1.SpeechRecognitionAlterna" +
-      "tive\"~\n\034SpeechRecognitionAlternative\022\022\n\n" +
-      "transcript\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\0226\n\005" +
-      "words\030\003 \003(\0132\'.google.cloud.speech.v1p1be" +
-      "ta1.WordInfo\"t\n\010WordInfo\022-\n\nstart_time\030\001" +
-      " \001(\0132\031.google.protobuf.Duration\022+\n\010end_t" +
-      "ime\030\002 \001(\0132\031.google.protobuf.Duration\022\014\n\004" +
-      "word\030\003 \001(\t2\330\003\n\006Speech\022\226\001\n\tRecognize\022/.go" +
-      "ogle.cloud.speech.v1p1beta1.RecognizeReq" +
-      "uest\0320.google.cloud.speech.v1p1beta1.Rec" +
-      "ognizeResponse\"&\202\323\344\223\002 \"\033/v1p1beta1/speec" +
-      "h:recognize:\001*\022\244\001\n\024LongRunningRecognize\022" +
-      ":.google.cloud.speech.v1p1beta1.LongRunn" +
-      "ingRecognizeRequest\032\035.google.longrunning" +
-      ".Operation\"1\202\323\344\223\002+\"&/v1p1beta1/speech:lo" +
-      "ngrunningrecognize:\001*\022\215\001\n\022StreamingRecog" +
-      "nize\0228.google.cloud.speech.v1p1beta1.Str" +
-      "eamingRecognizeRequest\0329.google.cloud.sp" +
-      "eech.v1p1beta1.StreamingRecognizeRespons" +
-      "e(\0010\001Bz\n!com.google.cloud.speech.v1p1bet" +
-      "a1B\013SpeechProtoP\001ZCgoogle.golang.org/gen" +
-      "proto/googleapis/cloud/speech/v1p1beta1;" +
-      "speech\370\001\001b\006proto3"
+      "nitionResult\"g\n\034LongRunningRecognizeResp" +
+      "onse\022G\n\007results\030\002 \003(\01326.google.cloud.spe" +
+      "ech.v1p1beta1.SpeechRecognitionResult\"\236\001" +
+      "\n\034LongRunningRecognizeMetadata\022\030\n\020progre" +
+      "ss_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\0132\032.g" +
+      "oogle.protobuf.Timestamp\0224\n\020last_update_" +
+      "time\030\003 \001(\0132\032.google.protobuf.Timestamp\"\277" +
+      "\002\n\032StreamingRecognizeResponse\022!\n\005error\030\001" +
+      " \001(\0132\022.google.rpc.Status\022J\n\007results\030\002 \003(" +
+      "\01329.google.cloud.speech.v1p1beta1.Stream" +
+      "ingRecognitionResult\022d\n\021speech_event_typ" +
+      "e\030\004 \001(\0162I.google.cloud.speech.v1p1beta1." +
+      "StreamingRecognizeResponse.SpeechEventTy" +
+      "pe\"L\n\017SpeechEventType\022\034\n\030SPEECH_EVENT_UN" +
+      "SPECIFIED\020\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001" +
+      "\"\300\001\n\032StreamingRecognitionResult\022Q\n\014alter" +
+      "natives\030\001 \003(\0132;.google.cloud.speech.v1p1" +
+      "beta1.SpeechRecognitionAlternative\022\020\n\010is" +
+      "_final\030\002 \001(\010\022\021\n\tstability\030\003 \001(\002\022\023\n\013chann" +
+      "el_tag\030\005 \001(\005\022\025\n\rlanguage_code\030\006 \001(\t\"\230\001\n\027" +
+      "SpeechRecognitionResult\022Q\n\014alternatives\030" +
+      "\001 \003(\0132;.google.cloud.speech.v1p1beta1.Sp" +
+      "eechRecognitionAlternative\022\023\n\013channel_ta" +
+      "g\030\002 \001(\005\022\025\n\rlanguage_code\030\005 \001(\t\"~\n\034Speech" +
+      "RecognitionAlternative\022\022\n\ntranscript\030\001 \001" +
+      "(\t\022\022\n\nconfidence\030\002 \001(\002\0226\n\005words\030\003 \003(\0132\'." +
+      "google.cloud.speech.v1p1beta1.WordInfo\"\235" +
+      "\001\n\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google" +
+      ".protobuf.Duration\022+\n\010end_time\030\002 \001(\0132\031.g" +
+      "oogle.protobuf.Duration\022\014\n\004word\030\003 \001(\t\022\022\n" +
+      "\nconfidence\030\004 \001(\002\022\023\n\013speaker_tag\030\005 \001(\0052\330" +
+      "\003\n\006Speech\022\226\001\n\tRecognize\022/.google.cloud.s" +
+      "peech.v1p1beta1.RecognizeRequest\0320.googl" +
+      "e.cloud.speech.v1p1beta1.RecognizeRespon" +
+      "se\"&\202\323\344\223\002 \"\033/v1p1beta1/speech:recognize:" +
+      "\001*\022\244\001\n\024LongRunningRecognize\022:.google.clo" +
+      "ud.speech.v1p1beta1.LongRunningRecognize" +
+      "Request\032\035.google.longrunning.Operation\"1" +
+      "\202\323\344\223\002+\"&/v1p1beta1/speech:longrunningrec" +
+      "ognize:\001*\022\215\001\n\022StreamingRecognize\0228.googl" +
+      "e.cloud.speech.v1p1beta1.StreamingRecogn" +
+      "izeRequest\0329.google.cloud.speech.v1p1bet" +
+      "a1.StreamingRecognizeResponse(\0010\001Bz\n!com" +
+      ".google.cloud.speech.v1p1beta1B\013SpeechPr" +
+      "otoP\001ZCgoogle.golang.org/genproto/google" +
+      "apis/cloud/speech/v1p1beta1;speech\370\001\001b\006p" +
+      "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -264,7 +273,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_descriptor,
-        new java.lang.String[] { "Encoding", "SampleRateHertz", "LanguageCode", "MaxAlternatives", "ProfanityFilter", "SpeechContexts", "EnableWordTimeOffsets", "EnableAutomaticPunctuation", "Metadata", "Model", "UseEnhanced", });
+        new java.lang.String[] { "Encoding", "SampleRateHertz", "AudioChannelCount", "EnableSeparateRecognitionPerChannel", "LanguageCode", "AlternativeLanguageCodes", "MaxAlternatives", "ProfanityFilter", "SpeechContexts", "EnableWordTimeOffsets", "EnableWordConfidence", "EnableAutomaticPunctuation", "EnableSpeakerDiarization", "DiarizationSpeakerCount", "Metadata", "Model", "UseEnhanced", });
     internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_fieldAccessorTable = new
@@ -312,13 +321,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_descriptor,
-        new java.lang.String[] { "Alternatives", "IsFinal", "Stability", });
+        new java.lang.String[] { "Alternatives", "IsFinal", "Stability", "ChannelTag", "LanguageCode", });
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor,
-        new java.lang.String[] { "Alternatives", });
+        new java.lang.String[] { "Alternatives", "ChannelTag", "LanguageCode", });
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable = new
@@ -330,7 +339,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_WordInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_WordInfo_descriptor,
-        new java.lang.String[] { "StartTime", "EndTime", "Word", });
+        new java.lang.String[] { "StartTime", "EndTime", "Word", "Confidence", "SpeakerTag", });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.AnnotationsProto.http);
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
index 25cba65956ec..6d356b420a88 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
@@ -21,6 +21,8 @@ private SpeechRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builder alternatives_;
   /**
@@ -160,6 +174,69 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder g
     return alternatives_.get(index);
   }
 
+  public static final int CHANNEL_TAG_FIELD_NUMBER = 2;
+  private int channelTag_;
+  /**
+   * 
+   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
+ * + * int32 channel_tag = 2; + */ + public int getChannelTag() { + return channelTag_; + } + + public static final int LANGUAGE_CODE_FIELD_NUMBER = 5; + private volatile java.lang.Object languageCode_; + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 5; + */ + public java.lang.String getLanguageCode() { + java.lang.Object ref = languageCode_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + languageCode_ = s; + return s; + } + } + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 5; + */ + public com.google.protobuf.ByteString + getLanguageCodeBytes() { + java.lang.Object ref = languageCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + languageCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -175,6 +252,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < alternatives_.size(); i++) { output.writeMessage(1, alternatives_.get(i)); } + if (channelTag_ != 0) { + output.writeInt32(2, channelTag_); + } + if (!getLanguageCodeBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, languageCode_); + } unknownFields.writeTo(output); } @@ -187,6 +270,13 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, alternatives_.get(i)); } + if (channelTag_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, channelTag_); + } + if (!getLanguageCodeBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, languageCode_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -205,6 +295,10 @@ public boolean equals(final java.lang.Object obj) { boolean result = true; result = result && getAlternativesList() .equals(other.getAlternativesList()); + result = result && (getChannelTag() + == other.getChannelTag()); + result = result && getLanguageCode() + .equals(other.getLanguageCode()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -220,6 +314,10 @@ public int hashCode() { hash = (37 * hash) + ALTERNATIVES_FIELD_NUMBER; hash = (53 * hash) + getAlternativesList().hashCode(); } + hash = (37 * hash) + CHANNEL_TAG_FIELD_NUMBER; + hash = (53 * hash) + getChannelTag(); + hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER; + hash = (53 * hash) + getLanguageCode().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -360,6 +458,10 @@ public Builder clear() { } else { alternativesBuilder_.clear(); } + channelTag_ = 0; + + languageCode_ = ""; + return this; } @@ -383,6 +485,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult build() { public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial() { com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult result = new com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult(this); int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; if (alternativesBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { alternatives_ = java.util.Collections.unmodifiableList(alternatives_); @@ -392,6 +495,9 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial() } else { result.alternatives_ = alternativesBuilder_.build(); } + result.channelTag_ = channelTag_; + result.languageCode_ = languageCode_; + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -459,6 +565,13 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResu } } } + if (other.getChannelTag() != 0) { + setChannelTag(other.getChannelTag()); + } + if (!other.getLanguageCode().isEmpty()) { + languageCode_ = other.languageCode_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -852,6 +965,154 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative.Builder ad } return alternativesBuilder_; } + + private int channelTag_ ; + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 2; + */ + public int getChannelTag() { + return channelTag_; + } + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 2; + */ + public Builder setChannelTag(int value) { + + channelTag_ = value; + onChanged(); + return this; + } + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 2; + */ + public Builder clearChannelTag() { + + channelTag_ = 0; + onChanged(); + return this; + } + + private java.lang.Object languageCode_ = ""; + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 5; + */ + public java.lang.String getLanguageCode() { + java.lang.Object ref = languageCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + languageCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 5; + */ + public com.google.protobuf.ByteString + getLanguageCodeBytes() { + java.lang.Object ref = languageCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + languageCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 5; + */ + public Builder setLanguageCode( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + languageCode_ = value; + onChanged(); + return this; + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 5; + */ + public Builder clearLanguageCode() { + + languageCode_ = getDefaultInstance().getLanguageCode(); + onChanged(); + return this; + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 5; + */ + public Builder setLanguageCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + languageCode_ = value; + onChanged(); + return this; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java index 5544ddc22475..e7c9474105cd 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java @@ -65,4 +65,39 @@ public interface SpeechRecognitionResultOrBuilder extends */ com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder getAlternativesOrBuilder( int index); + + /** + *
+   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
+ * + * int32 channel_tag = 2; + */ + int getChannelTag(); + + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 5; + */ + java.lang.String getLanguageCode(); + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 5; + */ + com.google.protobuf.ByteString + getLanguageCodeBytes(); } diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java index 7e188addda7f..fd563d43977a 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java @@ -24,6 +24,8 @@ private StreamingRecognitionResult() { alternatives_ = java.util.Collections.emptyList(); isFinal_ = false; stability_ = 0F; + channelTag_ = 0; + languageCode_ = ""; } @java.lang.Override @@ -76,6 +78,17 @@ private StreamingRecognitionResult( stability_ = input.readFloat(); break; } + case 40: { + + channelTag_ = input.readInt32(); + break; + } + case 50: { + java.lang.String s = input.readStringRequireUtf8(); + + languageCode_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -208,6 +221,69 @@ public float getStability() { return stability_; } + public static final int CHANNEL_TAG_FIELD_NUMBER = 5; + private int channelTag_; + /** + *
+   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
+ * + * int32 channel_tag = 5; + */ + public int getChannelTag() { + return channelTag_; + } + + public static final int LANGUAGE_CODE_FIELD_NUMBER = 6; + private volatile java.lang.Object languageCode_; + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 6; + */ + public java.lang.String getLanguageCode() { + java.lang.Object ref = languageCode_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + languageCode_ = s; + return s; + } + } + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 6; + */ + public com.google.protobuf.ByteString + getLanguageCodeBytes() { + java.lang.Object ref = languageCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + languageCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -229,6 +305,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (stability_ != 0F) { output.writeFloat(3, stability_); } + if (channelTag_ != 0) { + output.writeInt32(5, channelTag_); + } + if (!getLanguageCodeBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, languageCode_); + } unknownFields.writeTo(output); } @@ -249,6 +331,13 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeFloatSize(3, stability_); } + if (channelTag_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, channelTag_); + } + if (!getLanguageCodeBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, languageCode_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -273,6 +362,10 @@ public boolean equals(final java.lang.Object obj) { java.lang.Float.floatToIntBits(getStability()) == java.lang.Float.floatToIntBits( other.getStability())); + result = result && (getChannelTag() + == other.getChannelTag()); + result = result && getLanguageCode() + .equals(other.getLanguageCode()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -294,6 +387,10 @@ public int hashCode() { hash = (37 * hash) + STABILITY_FIELD_NUMBER; hash = (53 * hash) + java.lang.Float.floatToIntBits( getStability()); + hash = (37 * hash) + CHANNEL_TAG_FIELD_NUMBER; + hash = (53 * hash) + getChannelTag(); + hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER; + hash = (53 * hash) + getLanguageCode().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -439,6 +536,10 @@ public Builder clear() { stability_ = 0F; + channelTag_ = 0; + + languageCode_ = ""; + return this; } @@ -474,6 +575,8 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult buildPartial } result.isFinal_ = isFinal_; result.stability_ = stability_; + result.channelTag_ = channelTag_; + result.languageCode_ = languageCode_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -548,6 +651,13 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognitionR if (other.getStability() != 0F) { setStability(other.getStability()); } + if (other.getChannelTag() != 0) { + setChannelTag(other.getChannelTag()); + } + if (!other.getLanguageCode().isEmpty()) { + languageCode_ = other.languageCode_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1041,6 +1151,154 @@ public Builder clearStability() { onChanged(); return this; } + + private int channelTag_ ; + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 5; + */ + public int getChannelTag() { + return channelTag_; + } + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 5; + */ + public Builder setChannelTag(int value) { + + channelTag_ = value; + onChanged(); + return this; + } + /** + *
+     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
+ * + * int32 channel_tag = 5; + */ + public Builder clearChannelTag() { + + channelTag_ = 0; + onChanged(); + return this; + } + + private java.lang.Object languageCode_ = ""; + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 6; + */ + public java.lang.String getLanguageCode() { + java.lang.Object ref = languageCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + languageCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 6; + */ + public com.google.protobuf.ByteString + getLanguageCodeBytes() { + java.lang.Object ref = languageCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + languageCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 6; + */ + public Builder setLanguageCode( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + languageCode_ = value; + onChanged(); + return this; + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 6; + */ + public Builder clearLanguageCode() { + + languageCode_ = getDefaultInstance().getLanguageCode(); + onChanged(); + return this; + } + /** + *
+     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
+ * + * string language_code = 6; + */ + public Builder setLanguageCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + languageCode_ = value; + onChanged(); + return this; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java index 76a508fd71a1..445015b286b7 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java @@ -91,4 +91,39 @@ com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder getAlter * float stability = 3; */ float getStability(); + + /** + *
+   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
+ * + * int32 channel_tag = 5; + */ + int getChannelTag(); + + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 6; + */ + java.lang.String getLanguageCode(); + /** + *
+   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
+ * + * string language_code = 6; + */ + com.google.protobuf.ByteString + getLanguageCodeBytes(); } diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java index 9bef41cdfbf7..0eddd9c6e8bd 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java @@ -21,6 +21,8 @@ private WordInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private WordInfo() { word_ = ""; + confidence_ = 0F; + speakerTag_ = 0; } @java.lang.Override @@ -86,6 +88,16 @@ private WordInfo( word_ = s; break; } + case 37: { + + confidence_ = input.readFloat(); + break; + } + case 40: { + + speakerTag_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -248,6 +260,42 @@ public java.lang.String getWord() { } } + public static final int CONFIDENCE_FIELD_NUMBER = 4; + private float confidence_; + /** + *
+   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+   * indicates an estimated greater likelihood that the recognized words are
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
+   * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+   * 
+ * + * float confidence = 4; + */ + public float getConfidence() { + return confidence_; + } + + public static final int SPEAKER_TAG_FIELD_NUMBER = 5; + private int speakerTag_; + /** + *
+   * Output only. A distinct integer value is assigned for every speaker within
+   * the audio. This field specifies which one of those speakers was detected to
+   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+   * top alternative.
+   * 
+ * + * int32 speaker_tag = 5; + */ + public int getSpeakerTag() { + return speakerTag_; + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -269,6 +317,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getWordBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, word_); } + if (confidence_ != 0F) { + output.writeFloat(4, confidence_); + } + if (speakerTag_ != 0) { + output.writeInt32(5, speakerTag_); + } unknownFields.writeTo(output); } @@ -288,6 +342,14 @@ public int getSerializedSize() { if (!getWordBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, word_); } + if (confidence_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(4, confidence_); + } + if (speakerTag_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, speakerTag_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -316,6 +378,12 @@ public boolean equals(final java.lang.Object obj) { } result = result && getWord() .equals(other.getWord()); + result = result && ( + java.lang.Float.floatToIntBits(getConfidence()) + == java.lang.Float.floatToIntBits( + other.getConfidence())); + result = result && (getSpeakerTag() + == other.getSpeakerTag()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -337,6 +405,11 @@ public int hashCode() { } hash = (37 * hash) + WORD_FIELD_NUMBER; hash = (53 * hash) + getWord().hashCode(); + hash = (37 * hash) + CONFIDENCE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getConfidence()); + hash = (37 * hash) + SPEAKER_TAG_FIELD_NUMBER; + hash = (53 * hash) + getSpeakerTag(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -484,6 +557,10 @@ public Builder clear() { } word_ = ""; + confidence_ = 0F; + + speakerTag_ = 0; + return this; } @@ -517,6 +594,8 @@ public com.google.cloud.speech.v1p1beta1.WordInfo buildPartial() { result.endTime_ = endTimeBuilder_.build(); } result.word_ = word_; + result.confidence_ = confidence_; + result.speakerTag_ = speakerTag_; onBuilt(); return result; } @@ -568,6 +647,12 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.WordInfo other) { word_ = other.word_; onChanged(); } + if (other.getConfidence() != 0F) { + setConfidence(other.getConfidence()); + } + if (other.getSpeakerTag() != 0) { + setSpeakerTag(other.getSpeakerTag()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1079,6 +1164,112 @@ public Builder setWordBytes( onChanged(); return this; } + + private float confidence_ ; + /** + *
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
+ * + * float confidence = 4; + */ + public float getConfidence() { + return confidence_; + } + /** + *
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
+ * + * float confidence = 4; + */ + public Builder setConfidence(float value) { + + confidence_ = value; + onChanged(); + return this; + } + /** + *
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
+ * + * float confidence = 4; + */ + public Builder clearConfidence() { + + confidence_ = 0F; + onChanged(); + return this; + } + + private int speakerTag_ ; + /** + *
+     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
+ * + * int32 speaker_tag = 5; + */ + public int getSpeakerTag() { + return speakerTag_; + } + /** + *
+     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
+ * + * int32 speaker_tag = 5; + */ + public Builder setSpeakerTag(int value) { + + speakerTag_ = value; + onChanged(); + return this; + } + /** + *
+     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
+ * + * int32 speaker_tag = 5; + */ + public Builder clearSpeakerTag() { + + speakerTag_ = 0; + onChanged(); + return this; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java index c6d2e8478d81..c47302b64c6c 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java @@ -104,4 +104,32 @@ public interface WordInfoOrBuilder extends */ com.google.protobuf.ByteString getWordBytes(); + + /** + *
+   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+   * indicates an estimated greater likelihood that the recognized words are
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
+   * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+   * 
+ * + * float confidence = 4; + */ + float getConfidence(); + + /** + *
+   * Output only. A distinct integer value is assigned for every speaker within
+   * the audio. This field specifies which one of those speakers was detected to
+   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+   * top alternative.
+   * 
+ * + * int32 speaker_tag = 5; + */ + int getSpeakerTag(); } diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto index 77e4e1081662..208f53633e02 100644 --- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto +++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto @@ -212,6 +212,25 @@ message RecognitionConfig { // for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding]. int32 sample_rate_hertz = 2; + // *Optional* The number of channels in the input audio data. + // ONLY set this for MULTI-CHANNEL recognition. + // Valid values for LINEAR16 and FLAC are `1`-`8`. + // Valid values for OGG_OPUS are '1'-'254'. + // Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`. + // If `0` or omitted, defaults to one channel (mono). + // NOTE: We only recognize the first channel by default. + // To perform independent recognition on each channel set + // enable_separate_recognition_per_channel to 'true'. + int32 audio_channel_count = 7; + + // This needs to be set to ‘true’ explicitly and audio_channel_count > 1 + // to get each channel recognized separately. The recognition result will + // contain a channel_tag field to state which channel that result belongs to. + // If this is not ‘true’, we will only recognize the first channel. + // NOTE: The request is also billed cumulatively for all channels recognized: + // (audio_channel_count times the audio length) + bool enable_separate_recognition_per_channel = 12; + // *Required* The language of the supplied audio as a // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. // Example: "en-US". @@ -219,6 +238,20 @@ message RecognitionConfig { // for a list of the currently supported language codes. string language_code = 3; + // *Optional* A list of up to 3 additional + // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags, + // listing possible alternative languages of the supplied audio. + // See [Language Support](https://cloud.google.com/speech/docs/languages) + // for a list of the currently supported language codes. + // If alternative languages are listed, recognition result will contain + // recognition in the most likely language detected including the main + // language_code. The recognition result will include the language tag + // of the language detected in the audio. + // NOTE: This feature is only supported for Voice Command and Voice Search + // use cases and performance may vary for other use cases (e.g., phone call + // transcription). + repeated string alternative_language_codes = 18; + // *Optional* Maximum number of recognition hypotheses to be returned. // Specifically, the maximum number of `SpeechRecognitionAlternative` messages // within each `SpeechRecognitionResult`. @@ -242,6 +275,11 @@ message RecognitionConfig { // `false`. bool enable_word_time_offsets = 8; + // *Optional* If `true`, the top result includes a list of words and the + // confidence for those words. If `false`, no word-level confidence + // information is returned. The default is `false`. + bool enable_word_confidence = 15; + // *Optional* If 'true', adds punctuation to recognition result hypotheses. // This feature is only available in select languages. Setting this for // requests in other languages has no effect at all. @@ -251,6 +289,21 @@ message RecognitionConfig { // premium feature." bool enable_automatic_punctuation = 11; + // *Optional* If 'true', enables speaker detection for each recognized word in + // the top alternative of the recognition result using a speaker_tag provided + // in the WordInfo. + // Note: When this is true, we send all the words from the beginning of the + // audio for the top alternative in every consecutive responses. + // This is done in order to improve our speaker tags as our models learn to + // identify the speakers in the conversation over time. + bool enable_speaker_diarization = 16; + + // *Optional* + // If set, specifies the estimated number of speakers in the conversation. + // If not set, defaults to '2'. + // Ignored unless enable_speaker_diarization is set to true." + int32 diarization_speaker_count = 17; + // *Optional* Metadata regarding this request. RecognitionMetadata metadata = 9; @@ -604,6 +657,17 @@ message StreamingRecognitionResult { // This field is only provided for interim results (`is_final=false`). // The default of 0.0 is a sentinel value indicating `stability` was not set. float stability = 3; + + // For multi-channel audio, this is the channel number corresponding to the + // recognized result for the audio from that channel. + // For audio_channel_count = N, its output values can range from '1' to 'N'. + int32 channel_tag = 5; + + // Output only. The + // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the + // language in this result. This language code was detected to have the most + // likelihood of being spoken in the audio. + string language_code = 6; } // A speech recognition result corresponding to a portion of the audio. @@ -613,6 +677,17 @@ message SpeechRecognitionResult { // These alternatives are ordered in terms of accuracy, with the top (first) // alternative being the most probable, as ranked by the recognizer. repeated SpeechRecognitionAlternative alternatives = 1; + + // For multi-channel audio, this is the channel number corresponding to the + // recognized result for the audio from that channel. + // For audio_channel_count = N, its output values can range from '1' to 'N'. + int32 channel_tag = 2; + + // Output only. The + // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the + // language in this result. This language code was detected to have the most + // likelihood of being spoken in the audio. + string language_code = 5; } // Alternative hypotheses (a.k.a. n-best list). @@ -655,4 +730,21 @@ message WordInfo { // Output only. The word corresponding to this set of information. string word = 3; + + // Output only. The confidence estimate between 0.0 and 1.0. A higher number + // indicates an estimated greater likelihood that the recognized words are + // correct. This field is set only for the top alternative of a non-streaming + // result or, of a streaming result where `is_final=true`. + // This field is not guaranteed to be accurate and users should not rely on it + // to be always provided. + // The default of 0.0 is a sentinel value indicating `confidence` was not set. + float confidence = 4; + + // Output only. A distinct integer value is assigned for every speaker within + // the audio. This field specifies which one of those speakers was detected to + // have spoken this word. Value ranges from '1' to diarization_speaker_count. + // speaker_tag is set if enable_speaker_diarization = 'true' and only in the + // top alternative. + int32 speaker_tag = 5; + }