diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f8a857531..31923bd13 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 + digest: sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 54bd1454d..6e937f3ca 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -71,12 +71,12 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; graalvm17) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; samples) diff --git a/CHANGELOG.md b/CHANGELOG.md index be91cfdec..da2768673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.14.3](https://github.com/googleapis/java-logging/compare/v3.14.2...v3.14.3) (2023-02-06) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.2.0 ([#1269](https://github.com/googleapis/java-logging/issues/1269)) ([e196a80](https://github.com/googleapis/java-logging/commit/e196a802d0d004dcec2ddfb352ed9aebebe68810)) + ## [3.14.2](https://github.com/googleapis/java-logging/compare/v3.14.1...v3.14.2) (2023-01-24) diff --git a/README.md b/README.md index 8ca3d28e7..e21b9d584 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.4.0 + 26.6.0 pom import @@ -43,7 +43,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 3.14.1 + 3.14.2 ``` @@ -51,20 +51,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.4.0') +implementation platform('com.google.cloud:libraries-bom:26.6.0') implementation 'com.google.cloud:google-cloud-logging' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging:3.14.1' +implementation 'com.google.cloud:google-cloud-logging:3.14.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.14.1" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.14.2" ``` ## Authentication diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 38cf89ddc..98f0bd1fe 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.14.2 + 3.14.3 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.14.2 + 3.14.3 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.103.2 + 0.103.3 com.google.api.grpc proto-google-cloud-logging-v2 - 0.103.2 + 0.103.3 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 2acf7f793..3a12a3716 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.14.2 + 3.14.3 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.14.2 + 3.14.3 google-cloud-logging diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java index a915017a0..9d0004a74 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java @@ -41,7 +41,7 @@ public final class Instrumentation { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.14.2"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.14.3"; // {x-version-update-end} public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log"; public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14; diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index f40368b89..faa34f952 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.103.2 + 0.103.3 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.14.2 + 3.14.3 diff --git a/pom.xml b/pom.xml index d72b27a56..ffa327ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.14.2 + 3.14.3 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,23 +61,23 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.103.2 + 0.103.3 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.103.2 + 0.103.3 com.google.cloud google-cloud-logging - 3.14.2 + 3.14.3 com.google.cloud google-cloud-shared-dependencies - 3.1.2 + 3.2.0 pom import diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index d03f103ad..16548f2b4 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.103.2 + 0.103.3 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.14.2 + 3.14.3 diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java index e2b1ee093..60621ab20 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int USE_PARTITIONED_TABLES_FIELD_NUMBER = 1; - private boolean usePartitionedTables_; + private boolean usePartitionedTables_ = false; /** * * @@ -91,7 +91,7 @@ public boolean getUsePartitionedTables() { } public static final int USES_TIMESTAMP_COLUMN_PARTITIONING_FIELD_NUMBER = 3; - private boolean usesTimestampColumnPartitioning_; + private boolean usesTimestampColumnPartitioning_ = false; /** * * @@ -323,10 +323,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; usePartitionedTables_ = false; - usesTimestampColumnPartitioning_ = false; - return this; } @@ -354,12 +353,23 @@ public com.google.logging.v2.BigQueryOptions build() { public com.google.logging.v2.BigQueryOptions buildPartial() { com.google.logging.v2.BigQueryOptions result = new com.google.logging.v2.BigQueryOptions(this); - result.usePartitionedTables_ = usePartitionedTables_; - result.usesTimestampColumnPartitioning_ = usesTimestampColumnPartitioning_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.BigQueryOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.usePartitionedTables_ = usePartitionedTables_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.usesTimestampColumnPartitioning_ = usesTimestampColumnPartitioning_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -440,13 +450,13 @@ public Builder mergeFrom( case 8: { usePartitionedTables_ = input.readBool(); - + bitField0_ |= 0x00000001; break; } // case 8 case 24: { usesTimestampColumnPartitioning_ = input.readBool(); - + bitField0_ |= 0x00000002; break; } // case 24 default: @@ -466,6 +476,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private boolean usePartitionedTables_; /** * @@ -511,6 +523,7 @@ public boolean getUsePartitionedTables() { public Builder setUsePartitionedTables(boolean value) { usePartitionedTables_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -533,7 +546,7 @@ public Builder setUsePartitionedTables(boolean value) { * @return This builder for chaining. */ public Builder clearUsePartitionedTables() { - + bitField0_ = (bitField0_ & ~0x00000001); usePartitionedTables_ = false; onChanged(); return this; @@ -584,6 +597,7 @@ public boolean getUsesTimestampColumnPartitioning() { public Builder setUsesTimestampColumnPartitioning(boolean value) { usesTimestampColumnPartitioning_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -606,7 +620,7 @@ public Builder setUsesTimestampColumnPartitioning(boolean value) { * @return This builder for chaining. */ public Builder clearUsesTimestampColumnPartitioning() { - + bitField0_ = (bitField0_ & ~0x00000002); usesTimestampColumnPartitioning_ = false; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java index 2bee22e18..38e44419a 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java @@ -77,7 +77,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int KMS_KEY_NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object kmsKeyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kmsKeyName_ = ""; /** * * @@ -209,7 +213,9 @@ public com.google.protobuf.ByteString getKmsKeyNameBytes() { } public static final int SERVICE_ACCOUNT_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object serviceAccountId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object serviceAccountId_ = ""; /** * * @@ -495,12 +501,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - kmsKeyName_ = ""; - serviceAccountId_ = ""; - return this; } @@ -527,13 +531,26 @@ public com.google.logging.v2.CmekSettings build() { @java.lang.Override public com.google.logging.v2.CmekSettings buildPartial() { com.google.logging.v2.CmekSettings result = new com.google.logging.v2.CmekSettings(this); - result.name_ = name_; - result.kmsKeyName_ = kmsKeyName_; - result.serviceAccountId_ = serviceAccountId_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CmekSettings result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.kmsKeyName_ = kmsKeyName_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.serviceAccountId_ = serviceAccountId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -581,14 +598,17 @@ public Builder mergeFrom(com.google.logging.v2.CmekSettings other) { if (other == com.google.logging.v2.CmekSettings.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getKmsKeyName().isEmpty()) { kmsKeyName_ = other.kmsKeyName_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getServiceAccountId().isEmpty()) { serviceAccountId_ = other.serviceAccountId_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -620,19 +640,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { kmsKeyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { serviceAccountId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -652,6 +672,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -713,8 +735,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -730,8 +752,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -752,8 +774,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -870,8 +892,8 @@ public Builder setKmsKeyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kmsKeyName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -904,8 +926,8 @@ public Builder setKmsKeyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKmsKeyName() { - kmsKeyName_ = getDefaultInstance().getKmsKeyName(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -943,8 +965,8 @@ public Builder setKmsKeyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kmsKeyName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1037,8 +1059,8 @@ public Builder setServiceAccountId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - serviceAccountId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1063,8 +1085,8 @@ public Builder setServiceAccountId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearServiceAccountId() { - serviceAccountId_ = getDefaultInstance().getServiceAccountId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1094,8 +1116,8 @@ public Builder setServiceAccountIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - serviceAccountId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesMetadata.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesMetadata.java index 36d43762d..1f76b2df6 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesMetadata.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesMetadata.java @@ -111,7 +111,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 2; @@ -157,11 +157,11 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } public static final int STATE_FIELD_NUMBER = 3; - private int state_; + private int state_ = 0; /** * * @@ -190,14 +190,13 @@ public int getStateValue() { */ @java.lang.Override public com.google.logging.v2.OperationState getState() { - @SuppressWarnings("deprecation") com.google.logging.v2.OperationState result = - com.google.logging.v2.OperationState.valueOf(state_); + com.google.logging.v2.OperationState.forNumber(state_); return result == null ? com.google.logging.v2.OperationState.UNRECOGNIZED : result; } public static final int CANCELLATION_REQUESTED_FIELD_NUMBER = 4; - private boolean cancellationRequested_; + private boolean cancellationRequested_ = false; /** * * @@ -259,11 +258,13 @@ public com.google.logging.v2.CopyLogEntriesRequest getRequest() { */ @java.lang.Override public com.google.logging.v2.CopyLogEntriesRequestOrBuilder getRequestOrBuilder() { - return getRequest(); + return request_ == null + ? com.google.logging.v2.CopyLogEntriesRequest.getDefaultInstance() + : request_; } public static final int PROGRESS_FIELD_NUMBER = 6; - private int progress_; + private int progress_ = 0; /** * * @@ -281,7 +282,9 @@ public int getProgress() { } public static final int WRITER_IDENTITY_FIELD_NUMBER = 7; - private volatile java.lang.Object writerIdentity_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writerIdentity_ = ""; /** * * @@ -603,32 +606,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + bitField0_ = 0; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } state_ = 0; - cancellationRequested_ = false; - - if (requestBuilder_ == null) { - request_ = null; - } else { - request_ = null; + request_ = null; + if (requestBuilder_ != null) { + requestBuilder_.dispose(); requestBuilder_ = null; } progress_ = 0; - writerIdentity_ = ""; - return this; } @@ -656,29 +653,38 @@ public com.google.logging.v2.CopyLogEntriesMetadata build() { public com.google.logging.v2.CopyLogEntriesMetadata buildPartial() { com.google.logging.v2.CopyLogEntriesMetadata result = new com.google.logging.v2.CopyLogEntriesMetadata(this); - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); - } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.state_ = state_; - result.cancellationRequested_ = cancellationRequested_; - if (requestBuilder_ == null) { - result.request_ = request_; - } else { - result.request_ = requestBuilder_.build(); - } - result.progress_ = progress_; - result.writerIdentity_ = writerIdentity_; onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CopyLogEntriesMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.cancellationRequested_ = cancellationRequested_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.request_ = requestBuilder_ == null ? request_ : requestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.progress_ = progress_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.writerIdentity_ = writerIdentity_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -744,6 +750,7 @@ public Builder mergeFrom(com.google.logging.v2.CopyLogEntriesMetadata other) { } if (!other.getWriterIdentity().isEmpty()) { writerIdentity_ = other.writerIdentity_; + bitField0_ |= 0x00000040; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -775,43 +782,43 @@ public Builder mergeFrom( case 10: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { state_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { cancellationRequested_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: { input.readMessage(getRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { progress_ = input.readInt32(); - + bitField0_ |= 0x00000020; break; } // case 48 case 58: { writerIdentity_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000040; break; } // case 58 default: @@ -831,6 +838,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -849,7 +858,7 @@ public Builder mergeFrom( * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -884,11 +893,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -903,11 +912,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -921,17 +930,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -944,14 +954,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 1; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -964,7 +973,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 1; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1028,7 +1037,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1063,11 +1072,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1082,11 +1091,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1100,17 +1109,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1123,14 +1133,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 2; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1143,7 +1152,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 2; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } @@ -1218,8 +1227,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1236,9 +1245,8 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.logging.v2.OperationState getState() { - @SuppressWarnings("deprecation") com.google.logging.v2.OperationState result = - com.google.logging.v2.OperationState.valueOf(state_); + com.google.logging.v2.OperationState.forNumber(state_); return result == null ? com.google.logging.v2.OperationState.UNRECOGNIZED : result; } /** @@ -1257,7 +1265,7 @@ public Builder setState(com.google.logging.v2.OperationState value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; state_ = value.getNumber(); onChanged(); return this; @@ -1274,7 +1282,7 @@ public Builder setState(com.google.logging.v2.OperationState value) { * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000004); state_ = 0; onChanged(); return this; @@ -1311,6 +1319,7 @@ public boolean getCancellationRequested() { public Builder setCancellationRequested(boolean value) { cancellationRequested_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1326,7 +1335,7 @@ public Builder setCancellationRequested(boolean value) { * @return This builder for chaining. */ public Builder clearCancellationRequested() { - + bitField0_ = (bitField0_ & ~0x00000008); cancellationRequested_ = false; onChanged(); return this; @@ -1350,7 +1359,7 @@ public Builder clearCancellationRequested() { * @return Whether the request field is set. */ public boolean hasRequest() { - return requestBuilder_ != null || request_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1387,11 +1396,11 @@ public Builder setRequest(com.google.logging.v2.CopyLogEntriesRequest value) { throw new NullPointerException(); } request_ = value; - onChanged(); } else { requestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1406,11 +1415,11 @@ public Builder setRequest(com.google.logging.v2.CopyLogEntriesRequest value) { public Builder setRequest(com.google.logging.v2.CopyLogEntriesRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); - onChanged(); } else { requestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1424,19 +1433,18 @@ public Builder setRequest(com.google.logging.v2.CopyLogEntriesRequest.Builder bu */ public Builder mergeRequest(com.google.logging.v2.CopyLogEntriesRequest value) { if (requestBuilder_ == null) { - if (request_ != null) { - request_ = - com.google.logging.v2.CopyLogEntriesRequest.newBuilder(request_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && request_ != null + && request_ != com.google.logging.v2.CopyLogEntriesRequest.getDefaultInstance()) { + getRequestBuilder().mergeFrom(value); } else { request_ = value; } - onChanged(); } else { requestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1449,14 +1457,13 @@ public Builder mergeRequest(com.google.logging.v2.CopyLogEntriesRequest value) { * .google.logging.v2.CopyLogEntriesRequest request = 5; */ public Builder clearRequest() { - if (requestBuilder_ == null) { - request_ = null; - onChanged(); - } else { - request_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + request_ = null; + if (requestBuilder_ != null) { + requestBuilder_.dispose(); requestBuilder_ = null; } - + onChanged(); return this; } /** @@ -1469,7 +1476,7 @@ public Builder clearRequest() { * .google.logging.v2.CopyLogEntriesRequest request = 5; */ public com.google.logging.v2.CopyLogEntriesRequest.Builder getRequestBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getRequestFieldBuilder().getBuilder(); } @@ -1548,6 +1555,7 @@ public int getProgress() { public Builder setProgress(int value) { progress_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1563,7 +1571,7 @@ public Builder setProgress(int value) { * @return This builder for chaining. */ public Builder clearProgress() { - + bitField0_ = (bitField0_ & ~0x00000020); progress_ = 0; onChanged(); return this; @@ -1642,8 +1650,8 @@ public Builder setWriterIdentity(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writerIdentity_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1663,8 +1671,8 @@ public Builder setWriterIdentity(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriterIdentity() { - writerIdentity_ = getDefaultInstance().getWriterIdentity(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -1689,8 +1697,8 @@ public Builder setWriterIdentityBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writerIdentity_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesRequest.java index 7daf03c3c..39af342d7 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -123,7 +125,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int FILTER_FIELD_NUMBER = 3; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -174,7 +178,9 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int DESTINATION_FIELD_NUMBER = 4; - private volatile java.lang.Object destination_; + + @SuppressWarnings("serial") + private volatile java.lang.Object destination_ = ""; /** * * @@ -437,12 +443,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - filter_ = ""; - destination_ = ""; - return this; } @@ -470,13 +474,26 @@ public com.google.logging.v2.CopyLogEntriesRequest build() { public com.google.logging.v2.CopyLogEntriesRequest buildPartial() { com.google.logging.v2.CopyLogEntriesRequest result = new com.google.logging.v2.CopyLogEntriesRequest(this); - result.name_ = name_; - result.filter_ = filter_; - result.destination_ = destination_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CopyLogEntriesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.destination_ = destination_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -524,14 +541,17 @@ public Builder mergeFrom(com.google.logging.v2.CopyLogEntriesRequest other) { if (other == com.google.logging.v2.CopyLogEntriesRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getDestination().isEmpty()) { destination_ = other.destination_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -563,19 +583,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 26: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 26 case 34: { destination_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 34 default: @@ -595,6 +615,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -662,8 +684,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -681,8 +703,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -705,8 +727,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -775,8 +797,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -793,8 +815,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -816,8 +838,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -883,8 +905,8 @@ public Builder setDestination(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - destination_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -900,8 +922,8 @@ public Builder setDestination(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDestination() { - destination_ = getDefaultInstance().getDestination(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -922,8 +944,8 @@ public Builder setDestinationBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - destination_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesResponse.java index 75fd3cbc1..dbccd1936 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CopyLogEntriesResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int LOG_ENTRIES_COPIED_COUNT_FIELD_NUMBER = 1; - private long logEntriesCopiedCount_; + private long logEntriesCopiedCount_ = 0L; /** * * @@ -280,8 +280,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logEntriesCopiedCount_ = 0L; - return this; } @@ -309,11 +309,20 @@ public com.google.logging.v2.CopyLogEntriesResponse build() { public com.google.logging.v2.CopyLogEntriesResponse buildPartial() { com.google.logging.v2.CopyLogEntriesResponse result = new com.google.logging.v2.CopyLogEntriesResponse(this); - result.logEntriesCopiedCount_ = logEntriesCopiedCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CopyLogEntriesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logEntriesCopiedCount_ = logEntriesCopiedCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -391,7 +400,7 @@ public Builder mergeFrom( case 8: { logEntriesCopiedCount_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -411,6 +420,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long logEntriesCopiedCount_; /** * @@ -442,6 +453,7 @@ public long getLogEntriesCopiedCount() { public Builder setLogEntriesCopiedCount(long value) { logEntriesCopiedCount_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -457,7 +469,7 @@ public Builder setLogEntriesCopiedCount(long value) { * @return This builder for chaining. */ public Builder clearLogEntriesCopiedCount() { - + bitField0_ = (bitField0_ & ~0x00000001); logEntriesCopiedCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequest.java index 0728dcc07..8713b81c7 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -128,7 +130,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int BUCKET_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object bucketId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object bucketId_ = ""; /** * * @@ -229,7 +233,7 @@ public com.google.logging.v2.LogBucket getBucket() { */ @java.lang.Override public com.google.logging.v2.LogBucketOrBuilder getBucketOrBuilder() { - return getBucket(); + return bucket_ == null ? com.google.logging.v2.LogBucket.getDefaultInstance() : bucket_; } private byte memoizedIsInitialized = -1; @@ -452,14 +456,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - bucketId_ = ""; - - if (bucketBuilder_ == null) { - bucket_ = null; - } else { - bucket_ = null; + bucket_ = null; + if (bucketBuilder_ != null) { + bucketBuilder_.dispose(); bucketBuilder_ = null; } return this; @@ -489,17 +491,26 @@ public com.google.logging.v2.CreateBucketRequest build() { public com.google.logging.v2.CreateBucketRequest buildPartial() { com.google.logging.v2.CreateBucketRequest result = new com.google.logging.v2.CreateBucketRequest(this); - result.parent_ = parent_; - result.bucketId_ = bucketId_; - if (bucketBuilder_ == null) { - result.bucket_ = bucket_; - } else { - result.bucket_ = bucketBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CreateBucketRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.bucketId_ = bucketId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.bucket_ = bucketBuilder_ == null ? bucket_ : bucketBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -547,10 +558,12 @@ public Builder mergeFrom(com.google.logging.v2.CreateBucketRequest other) { if (other == com.google.logging.v2.CreateBucketRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getBucketId().isEmpty()) { bucketId_ = other.bucketId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasBucket()) { @@ -585,19 +598,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { bucketId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getBucketFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -617,6 +630,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -693,8 +708,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -715,8 +730,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -742,8 +757,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -815,8 +830,8 @@ public Builder setBucketId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bucketId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -834,8 +849,8 @@ public Builder setBucketId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearBucketId() { - bucketId_ = getDefaultInstance().getBucketId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -858,8 +873,8 @@ public Builder setBucketIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - bucketId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -885,7 +900,7 @@ public Builder setBucketIdBytes(com.google.protobuf.ByteString value) { * @return Whether the bucket field is set. */ public boolean hasBucket() { - return bucketBuilder_ != null || bucket_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -926,11 +941,11 @@ public Builder setBucket(com.google.logging.v2.LogBucket value) { throw new NullPointerException(); } bucket_ = value; - onChanged(); } else { bucketBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -948,11 +963,11 @@ public Builder setBucket(com.google.logging.v2.LogBucket value) { public Builder setBucket(com.google.logging.v2.LogBucket.Builder builderForValue) { if (bucketBuilder_ == null) { bucket_ = builderForValue.build(); - onChanged(); } else { bucketBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -969,17 +984,18 @@ public Builder setBucket(com.google.logging.v2.LogBucket.Builder builderForValue */ public Builder mergeBucket(com.google.logging.v2.LogBucket value) { if (bucketBuilder_ == null) { - if (bucket_ != null) { - bucket_ = - com.google.logging.v2.LogBucket.newBuilder(bucket_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && bucket_ != null + && bucket_ != com.google.logging.v2.LogBucket.getDefaultInstance()) { + getBucketBuilder().mergeFrom(value); } else { bucket_ = value; } - onChanged(); } else { bucketBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -995,14 +1011,13 @@ public Builder mergeBucket(com.google.logging.v2.LogBucket value) { * */ public Builder clearBucket() { - if (bucketBuilder_ == null) { - bucket_ = null; - onChanged(); - } else { - bucket_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + bucket_ = null; + if (bucketBuilder_ != null) { + bucketBuilder_.dispose(); bucketBuilder_ = null; } - + onChanged(); return this; } /** @@ -1018,7 +1033,7 @@ public Builder clearBucket() { * */ public com.google.logging.v2.LogBucket.Builder getBucketBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getBucketFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java index d57a670e1..a0b2b2c54 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -185,7 +187,9 @@ public com.google.logging.v2.LogExclusion getExclusion() { */ @java.lang.Override public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { - return getExclusion(); + return exclusion_ == null + ? com.google.logging.v2.LogExclusion.getDefaultInstance() + : exclusion_; } private byte memoizedIsInitialized = -1; @@ -399,12 +403,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (exclusionBuilder_ == null) { - exclusion_ = null; - } else { - exclusion_ = null; + exclusion_ = null; + if (exclusionBuilder_ != null) { + exclusionBuilder_.dispose(); exclusionBuilder_ = null; } return this; @@ -434,16 +437,23 @@ public com.google.logging.v2.CreateExclusionRequest build() { public com.google.logging.v2.CreateExclusionRequest buildPartial() { com.google.logging.v2.CreateExclusionRequest result = new com.google.logging.v2.CreateExclusionRequest(this); - result.parent_ = parent_; - if (exclusionBuilder_ == null) { - result.exclusion_ = exclusion_; - } else { - result.exclusion_ = exclusionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CreateExclusionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.exclusion_ = exclusionBuilder_ == null ? exclusion_ : exclusionBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -491,6 +501,7 @@ public Builder mergeFrom(com.google.logging.v2.CreateExclusionRequest other) { if (other == com.google.logging.v2.CreateExclusionRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasExclusion()) { @@ -525,13 +536,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getExclusionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -551,6 +562,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -639,8 +652,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -665,8 +678,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -696,8 +709,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -723,7 +736,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the exclusion field is set. */ public boolean hasExclusion() { - return exclusionBuilder_ != null || exclusion_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -766,11 +779,11 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion value) { throw new NullPointerException(); } exclusion_ = value; - onChanged(); } else { exclusionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -788,11 +801,11 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion value) { public Builder setExclusion(com.google.logging.v2.LogExclusion.Builder builderForValue) { if (exclusionBuilder_ == null) { exclusion_ = builderForValue.build(); - onChanged(); } else { exclusionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -809,19 +822,18 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion.Builder builderFo */ public Builder mergeExclusion(com.google.logging.v2.LogExclusion value) { if (exclusionBuilder_ == null) { - if (exclusion_ != null) { - exclusion_ = - com.google.logging.v2.LogExclusion.newBuilder(exclusion_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && exclusion_ != null + && exclusion_ != com.google.logging.v2.LogExclusion.getDefaultInstance()) { + getExclusionBuilder().mergeFrom(value); } else { exclusion_ = value; } - onChanged(); } else { exclusionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -837,14 +849,13 @@ public Builder mergeExclusion(com.google.logging.v2.LogExclusion value) { * */ public Builder clearExclusion() { - if (exclusionBuilder_ == null) { - exclusion_ = null; - onChanged(); - } else { - exclusion_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + exclusion_ = null; + if (exclusionBuilder_ != null) { + exclusionBuilder_.dispose(); exclusionBuilder_ = null; } - + onChanged(); return this; } /** @@ -860,7 +871,7 @@ public Builder clearExclusion() { * */ public com.google.logging.v2.LogExclusion.Builder getExclusionBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getExclusionFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java index 8dd6e7a9c..3f96ba932 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -170,7 +172,7 @@ public com.google.logging.v2.LogMetric getMetric() { */ @java.lang.Override public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { - return getMetric(); + return metric_ == null ? com.google.logging.v2.LogMetric.getDefaultInstance() : metric_; } private byte memoizedIsInitialized = -1; @@ -384,12 +386,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (metricBuilder_ == null) { - metric_ = null; - } else { - metric_ = null; + metric_ = null; + if (metricBuilder_ != null) { + metricBuilder_.dispose(); metricBuilder_ = null; } return this; @@ -419,16 +420,23 @@ public com.google.logging.v2.CreateLogMetricRequest build() { public com.google.logging.v2.CreateLogMetricRequest buildPartial() { com.google.logging.v2.CreateLogMetricRequest result = new com.google.logging.v2.CreateLogMetricRequest(this); - result.parent_ = parent_; - if (metricBuilder_ == null) { - result.metric_ = metric_; - } else { - result.metric_ = metricBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CreateLogMetricRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.metric_ = metricBuilder_ == null ? metric_ : metricBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -476,6 +484,7 @@ public Builder mergeFrom(com.google.logging.v2.CreateLogMetricRequest other) { if (other == com.google.logging.v2.CreateLogMetricRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasMetric()) { @@ -510,13 +519,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getMetricFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -536,6 +545,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -609,8 +620,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -630,8 +641,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -656,8 +667,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -682,7 +693,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the metric field is set. */ public boolean hasMetric() { - return metricBuilder_ != null || metric_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -721,11 +732,11 @@ public Builder setMetric(com.google.logging.v2.LogMetric value) { throw new NullPointerException(); } metric_ = value; - onChanged(); } else { metricBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -742,11 +753,11 @@ public Builder setMetric(com.google.logging.v2.LogMetric value) { public Builder setMetric(com.google.logging.v2.LogMetric.Builder builderForValue) { if (metricBuilder_ == null) { metric_ = builderForValue.build(); - onChanged(); } else { metricBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -762,17 +773,18 @@ public Builder setMetric(com.google.logging.v2.LogMetric.Builder builderForValue */ public Builder mergeMetric(com.google.logging.v2.LogMetric value) { if (metricBuilder_ == null) { - if (metric_ != null) { - metric_ = - com.google.logging.v2.LogMetric.newBuilder(metric_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && metric_ != null + && metric_ != com.google.logging.v2.LogMetric.getDefaultInstance()) { + getMetricBuilder().mergeFrom(value); } else { metric_ = value; } - onChanged(); } else { metricBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -787,14 +799,13 @@ public Builder mergeMetric(com.google.logging.v2.LogMetric value) { * */ public Builder clearMetric() { - if (metricBuilder_ == null) { - metric_ = null; - onChanged(); - } else { - metric_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + metric_ = null; + if (metricBuilder_ != null) { + metricBuilder_.dispose(); metricBuilder_ = null; } - + onChanged(); return this; } /** @@ -809,7 +820,7 @@ public Builder clearMetric() { * */ public com.google.logging.v2.LogMetric.Builder getMetricBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getMetricFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java index 8d19a1482..65ba9fe6c 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -180,11 +182,11 @@ public com.google.logging.v2.LogSink getSink() { */ @java.lang.Override public com.google.logging.v2.LogSinkOrBuilder getSinkOrBuilder() { - return getSink(); + return sink_ == null ? com.google.logging.v2.LogSink.getDefaultInstance() : sink_; } public static final int UNIQUE_WRITER_IDENTITY_FIELD_NUMBER = 3; - private boolean uniqueWriterIdentity_; + private boolean uniqueWriterIdentity_ = false; /** * * @@ -429,16 +431,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (sinkBuilder_ == null) { - sink_ = null; - } else { - sink_ = null; + sink_ = null; + if (sinkBuilder_ != null) { + sinkBuilder_.dispose(); sinkBuilder_ = null; } uniqueWriterIdentity_ = false; - return this; } @@ -466,17 +466,26 @@ public com.google.logging.v2.CreateSinkRequest build() { public com.google.logging.v2.CreateSinkRequest buildPartial() { com.google.logging.v2.CreateSinkRequest result = new com.google.logging.v2.CreateSinkRequest(this); - result.parent_ = parent_; - if (sinkBuilder_ == null) { - result.sink_ = sink_; - } else { - result.sink_ = sinkBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.uniqueWriterIdentity_ = uniqueWriterIdentity_; onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CreateSinkRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sink_ = sinkBuilder_ == null ? sink_ : sinkBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.uniqueWriterIdentity_ = uniqueWriterIdentity_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -524,6 +533,7 @@ public Builder mergeFrom(com.google.logging.v2.CreateSinkRequest other) { if (other == com.google.logging.v2.CreateSinkRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasSink()) { @@ -561,19 +571,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getSinkFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { uniqueWriterIdentity_ = input.readBool(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -593,6 +603,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -681,8 +693,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -707,8 +719,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -738,8 +750,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -763,7 +775,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the sink field is set. */ public boolean hasSink() { - return sinkBuilder_ != null || sink_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -800,11 +812,11 @@ public Builder setSink(com.google.logging.v2.LogSink value) { throw new NullPointerException(); } sink_ = value; - onChanged(); } else { sinkBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -820,11 +832,11 @@ public Builder setSink(com.google.logging.v2.LogSink value) { public Builder setSink(com.google.logging.v2.LogSink.Builder builderForValue) { if (sinkBuilder_ == null) { sink_ = builderForValue.build(); - onChanged(); } else { sinkBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -839,16 +851,18 @@ public Builder setSink(com.google.logging.v2.LogSink.Builder builderForValue) { */ public Builder mergeSink(com.google.logging.v2.LogSink value) { if (sinkBuilder_ == null) { - if (sink_ != null) { - sink_ = com.google.logging.v2.LogSink.newBuilder(sink_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && sink_ != null + && sink_ != com.google.logging.v2.LogSink.getDefaultInstance()) { + getSinkBuilder().mergeFrom(value); } else { sink_ = value; } - onChanged(); } else { sinkBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -862,14 +876,13 @@ public Builder mergeSink(com.google.logging.v2.LogSink value) { * .google.logging.v2.LogSink sink = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearSink() { - if (sinkBuilder_ == null) { - sink_ = null; - onChanged(); - } else { - sink_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + sink_ = null; + if (sinkBuilder_ != null) { + sinkBuilder_.dispose(); sinkBuilder_ = null; } - + onChanged(); return this; } /** @@ -883,7 +896,7 @@ public Builder clearSink() { * .google.logging.v2.LogSink sink = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.logging.v2.LogSink.Builder getSinkBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getSinkFieldBuilder().getBuilder(); } @@ -980,6 +993,7 @@ public boolean getUniqueWriterIdentity() { public Builder setUniqueWriterIdentity(boolean value) { uniqueWriterIdentity_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1004,7 +1018,7 @@ public Builder setUniqueWriterIdentity(boolean value) { * @return This builder for chaining. */ public Builder clearUniqueWriterIdentity() { - + bitField0_ = (bitField0_ & ~0x00000004); uniqueWriterIdentity_ = false; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequest.java index d9a42f2db..1503f8f89 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -124,7 +126,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int VIEW_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object viewId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object viewId_ = ""; /** * * @@ -215,7 +219,7 @@ public com.google.logging.v2.LogView getView() { */ @java.lang.Override public com.google.logging.v2.LogViewOrBuilder getViewOrBuilder() { - return getView(); + return view_ == null ? com.google.logging.v2.LogView.getDefaultInstance() : view_; } private byte memoizedIsInitialized = -1; @@ -437,14 +441,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - viewId_ = ""; - - if (viewBuilder_ == null) { - view_ = null; - } else { - view_ = null; + view_ = null; + if (viewBuilder_ != null) { + viewBuilder_.dispose(); viewBuilder_ = null; } return this; @@ -474,17 +476,26 @@ public com.google.logging.v2.CreateViewRequest build() { public com.google.logging.v2.CreateViewRequest buildPartial() { com.google.logging.v2.CreateViewRequest result = new com.google.logging.v2.CreateViewRequest(this); - result.parent_ = parent_; - result.viewId_ = viewId_; - if (viewBuilder_ == null) { - result.view_ = view_; - } else { - result.view_ = viewBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.CreateViewRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.viewId_ = viewId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.view_ = viewBuilder_ == null ? view_ : viewBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -532,10 +543,12 @@ public Builder mergeFrom(com.google.logging.v2.CreateViewRequest other) { if (other == com.google.logging.v2.CreateViewRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getViewId().isEmpty()) { viewId_ = other.viewId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasView()) { @@ -570,19 +583,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { viewId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getViewFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -602,6 +615,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -672,8 +687,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -692,8 +707,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -717,8 +732,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -784,8 +799,8 @@ public Builder setViewId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - viewId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -801,8 +816,8 @@ public Builder setViewId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearViewId() { - viewId_ = getDefaultInstance().getViewId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -823,8 +838,8 @@ public Builder setViewIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - viewId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -847,7 +862,7 @@ public Builder setViewIdBytes(com.google.protobuf.ByteString value) { * @return Whether the view field is set. */ public boolean hasView() { - return viewBuilder_ != null || view_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -882,11 +897,11 @@ public Builder setView(com.google.logging.v2.LogView value) { throw new NullPointerException(); } view_ = value; - onChanged(); } else { viewBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -901,11 +916,11 @@ public Builder setView(com.google.logging.v2.LogView value) { public Builder setView(com.google.logging.v2.LogView.Builder builderForValue) { if (viewBuilder_ == null) { view_ = builderForValue.build(); - onChanged(); } else { viewBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -919,16 +934,18 @@ public Builder setView(com.google.logging.v2.LogView.Builder builderForValue) { */ public Builder mergeView(com.google.logging.v2.LogView value) { if (viewBuilder_ == null) { - if (view_ != null) { - view_ = com.google.logging.v2.LogView.newBuilder(view_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && view_ != null + && view_ != com.google.logging.v2.LogView.getDefaultInstance()) { + getViewBuilder().mergeFrom(value); } else { view_ = value; } - onChanged(); } else { viewBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -941,14 +958,13 @@ public Builder mergeView(com.google.logging.v2.LogView value) { * .google.logging.v2.LogView view = 3 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearView() { - if (viewBuilder_ == null) { - view_ = null; - onChanged(); - } else { - view_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + view_ = null; + if (viewBuilder_ != null) { + viewBuilder_.dispose(); viewBuilder_ = null; } - + onChanged(); return this; } /** @@ -961,7 +977,7 @@ public Builder clearView() { * .google.logging.v2.LogView view = 3 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.logging.v2.LogView.Builder getViewBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getViewFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequest.java index 90266ee26..563984237 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -329,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -358,11 +360,20 @@ public com.google.logging.v2.DeleteBucketRequest build() { public com.google.logging.v2.DeleteBucketRequest buildPartial() { com.google.logging.v2.DeleteBucketRequest result = new com.google.logging.v2.DeleteBucketRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteBucketRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -410,6 +421,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteBucketRequest other) { if (other == com.google.logging.v2.DeleteBucketRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -441,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -461,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -546,8 +560,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -571,8 +585,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -601,8 +615,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java index b524564af..ac13bb3d1 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -329,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -358,11 +360,20 @@ public com.google.logging.v2.DeleteExclusionRequest build() { public com.google.logging.v2.DeleteExclusionRequest buildPartial() { com.google.logging.v2.DeleteExclusionRequest result = new com.google.logging.v2.DeleteExclusionRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteExclusionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -410,6 +421,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteExclusionRequest other) { if (other == com.google.logging.v2.DeleteExclusionRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -441,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -461,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -546,8 +560,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -571,8 +585,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -601,8 +615,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java index 32ed4340d..c71f49879 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int METRIC_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object metricName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object metricName_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; metricName_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.logging.v2.DeleteLogMetricRequest build() { public com.google.logging.v2.DeleteLogMetricRequest buildPartial() { com.google.logging.v2.DeleteLogMetricRequest result = new com.google.logging.v2.DeleteLogMetricRequest(this); - result.metricName_ = metricName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteLogMetricRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.metricName_ = metricName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogMetricRequest other) { if (other == com.google.logging.v2.DeleteLogMetricRequest.getDefaultInstance()) return this; if (!other.getMetricName().isEmpty()) { metricName_ = other.metricName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -431,7 +443,7 @@ public Builder mergeFrom( case 10: { metricName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -451,6 +463,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object metricName_ = ""; /** * @@ -521,8 +535,8 @@ public Builder setMetricName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -541,8 +555,8 @@ public Builder setMetricName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearMetricName() { - metricName_ = getDefaultInstance().getMetricName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -566,8 +580,8 @@ public Builder setMetricNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java index 14a935ff7..12d8bd7a8 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int LOG_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object logName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object logName_ = ""; /** * * @@ -334,8 +336,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logName_ = ""; - return this; } @@ -363,11 +365,20 @@ public com.google.logging.v2.DeleteLogRequest build() { public com.google.logging.v2.DeleteLogRequest buildPartial() { com.google.logging.v2.DeleteLogRequest result = new com.google.logging.v2.DeleteLogRequest(this); - result.logName_ = logName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteLogRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logName_ = logName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -415,6 +426,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogRequest other) { if (other == com.google.logging.v2.DeleteLogRequest.getDefaultInstance()) return this; if (!other.getLogName().isEmpty()) { logName_ = other.logName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -446,7 +458,7 @@ public Builder mergeFrom( case 10: { logName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -466,6 +478,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object logName_ = ""; /** * @@ -560,8 +574,8 @@ public Builder setLogName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -588,8 +602,8 @@ public Builder setLogName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLogName() { - logName_ = getDefaultInstance().getLogName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -621,8 +635,8 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java index fecb22b72..9a61f2100 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SINK_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object sinkName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sinkName_ = ""; /** * * @@ -330,8 +332,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; sinkName_ = ""; - return this; } @@ -359,11 +361,20 @@ public com.google.logging.v2.DeleteSinkRequest build() { public com.google.logging.v2.DeleteSinkRequest buildPartial() { com.google.logging.v2.DeleteSinkRequest result = new com.google.logging.v2.DeleteSinkRequest(this); - result.sinkName_ = sinkName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteSinkRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.sinkName_ = sinkName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -411,6 +422,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteSinkRequest other) { if (other == com.google.logging.v2.DeleteSinkRequest.getDefaultInstance()) return this; if (!other.getSinkName().isEmpty()) { sinkName_ = other.sinkName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -442,7 +454,7 @@ public Builder mergeFrom( case 10: { sinkName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -462,6 +474,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object sinkName_ = ""; /** * @@ -550,8 +564,8 @@ public Builder setSinkName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -576,8 +590,8 @@ public Builder setSinkName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSinkName() { - sinkName_ = getDefaultInstance().getSinkName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -607,8 +621,8 @@ public Builder setSinkNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequest.java index 037ace80a..cca0a346f 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -351,11 +353,20 @@ public com.google.logging.v2.DeleteViewRequest build() { public com.google.logging.v2.DeleteViewRequest buildPartial() { com.google.logging.v2.DeleteViewRequest result = new com.google.logging.v2.DeleteViewRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.DeleteViewRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -403,6 +414,7 @@ public Builder mergeFrom(com.google.logging.v2.DeleteViewRequest other) { if (other == com.google.logging.v2.DeleteViewRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -434,7 +446,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -454,6 +466,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -530,8 +544,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -552,8 +566,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -579,8 +593,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequest.java index 45a6b8b75..36fe87ba0 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -328,8 +330,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -357,11 +359,20 @@ public com.google.logging.v2.GetBucketRequest build() { public com.google.logging.v2.GetBucketRequest buildPartial() { com.google.logging.v2.GetBucketRequest result = new com.google.logging.v2.GetBucketRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetBucketRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -409,6 +420,7 @@ public Builder mergeFrom(com.google.logging.v2.GetBucketRequest other) { if (other == com.google.logging.v2.GetBucketRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -440,7 +452,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -460,6 +472,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -545,8 +559,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -570,8 +584,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -600,8 +614,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequest.java index 7f0c30f45..5c82860c3 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequest.java @@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -345,8 +347,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -374,11 +376,20 @@ public com.google.logging.v2.GetCmekSettingsRequest build() { public com.google.logging.v2.GetCmekSettingsRequest buildPartial() { com.google.logging.v2.GetCmekSettingsRequest result = new com.google.logging.v2.GetCmekSettingsRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetCmekSettingsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -426,6 +437,7 @@ public Builder mergeFrom(com.google.logging.v2.GetCmekSettingsRequest other) { if (other == com.google.logging.v2.GetCmekSettingsRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -457,7 +469,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -477,6 +489,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -574,8 +588,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -603,8 +617,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -637,8 +651,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java index 52a4a9c14..f1006ce68 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -329,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -358,11 +360,20 @@ public com.google.logging.v2.GetExclusionRequest build() { public com.google.logging.v2.GetExclusionRequest buildPartial() { com.google.logging.v2.GetExclusionRequest result = new com.google.logging.v2.GetExclusionRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetExclusionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -410,6 +421,7 @@ public Builder mergeFrom(com.google.logging.v2.GetExclusionRequest other) { if (other == com.google.logging.v2.GetExclusionRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -441,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -461,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -546,8 +560,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -571,8 +585,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -601,8 +615,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java index 2d8975794..981e3c690 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int METRIC_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object metricName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object metricName_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; metricName_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.logging.v2.GetLogMetricRequest build() { public com.google.logging.v2.GetLogMetricRequest buildPartial() { com.google.logging.v2.GetLogMetricRequest result = new com.google.logging.v2.GetLogMetricRequest(this); - result.metricName_ = metricName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetLogMetricRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.metricName_ = metricName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.logging.v2.GetLogMetricRequest other) { if (other == com.google.logging.v2.GetLogMetricRequest.getDefaultInstance()) return this; if (!other.getMetricName().isEmpty()) { metricName_ = other.metricName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -431,7 +443,7 @@ public Builder mergeFrom( case 10: { metricName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -451,6 +463,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object metricName_ = ""; /** * @@ -521,8 +535,8 @@ public Builder setMetricName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -541,8 +555,8 @@ public Builder setMetricName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearMetricName() { - metricName_ = getDefaultInstance().getMetricName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -566,8 +580,8 @@ public Builder setMetricNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSettingsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSettingsRequest.java index 0a0e17ba2..44e784cbc 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSettingsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSettingsRequest.java @@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -344,8 +346,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -373,11 +375,20 @@ public com.google.logging.v2.GetSettingsRequest build() { public com.google.logging.v2.GetSettingsRequest buildPartial() { com.google.logging.v2.GetSettingsRequest result = new com.google.logging.v2.GetSettingsRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetSettingsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -425,6 +436,7 @@ public Builder mergeFrom(com.google.logging.v2.GetSettingsRequest other) { if (other == com.google.logging.v2.GetSettingsRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -456,7 +468,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -476,6 +488,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -573,8 +587,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -602,8 +616,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -636,8 +650,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java index ee9236955..803a1c2dc 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SINK_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object sinkName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sinkName_ = ""; /** * * @@ -327,8 +329,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; sinkName_ = ""; - return this; } @@ -355,11 +357,20 @@ public com.google.logging.v2.GetSinkRequest build() { @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_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetSinkRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.sinkName_ = sinkName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -407,6 +418,7 @@ public Builder mergeFrom(com.google.logging.v2.GetSinkRequest other) { if (other == com.google.logging.v2.GetSinkRequest.getDefaultInstance()) return this; if (!other.getSinkName().isEmpty()) { sinkName_ = other.sinkName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -438,7 +450,7 @@ public Builder mergeFrom( case 10: { sinkName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -458,6 +470,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object sinkName_ = ""; /** * @@ -543,8 +557,8 @@ public Builder setSinkName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -568,8 +582,8 @@ public Builder setSinkName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSinkName() { - sinkName_ = getDefaultInstance().getSinkName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -598,8 +612,8 @@ public Builder setSinkNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequest.java index a7719c403..78704ab89 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -349,11 +351,20 @@ public com.google.logging.v2.GetViewRequest build() { @java.lang.Override public com.google.logging.v2.GetViewRequest buildPartial() { com.google.logging.v2.GetViewRequest result = new com.google.logging.v2.GetViewRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.GetViewRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.logging.v2.GetViewRequest other) { if (other == com.google.logging.v2.GetViewRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -528,8 +542,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -550,8 +564,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -577,8 +591,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequest.java index d75e6f87e..5428a76ae 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -136,7 +138,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -191,7 +195,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -424,12 +428,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - pageSize_ = 0; - return this; } @@ -457,13 +459,26 @@ public com.google.logging.v2.ListBucketsRequest build() { public com.google.logging.v2.ListBucketsRequest buildPartial() { com.google.logging.v2.ListBucketsRequest result = new com.google.logging.v2.ListBucketsRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; - result.pageSize_ = pageSize_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.ListBucketsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -511,10 +526,12 @@ public Builder mergeFrom(com.google.logging.v2.ListBucketsRequest other) { if (other == com.google.logging.v2.ListBucketsRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getPageSize() != 0) { @@ -549,19 +566,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -581,6 +598,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -669,8 +688,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -695,8 +714,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -726,8 +745,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -802,8 +821,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -822,8 +841,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -847,8 +866,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -888,6 +907,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -905,7 +925,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponse.java index 7a5788ce2..4116a5fbf 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int BUCKETS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List buckets_; /** * @@ -138,7 +140,9 @@ public com.google.logging.v2.LogBucketOrBuilder getBucketsOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -398,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (bucketsBuilder_ == null) { buckets_ = java.util.Collections.emptyList(); } else { @@ -406,7 +411,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -434,7 +438,15 @@ public com.google.logging.v2.ListBucketsResponse build() { public com.google.logging.v2.ListBucketsResponse buildPartial() { com.google.logging.v2.ListBucketsResponse result = new com.google.logging.v2.ListBucketsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListBucketsResponse result) { if (bucketsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { buckets_ = java.util.Collections.unmodifiableList(buckets_); @@ -444,9 +456,13 @@ public com.google.logging.v2.ListBucketsResponse buildPartial() { } else { result.buckets_ = bucketsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListBucketsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -523,6 +539,7 @@ public Builder mergeFrom(com.google.logging.v2.ListBucketsResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -566,7 +583,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1001,8 +1018,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1020,8 +1037,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1044,8 +1061,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java index 5d407e241..cdd0e3d12 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -185,7 +189,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -419,12 +423,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - pageSize_ = 0; - return this; } @@ -452,13 +454,26 @@ public com.google.logging.v2.ListExclusionsRequest build() { public com.google.logging.v2.ListExclusionsRequest buildPartial() { com.google.logging.v2.ListExclusionsRequest result = new com.google.logging.v2.ListExclusionsRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; - result.pageSize_ = pageSize_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.ListExclusionsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -506,10 +521,12 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsRequest other) { if (other == com.google.logging.v2.ListExclusionsRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getPageSize() != 0) { @@ -544,19 +561,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -576,6 +593,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -655,8 +674,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -678,8 +697,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -706,8 +725,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -782,8 +801,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -802,8 +821,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -827,8 +846,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -868,6 +887,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -885,7 +905,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java index 2ae4c10af..149024462 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int EXCLUSIONS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List exclusions_; /** * @@ -138,7 +140,9 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionsOrBuilder(int in } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -398,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (exclusionsBuilder_ == null) { exclusions_ = java.util.Collections.emptyList(); } else { @@ -406,7 +411,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -434,7 +438,15 @@ public com.google.logging.v2.ListExclusionsResponse build() { public com.google.logging.v2.ListExclusionsResponse buildPartial() { com.google.logging.v2.ListExclusionsResponse result = new com.google.logging.v2.ListExclusionsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListExclusionsResponse result) { if (exclusionsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { exclusions_ = java.util.Collections.unmodifiableList(exclusions_); @@ -444,9 +456,13 @@ public com.google.logging.v2.ListExclusionsResponse buildPartial() { } else { result.exclusions_ = exclusionsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListExclusionsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -523,6 +539,7 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -567,7 +584,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1004,8 +1021,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1023,8 +1040,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1047,8 +1064,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java index 19e3462f9..76c517eb0 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java @@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_NAMES_FIELD_NUMBER = 8; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList resourceNames_; /** * @@ -184,7 +186,9 @@ public com.google.protobuf.ByteString getResourceNamesBytes(int index) { } public static final int FILTER_FIELD_NUMBER = 2; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -245,7 +249,9 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int ORDER_BY_FIELD_NUMBER = 3; - private volatile java.lang.Object orderBy_; + + @SuppressWarnings("serial") + private volatile java.lang.Object orderBy_ = ""; /** * * @@ -304,7 +310,7 @@ public com.google.protobuf.ByteString getOrderByBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 4; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -325,7 +331,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 5; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -619,16 +627,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; resourceNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); filter_ = ""; - orderBy_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -656,18 +661,36 @@ public com.google.logging.v2.ListLogEntriesRequest build() { public com.google.logging.v2.ListLogEntriesRequest buildPartial() { com.google.logging.v2.ListLogEntriesRequest result = new com.google.logging.v2.ListLogEntriesRequest(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListLogEntriesRequest result) { if (((bitField0_ & 0x00000001) != 0)) { resourceNames_ = resourceNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.resourceNames_ = resourceNames_; - result.filter_ = filter_; - result.orderBy_ = orderBy_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListLogEntriesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.orderBy_ = orderBy_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.pageToken_ = pageToken_; + } } @java.lang.Override @@ -727,10 +750,12 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesRequest other) { } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getOrderBy().isEmpty()) { orderBy_ = other.orderBy_; + bitField0_ |= 0x00000004; onChanged(); } if (other.getPageSize() != 0) { @@ -738,6 +763,7 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesRequest other) { } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -769,25 +795,25 @@ public Builder mergeFrom( case 18: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { orderBy_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 case 66: @@ -1180,8 +1206,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1203,8 +1229,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1231,8 +1257,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1313,8 +1339,8 @@ public Builder setOrderBy(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - orderBy_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1335,8 +1361,8 @@ public Builder setOrderBy(java.lang.String value) { * @return This builder for chaining. */ public Builder clearOrderBy() { - orderBy_ = getDefaultInstance().getOrderBy(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1362,8 +1388,8 @@ public Builder setOrderByBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - orderBy_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1405,6 +1431,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1423,7 +1450,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000008); pageSize_ = 0; onChanged(); return this; @@ -1499,8 +1526,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1519,8 +1546,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1544,8 +1571,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java index 52cc8d0f2..9994c1812 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ENTRIES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List entries_; /** * @@ -148,7 +150,9 @@ public com.google.logging.v2.LogEntryOrBuilder getEntriesOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -420,6 +424,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); } else { @@ -428,7 +433,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -456,7 +460,15 @@ public com.google.logging.v2.ListLogEntriesResponse build() { public com.google.logging.v2.ListLogEntriesResponse buildPartial() { com.google.logging.v2.ListLogEntriesResponse result = new com.google.logging.v2.ListLogEntriesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListLogEntriesResponse result) { if (entriesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); @@ -466,9 +478,13 @@ public com.google.logging.v2.ListLogEntriesResponse buildPartial() { } else { result.entries_ = entriesBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListLogEntriesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -545,6 +561,7 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -588,7 +605,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1077,8 +1094,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1102,8 +1119,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1132,8 +1149,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java index 3c7ead565..a75c2a294 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -124,7 +126,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -179,7 +183,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -413,12 +417,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - pageSize_ = 0; - return this; } @@ -446,13 +448,26 @@ public com.google.logging.v2.ListLogMetricsRequest build() { public com.google.logging.v2.ListLogMetricsRequest buildPartial() { com.google.logging.v2.ListLogMetricsRequest result = new com.google.logging.v2.ListLogMetricsRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; - result.pageSize_ = pageSize_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.ListLogMetricsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -500,10 +515,12 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsRequest other) { if (other == com.google.logging.v2.ListLogMetricsRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getPageSize() != 0) { @@ -538,19 +555,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -570,6 +587,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -640,8 +659,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -660,8 +679,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -685,8 +704,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -761,8 +780,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -781,8 +800,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -806,8 +825,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -847,6 +866,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -864,7 +884,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java index e4079a273..ebf64d4e9 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int METRICS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List metrics_; /** * @@ -138,7 +140,9 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricsOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -398,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (metricsBuilder_ == null) { metrics_ = java.util.Collections.emptyList(); } else { @@ -406,7 +411,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -434,7 +438,15 @@ public com.google.logging.v2.ListLogMetricsResponse build() { public com.google.logging.v2.ListLogMetricsResponse buildPartial() { com.google.logging.v2.ListLogMetricsResponse result = new com.google.logging.v2.ListLogMetricsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListLogMetricsResponse result) { if (metricsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { metrics_ = java.util.Collections.unmodifiableList(metrics_); @@ -444,9 +456,13 @@ public com.google.logging.v2.ListLogMetricsResponse buildPartial() { } else { result.metrics_ = metricsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListLogMetricsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -523,6 +539,7 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -566,7 +583,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1001,8 +1018,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1020,8 +1037,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1044,8 +1061,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java index f4742a623..f4d77419a 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -131,7 +133,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 2; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -151,7 +153,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -206,6 +210,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int RESOURCE_NAMES_FIELD_NUMBER = 8; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList resourceNames_; /** * @@ -539,14 +545,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageSize_ = 0; - pageToken_ = ""; - resourceNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -574,19 +578,35 @@ public com.google.logging.v2.ListLogsRequest build() { public com.google.logging.v2.ListLogsRequest buildPartial() { com.google.logging.v2.ListLogsRequest result = new com.google.logging.v2.ListLogsRequest(this); - int from_bitField0_ = bitField0_; - result.parent_ = parent_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; - if (((bitField0_ & 0x00000001) != 0)) { - resourceNames_ = resourceNames_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.resourceNames_ = resourceNames_; onBuilt(); return result; } + private void buildPartialRepeatedFields(com.google.logging.v2.ListLogsRequest result) { + if (((bitField0_ & 0x00000008) != 0)) { + resourceNames_ = resourceNames_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.resourceNames_ = resourceNames_; + } + + private void buildPartial0(com.google.logging.v2.ListLogsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -634,6 +654,7 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsRequest other) { if (other == com.google.logging.v2.ListLogsRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getPageSize() != 0) { @@ -641,12 +662,13 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsRequest other) { } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.resourceNames_.isEmpty()) { if (resourceNames_.isEmpty()) { resourceNames_ = other.resourceNames_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureResourceNamesIsMutable(); resourceNames_.addAll(other.resourceNames_); @@ -682,19 +704,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 66: @@ -802,8 +824,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -825,8 +847,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -853,8 +875,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -894,6 +916,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -911,7 +934,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000002); pageSize_ = 0; onChanged(); return this; @@ -987,8 +1010,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1007,8 +1030,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1032,8 +1055,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1042,9 +1065,9 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureResourceNamesIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { resourceNames_ = new com.google.protobuf.LazyStringArrayList(resourceNames_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } /** @@ -1267,7 +1290,7 @@ public Builder addAllResourceNames(java.lang.Iterable values) */ public Builder clearResourceNames() { resourceNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java index 7feefadd4..0e87e53ea 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int LOG_NAMES_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList logNames_; /** * @@ -138,7 +140,9 @@ public com.google.protobuf.ByteString getLogNamesBytes(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -402,10 +406,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -433,15 +437,27 @@ public com.google.logging.v2.ListLogsResponse build() { public com.google.logging.v2.ListLogsResponse buildPartial() { com.google.logging.v2.ListLogsResponse result = new com.google.logging.v2.ListLogsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListLogsResponse result) { if (((bitField0_ & 0x00000001) != 0)) { logNames_ = logNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.logNames_ = logNames_; - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListLogsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -501,6 +517,7 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -532,7 +549,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -814,8 +831,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -833,8 +850,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -857,8 +874,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java index c0e25727a..e6a886442 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java @@ -70,7 +70,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PAGE_SIZE_FIELD_NUMBER = 1; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -90,7 +90,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -351,10 +353,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -383,12 +384,24 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest build() { public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest buildPartial() { com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result = new com.google.logging.v2.ListMonitoredResourceDescriptorsRequest(this); - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -441,6 +454,7 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -472,13 +486,13 @@ public Builder mergeFrom( case 8: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -498,6 +512,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int pageSize_; /** * @@ -533,6 +549,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -550,7 +567,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000001); pageSize_ = 0; onChanged(); return this; @@ -626,8 +643,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -646,8 +663,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -671,8 +688,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java index fa46db9af..dcd3a8cb1 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java @@ -71,6 +71,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_DESCRIPTORS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List resourceDescriptors_; /** * @@ -141,7 +143,9 @@ public com.google.api.MonitoredResourceDescriptorOrBuilder getResourceDescriptor } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -403,6 +407,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (resourceDescriptorsBuilder_ == null) { resourceDescriptors_ = java.util.Collections.emptyList(); } else { @@ -411,7 +416,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -440,7 +444,16 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse build() { public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildPartial() { com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result = new com.google.logging.v2.ListMonitoredResourceDescriptorsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result) { if (resourceDescriptorsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { resourceDescriptors_ = java.util.Collections.unmodifiableList(resourceDescriptors_); @@ -450,9 +463,14 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildParti } else { result.resourceDescriptors_ = resourceDescriptorsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -531,6 +549,7 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -575,7 +594,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1024,8 +1043,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1043,8 +1062,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1067,8 +1086,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java index 45732d315..9d02461a2 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -185,7 +189,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -418,12 +422,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - pageSize_ = 0; - return this; } @@ -451,13 +453,26 @@ public com.google.logging.v2.ListSinksRequest build() { public com.google.logging.v2.ListSinksRequest buildPartial() { com.google.logging.v2.ListSinksRequest result = new com.google.logging.v2.ListSinksRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; - result.pageSize_ = pageSize_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.ListSinksRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -505,10 +520,12 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksRequest other) { if (other == com.google.logging.v2.ListSinksRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getPageSize() != 0) { @@ -543,19 +560,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -575,6 +592,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -654,8 +673,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -677,8 +696,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -705,8 +724,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -781,8 +800,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -801,8 +820,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -826,8 +845,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -867,6 +886,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -884,7 +904,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java index 2be346fc0..c5987f070 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SINKS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List sinks_; /** * @@ -137,7 +139,9 @@ public com.google.logging.v2.LogSinkOrBuilder getSinksOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -396,6 +400,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (sinksBuilder_ == null) { sinks_ = java.util.Collections.emptyList(); } else { @@ -404,7 +409,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -432,7 +436,15 @@ public com.google.logging.v2.ListSinksResponse build() { public com.google.logging.v2.ListSinksResponse buildPartial() { com.google.logging.v2.ListSinksResponse result = new com.google.logging.v2.ListSinksResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListSinksResponse result) { if (sinksBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { sinks_ = java.util.Collections.unmodifiableList(sinks_); @@ -442,9 +454,13 @@ public com.google.logging.v2.ListSinksResponse buildPartial() { } else { result.sinks_ = sinksBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListSinksResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -521,6 +537,7 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -564,7 +581,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -997,8 +1014,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1016,8 +1033,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1040,8 +1057,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequest.java index 56e71c244..ff9684a0e 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -175,7 +179,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -408,12 +412,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - pageSize_ = 0; - return this; } @@ -441,13 +443,26 @@ public com.google.logging.v2.ListViewsRequest build() { public com.google.logging.v2.ListViewsRequest buildPartial() { com.google.logging.v2.ListViewsRequest result = new com.google.logging.v2.ListViewsRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; - result.pageSize_ = pageSize_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.ListViewsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -495,10 +510,12 @@ public Builder mergeFrom(com.google.logging.v2.ListViewsRequest other) { if (other == com.google.logging.v2.ListViewsRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getPageSize() != 0) { @@ -533,19 +550,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -565,6 +582,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -629,8 +648,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -647,8 +666,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -670,8 +689,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -746,8 +765,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -766,8 +785,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -791,8 +810,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -832,6 +851,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -849,7 +869,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponse.java index c594e6634..b537de301 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int VIEWS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List views_; /** * @@ -137,7 +139,9 @@ public com.google.logging.v2.LogViewOrBuilder getViewsOrBuilder(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -396,6 +400,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (viewsBuilder_ == null) { views_ = java.util.Collections.emptyList(); } else { @@ -404,7 +409,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -432,7 +436,15 @@ public com.google.logging.v2.ListViewsResponse build() { public com.google.logging.v2.ListViewsResponse buildPartial() { com.google.logging.v2.ListViewsResponse result = new com.google.logging.v2.ListViewsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.ListViewsResponse result) { if (viewsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { views_ = java.util.Collections.unmodifiableList(views_); @@ -442,9 +454,13 @@ public com.google.logging.v2.ListViewsResponse buildPartial() { } else { result.views_ = viewsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.ListViewsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -521,6 +537,7 @@ public Builder mergeFrom(com.google.logging.v2.ListViewsResponse other) { } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -564,7 +581,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -997,8 +1014,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1016,8 +1033,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1040,8 +1057,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucket.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucket.java index 33cfc0c0e..950d22eaf 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucket.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucket.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -133,7 +135,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 3; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -230,7 +234,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 5; @@ -279,11 +283,11 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } public static final int RETENTION_DAYS_FIELD_NUMBER = 11; - private int retentionDays_; + private int retentionDays_ = 0; /** * * @@ -304,7 +308,7 @@ public int getRetentionDays() { } public static final int LOCKED_FIELD_NUMBER = 9; - private boolean locked_; + private boolean locked_ = false; /** * * @@ -324,7 +328,7 @@ public boolean getLocked() { } public static final int LIFECYCLE_STATE_FIELD_NUMBER = 12; - private int lifecycleState_; + private int lifecycleState_ = 0; /** * * @@ -357,13 +361,14 @@ public int getLifecycleStateValue() { */ @java.lang.Override public com.google.logging.v2.LifecycleState getLifecycleState() { - @SuppressWarnings("deprecation") com.google.logging.v2.LifecycleState result = - com.google.logging.v2.LifecycleState.valueOf(lifecycleState_); + com.google.logging.v2.LifecycleState.forNumber(lifecycleState_); return result == null ? com.google.logging.v2.LifecycleState.UNRECOGNIZED : result; } public static final int RESTRICTED_FIELDS_FIELD_NUMBER = 15; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList restrictedFields_; /** * @@ -497,7 +502,9 @@ public com.google.logging.v2.CmekSettings getCmekSettings() { */ @java.lang.Override public com.google.logging.v2.CmekSettingsOrBuilder getCmekSettingsOrBuilder() { - return getCmekSettings(); + return cmekSettings_ == null + ? com.google.logging.v2.CmekSettings.getDefaultInstance() + : cmekSettings_; } private byte memoizedIsInitialized = -1; @@ -790,34 +797,27 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - description_ = ""; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } retentionDays_ = 0; - locked_ = false; - lifecycleState_ = 0; - restrictedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - if (cmekSettingsBuilder_ == null) { - cmekSettings_ = null; - } else { - cmekSettings_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + cmekSettings_ = null; + if (cmekSettingsBuilder_ != null) { + cmekSettingsBuilder_.dispose(); cmekSettingsBuilder_ = null; } return this; @@ -846,34 +846,49 @@ public com.google.logging.v2.LogBucket build() { @java.lang.Override public com.google.logging.v2.LogBucket buildPartial() { com.google.logging.v2.LogBucket result = new com.google.logging.v2.LogBucket(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.description_ = description_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); - } - result.retentionDays_ = retentionDays_; - result.locked_ = locked_; - result.lifecycleState_ = lifecycleState_; - if (((bitField0_ & 0x00000001) != 0)) { + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.LogBucket result) { + if (((bitField0_ & 0x00000080) != 0)) { restrictedFields_ = restrictedFields_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000080); } result.restrictedFields_ = restrictedFields_; - if (cmekSettingsBuilder_ == null) { - result.cmekSettings_ = cmekSettings_; - } else { - result.cmekSettings_ = cmekSettingsBuilder_.build(); + } + + private void buildPartial0(com.google.logging.v2.LogBucket result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.retentionDays_ = retentionDays_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.locked_ = locked_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.lifecycleState_ = lifecycleState_; + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.cmekSettings_ = + cmekSettingsBuilder_ == null ? cmekSettings_ : cmekSettingsBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -923,10 +938,12 @@ public Builder mergeFrom(com.google.logging.v2.LogBucket other) { if (other == com.google.logging.v2.LogBucket.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasCreateTime()) { @@ -947,7 +964,7 @@ public Builder mergeFrom(com.google.logging.v2.LogBucket other) { if (!other.restrictedFields_.isEmpty()) { if (restrictedFields_.isEmpty()) { restrictedFields_ = other.restrictedFields_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000080); } else { ensureRestrictedFieldsIsMutable(); restrictedFields_.addAll(other.restrictedFields_); @@ -986,43 +1003,43 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 26: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 26 case 34: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 34 case 42: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 42 case 72: { locked_ = input.readBool(); - + bitField0_ |= 0x00000020; break; } // case 72 case 88: { retentionDays_ = input.readInt32(); - + bitField0_ |= 0x00000010; break; } // case 88 case 96: { lifecycleState_ = input.readEnum(); - + bitField0_ |= 0x00000040; break; } // case 96 case 122: @@ -1035,7 +1052,7 @@ public Builder mergeFrom( case 154: { input.readMessage(getCmekSettingsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000100; break; } // case 154 default: @@ -1139,8 +1156,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1163,8 +1180,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1192,8 +1209,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1259,8 +1276,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1276,8 +1293,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1298,8 +1315,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1325,7 +1342,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1368,11 +1385,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1390,11 +1407,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1411,17 +1428,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1437,14 +1455,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1460,7 +1477,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1534,7 +1551,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1575,11 +1592,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1596,11 +1613,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1616,17 +1633,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1641,14 +1659,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1663,7 +1680,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } @@ -1752,6 +1769,7 @@ public int getRetentionDays() { public Builder setRetentionDays(int value) { retentionDays_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1770,7 +1788,7 @@ public Builder setRetentionDays(int value) { * @return This builder for chaining. */ public Builder clearRetentionDays() { - + bitField0_ = (bitField0_ & ~0x00000010); retentionDays_ = 0; onChanged(); return this; @@ -1811,6 +1829,7 @@ public boolean getLocked() { public Builder setLocked(boolean value) { locked_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1828,7 +1847,7 @@ public Builder setLocked(boolean value) { * @return This builder for chaining. */ public Builder clearLocked() { - + bitField0_ = (bitField0_ & ~0x00000020); locked_ = false; onChanged(); return this; @@ -1867,8 +1886,8 @@ public int getLifecycleStateValue() { * @return This builder for chaining. */ public Builder setLifecycleStateValue(int value) { - lifecycleState_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1887,9 +1906,8 @@ public Builder setLifecycleStateValue(int value) { */ @java.lang.Override public com.google.logging.v2.LifecycleState getLifecycleState() { - @SuppressWarnings("deprecation") com.google.logging.v2.LifecycleState result = - com.google.logging.v2.LifecycleState.valueOf(lifecycleState_); + com.google.logging.v2.LifecycleState.forNumber(lifecycleState_); return result == null ? com.google.logging.v2.LifecycleState.UNRECOGNIZED : result; } /** @@ -1910,7 +1928,7 @@ public Builder setLifecycleState(com.google.logging.v2.LifecycleState value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000040; lifecycleState_ = value.getNumber(); onChanged(); return this; @@ -1929,7 +1947,7 @@ public Builder setLifecycleState(com.google.logging.v2.LifecycleState value) { * @return This builder for chaining. */ public Builder clearLifecycleState() { - + bitField0_ = (bitField0_ & ~0x00000040); lifecycleState_ = 0; onChanged(); return this; @@ -1939,9 +1957,9 @@ public Builder clearLifecycleState() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureRestrictedFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000080) != 0)) { restrictedFields_ = new com.google.protobuf.LazyStringArrayList(restrictedFields_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000080; } } /** @@ -2108,7 +2126,7 @@ public Builder addAllRestrictedFields(java.lang.Iterable value */ public Builder clearRestrictedFields() { restrictedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000080); onChanged(); return this; } @@ -2161,7 +2179,7 @@ public Builder addRestrictedFieldsBytes(com.google.protobuf.ByteString value) { * @return Whether the cmekSettings field is set. */ public boolean hasCmekSettings() { - return cmekSettingsBuilder_ != null || cmekSettings_ != null; + return ((bitField0_ & 0x00000100) != 0); } /** * @@ -2206,11 +2224,11 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings value) { throw new NullPointerException(); } cmekSettings_ = value; - onChanged(); } else { cmekSettingsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2229,11 +2247,11 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings value) { public Builder setCmekSettings(com.google.logging.v2.CmekSettings.Builder builderForValue) { if (cmekSettingsBuilder_ == null) { cmekSettings_ = builderForValue.build(); - onChanged(); } else { cmekSettingsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2251,19 +2269,18 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings.Builder builde */ public Builder mergeCmekSettings(com.google.logging.v2.CmekSettings value) { if (cmekSettingsBuilder_ == null) { - if (cmekSettings_ != null) { - cmekSettings_ = - com.google.logging.v2.CmekSettings.newBuilder(cmekSettings_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000100) != 0) + && cmekSettings_ != null + && cmekSettings_ != com.google.logging.v2.CmekSettings.getDefaultInstance()) { + getCmekSettingsBuilder().mergeFrom(value); } else { cmekSettings_ = value; } - onChanged(); } else { cmekSettingsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -2280,14 +2297,13 @@ public Builder mergeCmekSettings(com.google.logging.v2.CmekSettings value) { * .google.logging.v2.CmekSettings cmek_settings = 19; */ public Builder clearCmekSettings() { - if (cmekSettingsBuilder_ == null) { - cmekSettings_ = null; - onChanged(); - } else { - cmekSettings_ = null; + bitField0_ = (bitField0_ & ~0x00000100); + cmekSettings_ = null; + if (cmekSettingsBuilder_ != null) { + cmekSettingsBuilder_.dispose(); cmekSettingsBuilder_ = null; } - + onChanged(); return this; } /** @@ -2304,7 +2320,7 @@ public Builder clearCmekSettings() { * .google.logging.v2.CmekSettings cmek_settings = 19; */ public com.google.logging.v2.CmekSettings.Builder getCmekSettingsBuilder() { - + bitField0_ |= 0x00000100; onChanged(); return getCmekSettingsFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java index 650519fff..0966999df 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java @@ -132,7 +132,9 @@ public PayloadCase getPayloadCase() { } public static final int LOG_NAME_FIELD_NUMBER = 12; - private volatile java.lang.Object logName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object logName_ = ""; /** * * @@ -269,7 +271,7 @@ public com.google.api.MonitoredResource getResource() { */ @java.lang.Override public com.google.api.MonitoredResourceOrBuilder getResourceOrBuilder() { - return getResource(); + return resource_ == null ? com.google.api.MonitoredResource.getDefaultInstance() : resource_; } public static final int PROTO_PAYLOAD_FIELD_NUMBER = 2; @@ -535,7 +537,7 @@ public com.google.protobuf.Timestamp getTimestamp() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() { - return getTimestamp(); + return timestamp_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : timestamp_; } public static final int RECEIVE_TIMESTAMP_FIELD_NUMBER = 24; @@ -589,11 +591,13 @@ public com.google.protobuf.Timestamp getReceiveTimestamp() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getReceiveTimestampOrBuilder() { - return getReceiveTimestamp(); + return receiveTimestamp_ == null + ? com.google.protobuf.Timestamp.getDefaultInstance() + : receiveTimestamp_; } public static final int SEVERITY_FIELD_NUMBER = 10; - private int severity_; + private int severity_ = 0; /** * * @@ -624,14 +628,15 @@ public int getSeverityValue() { */ @java.lang.Override public com.google.logging.type.LogSeverity getSeverity() { - @SuppressWarnings("deprecation") com.google.logging.type.LogSeverity result = - com.google.logging.type.LogSeverity.valueOf(severity_); + com.google.logging.type.LogSeverity.forNumber(severity_); return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result; } public static final int INSERT_ID_FIELD_NUMBER = 4; - private volatile java.lang.Object insertId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object insertId_ = ""; /** * * @@ -749,7 +754,9 @@ public com.google.logging.type.HttpRequest getHttpRequest() { */ @java.lang.Override public com.google.logging.type.HttpRequestOrBuilder getHttpRequestOrBuilder() { - return getHttpRequest(); + return httpRequest_ == null + ? com.google.logging.type.HttpRequest.getDefaultInstance() + : httpRequest_; } public static final int LABELS_FIELD_NUMBER = 11; @@ -765,6 +772,7 @@ private static final class LabelsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField labels_; private com.google.protobuf.MapField internalGetLabels() { @@ -852,7 +860,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 11 [(.google.api.field_behavior) = OPTIONAL]; */ @java.lang.Override - public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -944,11 +955,15 @@ public com.google.logging.v2.LogEntryOperation getOperation() { */ @java.lang.Override public com.google.logging.v2.LogEntryOperationOrBuilder getOperationOrBuilder() { - return getOperation(); + return operation_ == null + ? com.google.logging.v2.LogEntryOperation.getDefaultInstance() + : operation_; } public static final int TRACE_FIELD_NUMBER = 22; - private volatile java.lang.Object trace_; + + @SuppressWarnings("serial") + private volatile java.lang.Object trace_ = ""; /** * * @@ -1003,7 +1018,9 @@ public com.google.protobuf.ByteString getTraceBytes() { } public static final int SPAN_ID_FIELD_NUMBER = 27; - private volatile java.lang.Object spanId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object spanId_ = ""; /** * * @@ -1058,7 +1075,7 @@ public com.google.protobuf.ByteString getSpanIdBytes() { } public static final int TRACE_SAMPLED_FIELD_NUMBER = 30; - private boolean traceSampled_; + private boolean traceSampled_ = false; /** * * @@ -1131,7 +1148,9 @@ public com.google.logging.v2.LogEntrySourceLocation getSourceLocation() { */ @java.lang.Override public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOrBuilder() { - return getSourceLocation(); + return sourceLocation_ == null + ? com.google.logging.v2.LogEntrySourceLocation.getDefaultInstance() + : sourceLocation_; } public static final int SPLIT_FIELD_NUMBER = 35; @@ -1180,7 +1199,7 @@ public com.google.logging.v2.LogSplit getSplit() { */ @java.lang.Override public com.google.logging.v2.LogSplitOrBuilder getSplitOrBuilder() { - return getSplit(); + return split_ == null ? com.google.logging.v2.LogSplit.getDefaultInstance() : split_; } private byte memoizedIsInitialized = -1; @@ -1609,12 +1628,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logName_ = ""; - - if (resourceBuilder_ == null) { - resource_ = null; - } else { - resource_ = null; + resource_ = null; + if (resourceBuilder_ != null) { + resourceBuilder_.dispose(); resourceBuilder_ = null; } if (protoPayloadBuilder_ != null) { @@ -1623,51 +1641,40 @@ public Builder clear() { if (jsonPayloadBuilder_ != null) { jsonPayloadBuilder_.clear(); } - if (timestampBuilder_ == null) { - timestamp_ = null; - } else { - timestamp_ = null; + timestamp_ = null; + if (timestampBuilder_ != null) { + timestampBuilder_.dispose(); timestampBuilder_ = null; } - if (receiveTimestampBuilder_ == null) { - receiveTimestamp_ = null; - } else { - receiveTimestamp_ = null; + receiveTimestamp_ = null; + if (receiveTimestampBuilder_ != null) { + receiveTimestampBuilder_.dispose(); receiveTimestampBuilder_ = null; } severity_ = 0; - insertId_ = ""; - - if (httpRequestBuilder_ == null) { - httpRequest_ = null; - } else { - httpRequest_ = null; + httpRequest_ = null; + if (httpRequestBuilder_ != null) { + httpRequestBuilder_.dispose(); httpRequestBuilder_ = null; } internalGetMutableLabels().clear(); - if (operationBuilder_ == null) { - operation_ = null; - } else { - operation_ = null; + operation_ = null; + if (operationBuilder_ != null) { + operationBuilder_.dispose(); operationBuilder_ = null; } trace_ = ""; - spanId_ = ""; - traceSampled_ = false; - - if (sourceLocationBuilder_ == null) { - sourceLocation_ = null; - } else { - sourceLocation_ = null; + sourceLocation_ = null; + if (sourceLocationBuilder_ != null) { + sourceLocationBuilder_.dispose(); sourceLocationBuilder_ = null; } - if (splitBuilder_ == null) { - split_ = null; - } else { - split_ = null; + split_ = null; + if (splitBuilder_ != null) { + splitBuilder_.dispose(); splitBuilder_ = null; } payloadCase_ = 0; @@ -1698,70 +1705,73 @@ public com.google.logging.v2.LogEntry build() { @java.lang.Override public com.google.logging.v2.LogEntry buildPartial() { com.google.logging.v2.LogEntry result = new com.google.logging.v2.LogEntry(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.logging.v2.LogEntry result) { int from_bitField0_ = bitField0_; - result.logName_ = logName_; - if (resourceBuilder_ == null) { - result.resource_ = resource_; - } else { - result.resource_ = resourceBuilder_.build(); + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logName_ = logName_; } - if (payloadCase_ == 2) { - if (protoPayloadBuilder_ == null) { - result.payload_ = payload_; - } else { - result.payload_ = protoPayloadBuilder_.build(); - } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.resource_ = resourceBuilder_ == null ? resource_ : resourceBuilder_.build(); } - if (payloadCase_ == 3) { - result.payload_ = payload_; + if (((from_bitField0_ & 0x00000020) != 0)) { + result.timestamp_ = timestampBuilder_ == null ? timestamp_ : timestampBuilder_.build(); } - if (payloadCase_ == 6) { - if (jsonPayloadBuilder_ == null) { - result.payload_ = payload_; - } else { - result.payload_ = jsonPayloadBuilder_.build(); - } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.receiveTimestamp_ = + receiveTimestampBuilder_ == null ? receiveTimestamp_ : receiveTimestampBuilder_.build(); } - if (timestampBuilder_ == null) { - result.timestamp_ = timestamp_; - } else { - result.timestamp_ = timestampBuilder_.build(); + if (((from_bitField0_ & 0x00000080) != 0)) { + result.severity_ = severity_; } - if (receiveTimestampBuilder_ == null) { - result.receiveTimestamp_ = receiveTimestamp_; - } else { - result.receiveTimestamp_ = receiveTimestampBuilder_.build(); + if (((from_bitField0_ & 0x00000100) != 0)) { + result.insertId_ = insertId_; } - result.severity_ = severity_; - result.insertId_ = insertId_; - if (httpRequestBuilder_ == null) { - result.httpRequest_ = httpRequest_; - } else { - result.httpRequest_ = httpRequestBuilder_.build(); + if (((from_bitField0_ & 0x00000200) != 0)) { + result.httpRequest_ = + httpRequestBuilder_ == null ? httpRequest_ : httpRequestBuilder_.build(); } - result.labels_ = internalGetLabels(); - result.labels_.makeImmutable(); - if (operationBuilder_ == null) { - result.operation_ = operation_; - } else { - result.operation_ = operationBuilder_.build(); + if (((from_bitField0_ & 0x00000400) != 0)) { + result.labels_ = internalGetLabels(); + result.labels_.makeImmutable(); } - result.trace_ = trace_; - result.spanId_ = spanId_; - result.traceSampled_ = traceSampled_; - if (sourceLocationBuilder_ == null) { - result.sourceLocation_ = sourceLocation_; - } else { - result.sourceLocation_ = sourceLocationBuilder_.build(); + if (((from_bitField0_ & 0x00000800) != 0)) { + result.operation_ = operationBuilder_ == null ? operation_ : operationBuilder_.build(); } - if (splitBuilder_ == null) { - result.split_ = split_; - } else { - result.split_ = splitBuilder_.build(); + if (((from_bitField0_ & 0x00001000) != 0)) { + result.trace_ = trace_; + } + if (((from_bitField0_ & 0x00002000) != 0)) { + result.spanId_ = spanId_; + } + if (((from_bitField0_ & 0x00004000) != 0)) { + result.traceSampled_ = traceSampled_; + } + if (((from_bitField0_ & 0x00008000) != 0)) { + result.sourceLocation_ = + sourceLocationBuilder_ == null ? sourceLocation_ : sourceLocationBuilder_.build(); } + if (((from_bitField0_ & 0x00010000) != 0)) { + result.split_ = splitBuilder_ == null ? split_ : splitBuilder_.build(); + } + } + + private void buildPartialOneofs(com.google.logging.v2.LogEntry result) { result.payloadCase_ = payloadCase_; - onBuilt(); - return result; + result.payload_ = this.payload_; + if (payloadCase_ == 2 && protoPayloadBuilder_ != null) { + result.payload_ = protoPayloadBuilder_.build(); + } + if (payloadCase_ == 6 && jsonPayloadBuilder_ != null) { + result.payload_ = jsonPayloadBuilder_.build(); + } } @java.lang.Override @@ -1811,6 +1821,7 @@ public Builder mergeFrom(com.google.logging.v2.LogEntry other) { if (other == com.google.logging.v2.LogEntry.getDefaultInstance()) return this; if (!other.getLogName().isEmpty()) { logName_ = other.logName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasResource()) { @@ -1827,21 +1838,25 @@ public Builder mergeFrom(com.google.logging.v2.LogEntry other) { } if (!other.getInsertId().isEmpty()) { insertId_ = other.insertId_; + bitField0_ |= 0x00000100; onChanged(); } if (other.hasHttpRequest()) { mergeHttpRequest(other.getHttpRequest()); } internalGetMutableLabels().mergeFrom(other.internalGetLabels()); + bitField0_ |= 0x00000400; if (other.hasOperation()) { mergeOperation(other.getOperation()); } if (!other.getTrace().isEmpty()) { trace_ = other.trace_; + bitField0_ |= 0x00001000; onChanged(); } if (!other.getSpanId().isEmpty()) { spanId_ = other.spanId_; + bitField0_ |= 0x00002000; onChanged(); } if (other.getTraceSampled() != false) { @@ -1918,7 +1933,7 @@ public Builder mergeFrom( case 34: { insertId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000100; break; } // case 34 case 50: @@ -1930,25 +1945,25 @@ public Builder mergeFrom( case 58: { input.readMessage(getHttpRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000200; break; } // case 58 case 66: { input.readMessage(getResourceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 66 case 74: { input.readMessage(getTimestampFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000020; break; } // case 74 case 80: { severity_ = input.readEnum(); - + bitField0_ |= 0x00000080; break; } // case 80 case 90: @@ -1960,55 +1975,56 @@ public Builder mergeFrom( internalGetMutableLabels() .getMutableMap() .put(labels__.getKey(), labels__.getValue()); + bitField0_ |= 0x00000400; break; } // case 90 case 98: { logName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 98 case 122: { input.readMessage(getOperationFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000800; break; } // case 122 case 178: { trace_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00001000; break; } // case 178 case 186: { input.readMessage(getSourceLocationFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00008000; break; } // case 186 case 194: { input.readMessage( getReceiveTimestampFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 194 case 218: { spanId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00002000; break; } // case 218 case 240: { traceSampled_ = input.readBool(); - + bitField0_ |= 0x00004000; break; } // case 240 case 282: { input.readMessage(getSplitFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00010000; break; } // case 282 default: @@ -2156,8 +2172,8 @@ public Builder setLogName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2190,8 +2206,8 @@ public Builder setLogName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLogName() { - logName_ = getDefaultInstance().getLogName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2229,8 +2245,8 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2257,7 +2273,7 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { * @return Whether the resource field is set. */ public boolean hasResource() { - return resourceBuilder_ != null || resource_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -2302,11 +2318,11 @@ public Builder setResource(com.google.api.MonitoredResource value) { throw new NullPointerException(); } resource_ = value; - onChanged(); } else { resourceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2325,11 +2341,11 @@ public Builder setResource(com.google.api.MonitoredResource value) { public Builder setResource(com.google.api.MonitoredResource.Builder builderForValue) { if (resourceBuilder_ == null) { resource_ = builderForValue.build(); - onChanged(); } else { resourceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2347,19 +2363,18 @@ public Builder setResource(com.google.api.MonitoredResource.Builder builderForVa */ public Builder mergeResource(com.google.api.MonitoredResource value) { if (resourceBuilder_ == null) { - if (resource_ != null) { - resource_ = - com.google.api.MonitoredResource.newBuilder(resource_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && resource_ != null + && resource_ != com.google.api.MonitoredResource.getDefaultInstance()) { + getResourceBuilder().mergeFrom(value); } else { resource_ = value; } - onChanged(); } else { resourceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2376,14 +2391,13 @@ public Builder mergeResource(com.google.api.MonitoredResource value) { * */ public Builder clearResource() { - if (resourceBuilder_ == null) { - resource_ = null; - onChanged(); - } else { - resource_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + resource_ = null; + if (resourceBuilder_ != null) { + resourceBuilder_.dispose(); resourceBuilder_ = null; } - + onChanged(); return this; } /** @@ -2400,7 +2414,7 @@ public Builder clearResource() { * */ public com.google.api.MonitoredResource.Builder getResourceBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getResourceFieldBuilder().getBuilder(); } @@ -2702,7 +2716,6 @@ public com.google.protobuf.AnyOrBuilder getProtoPayloadOrBuilder() { } payloadCase_ = 2; onChanged(); - ; return protoPayloadBuilder_; } @@ -3050,7 +3063,6 @@ public com.google.protobuf.StructOrBuilder getJsonPayloadOrBuilder() { } payloadCase_ = 6; onChanged(); - ; return jsonPayloadBuilder_; } @@ -3082,7 +3094,7 @@ public com.google.protobuf.StructOrBuilder getJsonPayloadOrBuilder() { * @return Whether the timestamp field is set. */ public boolean hasTimestamp() { - return timestampBuilder_ != null || timestamp_ != null; + return ((bitField0_ & 0x00000020) != 0); } /** * @@ -3137,11 +3149,11 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } timestamp_ = value; - onChanged(); } else { timestampBuilder_.setMessage(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -3166,11 +3178,11 @@ public Builder setTimestamp(com.google.protobuf.Timestamp value) { public Builder setTimestamp(com.google.protobuf.Timestamp.Builder builderForValue) { if (timestampBuilder_ == null) { timestamp_ = builderForValue.build(); - onChanged(); } else { timestampBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -3194,17 +3206,18 @@ public Builder setTimestamp(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeTimestamp(com.google.protobuf.Timestamp value) { if (timestampBuilder_ == null) { - if (timestamp_ != null) { - timestamp_ = - com.google.protobuf.Timestamp.newBuilder(timestamp_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000020) != 0) + && timestamp_ != null + && timestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getTimestampBuilder().mergeFrom(value); } else { timestamp_ = value; } - onChanged(); } else { timestampBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -3227,14 +3240,13 @@ public Builder mergeTimestamp(com.google.protobuf.Timestamp value) { * */ public Builder clearTimestamp() { - if (timestampBuilder_ == null) { - timestamp_ = null; - onChanged(); - } else { - timestamp_ = null; + bitField0_ = (bitField0_ & ~0x00000020); + timestamp_ = null; + if (timestampBuilder_ != null) { + timestampBuilder_.dispose(); timestampBuilder_ = null; } - + onChanged(); return this; } /** @@ -3257,7 +3269,7 @@ public Builder clearTimestamp() { * */ public com.google.protobuf.Timestamp.Builder getTimestampBuilder() { - + bitField0_ |= 0x00000020; onChanged(); return getTimestampFieldBuilder().getBuilder(); } @@ -3343,7 +3355,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() { * @return Whether the receiveTimestamp field is set. */ public boolean hasReceiveTimestamp() { - return receiveTimestampBuilder_ != null || receiveTimestamp_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -3384,11 +3396,11 @@ public Builder setReceiveTimestamp(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } receiveTimestamp_ = value; - onChanged(); } else { receiveTimestampBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -3405,11 +3417,11 @@ public Builder setReceiveTimestamp(com.google.protobuf.Timestamp value) { public Builder setReceiveTimestamp(com.google.protobuf.Timestamp.Builder builderForValue) { if (receiveTimestampBuilder_ == null) { receiveTimestamp_ = builderForValue.build(); - onChanged(); } else { receiveTimestampBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -3425,19 +3437,18 @@ public Builder setReceiveTimestamp(com.google.protobuf.Timestamp.Builder builder */ public Builder mergeReceiveTimestamp(com.google.protobuf.Timestamp value) { if (receiveTimestampBuilder_ == null) { - if (receiveTimestamp_ != null) { - receiveTimestamp_ = - com.google.protobuf.Timestamp.newBuilder(receiveTimestamp_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && receiveTimestamp_ != null + && receiveTimestamp_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getReceiveTimestampBuilder().mergeFrom(value); } else { receiveTimestamp_ = value; } - onChanged(); } else { receiveTimestampBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -3452,14 +3463,13 @@ public Builder mergeReceiveTimestamp(com.google.protobuf.Timestamp value) { * */ public Builder clearReceiveTimestamp() { - if (receiveTimestampBuilder_ == null) { - receiveTimestamp_ = null; - onChanged(); - } else { - receiveTimestamp_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + receiveTimestamp_ = null; + if (receiveTimestampBuilder_ != null) { + receiveTimestampBuilder_.dispose(); receiveTimestampBuilder_ = null; } - + onChanged(); return this; } /** @@ -3474,7 +3484,7 @@ public Builder clearReceiveTimestamp() { * */ public com.google.protobuf.Timestamp.Builder getReceiveTimestampBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getReceiveTimestampFieldBuilder().getBuilder(); } @@ -3559,8 +3569,8 @@ public int getSeverityValue() { * @return This builder for chaining. */ public Builder setSeverityValue(int value) { - severity_ = value; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -3579,9 +3589,8 @@ public Builder setSeverityValue(int value) { */ @java.lang.Override public com.google.logging.type.LogSeverity getSeverity() { - @SuppressWarnings("deprecation") com.google.logging.type.LogSeverity result = - com.google.logging.type.LogSeverity.valueOf(severity_); + com.google.logging.type.LogSeverity.forNumber(severity_); return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result; } /** @@ -3602,7 +3611,7 @@ public Builder setSeverity(com.google.logging.type.LogSeverity value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000080; severity_ = value.getNumber(); onChanged(); return this; @@ -3621,7 +3630,7 @@ public Builder setSeverity(com.google.logging.type.LogSeverity value) { * @return This builder for chaining. */ public Builder clearSeverity() { - + bitField0_ = (bitField0_ & ~0x00000080); severity_ = 0; onChanged(); return this; @@ -3712,8 +3721,8 @@ public Builder setInsertId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - insertId_ = value; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -3737,8 +3746,8 @@ public Builder setInsertId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearInsertId() { - insertId_ = getDefaultInstance().getInsertId(); + bitField0_ = (bitField0_ & ~0x00000100); onChanged(); return this; } @@ -3767,8 +3776,8 @@ public Builder setInsertIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - insertId_ = value; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -3794,7 +3803,7 @@ public Builder setInsertIdBytes(com.google.protobuf.ByteString value) { * @return Whether the httpRequest field is set. */ public boolean hasHttpRequest() { - return httpRequestBuilder_ != null || httpRequest_ != null; + return ((bitField0_ & 0x00000200) != 0); } /** * @@ -3837,11 +3846,11 @@ public Builder setHttpRequest(com.google.logging.type.HttpRequest value) { throw new NullPointerException(); } httpRequest_ = value; - onChanged(); } else { httpRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3859,11 +3868,11 @@ public Builder setHttpRequest(com.google.logging.type.HttpRequest value) { public Builder setHttpRequest(com.google.logging.type.HttpRequest.Builder builderForValue) { if (httpRequestBuilder_ == null) { httpRequest_ = builderForValue.build(); - onChanged(); } else { httpRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3880,19 +3889,18 @@ public Builder setHttpRequest(com.google.logging.type.HttpRequest.Builder builde */ public Builder mergeHttpRequest(com.google.logging.type.HttpRequest value) { if (httpRequestBuilder_ == null) { - if (httpRequest_ != null) { - httpRequest_ = - com.google.logging.type.HttpRequest.newBuilder(httpRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000200) != 0) + && httpRequest_ != null + && httpRequest_ != com.google.logging.type.HttpRequest.getDefaultInstance()) { + getHttpRequestBuilder().mergeFrom(value); } else { httpRequest_ = value; } - onChanged(); } else { httpRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3908,14 +3916,13 @@ public Builder mergeHttpRequest(com.google.logging.type.HttpRequest value) { * */ public Builder clearHttpRequest() { - if (httpRequestBuilder_ == null) { - httpRequest_ = null; - onChanged(); - } else { - httpRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000200); + httpRequest_ = null; + if (httpRequestBuilder_ != null) { + httpRequestBuilder_.dispose(); httpRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -3931,7 +3938,7 @@ public Builder clearHttpRequest() { * */ public com.google.logging.type.HttpRequest.Builder getHttpRequestBuilder() { - + bitField0_ |= 0x00000200; onChanged(); return getHttpRequestFieldBuilder().getBuilder(); } @@ -3996,14 +4003,14 @@ private com.google.protobuf.MapField interna private com.google.protobuf.MapField internalGetMutableLabels() { - onChanged(); - ; if (labels_ == null) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); } if (!labels_.isMutable()) { labels_ = labels_.copy(); } + bitField0_ |= 0x00000400; + onChanged(); return labels_; } @@ -4085,8 +4092,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 11 [(.google.api.field_behavior) = OPTIONAL]; */ @java.lang.Override - public java.lang.String getLabelsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -4125,6 +4134,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { } public Builder clearLabels() { + bitField0_ = (bitField0_ & ~0x00000400); internalGetMutableLabels().getMutableMap().clear(); return this; } @@ -4157,6 +4167,7 @@ public Builder removeLabels(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { + bitField0_ |= 0x00000400; return internalGetMutableLabels().getMutableMap(); } /** @@ -4185,8 +4196,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableLabels().getMutableMap().put(key, value); + bitField0_ |= 0x00000400; return this; } /** @@ -4210,6 +4221,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { */ public Builder putAllLabels(java.util.Map values) { internalGetMutableLabels().getMutableMap().putAll(values); + bitField0_ |= 0x00000400; return this; } @@ -4234,7 +4246,7 @@ public Builder putAllLabels(java.util.Map va * @return Whether the operation field is set. */ public boolean hasOperation() { - return operationBuilder_ != null || operation_ != null; + return ((bitField0_ & 0x00000800) != 0); } /** * @@ -4277,11 +4289,11 @@ public Builder setOperation(com.google.logging.v2.LogEntryOperation value) { throw new NullPointerException(); } operation_ = value; - onChanged(); } else { operationBuilder_.setMessage(value); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -4299,11 +4311,11 @@ public Builder setOperation(com.google.logging.v2.LogEntryOperation value) { public Builder setOperation(com.google.logging.v2.LogEntryOperation.Builder builderForValue) { if (operationBuilder_ == null) { operation_ = builderForValue.build(); - onChanged(); } else { operationBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -4320,19 +4332,18 @@ public Builder setOperation(com.google.logging.v2.LogEntryOperation.Builder buil */ public Builder mergeOperation(com.google.logging.v2.LogEntryOperation value) { if (operationBuilder_ == null) { - if (operation_ != null) { - operation_ = - com.google.logging.v2.LogEntryOperation.newBuilder(operation_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000800) != 0) + && operation_ != null + && operation_ != com.google.logging.v2.LogEntryOperation.getDefaultInstance()) { + getOperationBuilder().mergeFrom(value); } else { operation_ = value; } - onChanged(); } else { operationBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -4348,14 +4359,13 @@ public Builder mergeOperation(com.google.logging.v2.LogEntryOperation value) { * */ public Builder clearOperation() { - if (operationBuilder_ == null) { - operation_ = null; - onChanged(); - } else { - operation_ = null; + bitField0_ = (bitField0_ & ~0x00000800); + operation_ = null; + if (operationBuilder_ != null) { + operationBuilder_.dispose(); operationBuilder_ = null; } - + onChanged(); return this; } /** @@ -4371,7 +4381,7 @@ public Builder clearOperation() { * */ public com.google.logging.v2.LogEntryOperation.Builder getOperationBuilder() { - + bitField0_ |= 0x00000800; onChanged(); return getOperationFieldBuilder().getBuilder(); } @@ -4495,8 +4505,8 @@ public Builder setTrace(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - trace_ = value; + bitField0_ |= 0x00001000; onChanged(); return this; } @@ -4515,8 +4525,8 @@ public Builder setTrace(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTrace() { - trace_ = getDefaultInstance().getTrace(); + bitField0_ = (bitField0_ & ~0x00001000); onChanged(); return this; } @@ -4540,8 +4550,8 @@ public Builder setTraceBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - trace_ = value; + bitField0_ |= 0x00001000; onChanged(); return this; } @@ -4616,8 +4626,8 @@ public Builder setSpanId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - spanId_ = value; + bitField0_ |= 0x00002000; onChanged(); return this; } @@ -4636,8 +4646,8 @@ public Builder setSpanId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSpanId() { - spanId_ = getDefaultInstance().getSpanId(); + bitField0_ = (bitField0_ & ~0x00002000); onChanged(); return this; } @@ -4661,8 +4671,8 @@ public Builder setSpanIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - spanId_ = value; + bitField0_ |= 0x00002000; onChanged(); return this; } @@ -4708,6 +4718,7 @@ public boolean getTraceSampled() { public Builder setTraceSampled(boolean value) { traceSampled_ = value; + bitField0_ |= 0x00004000; onChanged(); return this; } @@ -4728,7 +4739,7 @@ public Builder setTraceSampled(boolean value) { * @return This builder for chaining. */ public Builder clearTraceSampled() { - + bitField0_ = (bitField0_ & ~0x00004000); traceSampled_ = false; onChanged(); return this; @@ -4754,7 +4765,7 @@ public Builder clearTraceSampled() { * @return Whether the sourceLocation field is set. */ public boolean hasSourceLocation() { - return sourceLocationBuilder_ != null || sourceLocation_ != null; + return ((bitField0_ & 0x00008000) != 0); } /** * @@ -4795,11 +4806,11 @@ public Builder setSourceLocation(com.google.logging.v2.LogEntrySourceLocation va throw new NullPointerException(); } sourceLocation_ = value; - onChanged(); } else { sourceLocationBuilder_.setMessage(value); } - + bitField0_ |= 0x00008000; + onChanged(); return this; } /** @@ -4817,11 +4828,11 @@ public Builder setSourceLocation( com.google.logging.v2.LogEntrySourceLocation.Builder builderForValue) { if (sourceLocationBuilder_ == null) { sourceLocation_ = builderForValue.build(); - onChanged(); } else { sourceLocationBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00008000; + onChanged(); return this; } /** @@ -4837,19 +4848,19 @@ public Builder setSourceLocation( */ public Builder mergeSourceLocation(com.google.logging.v2.LogEntrySourceLocation value) { if (sourceLocationBuilder_ == null) { - if (sourceLocation_ != null) { - sourceLocation_ = - com.google.logging.v2.LogEntrySourceLocation.newBuilder(sourceLocation_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00008000) != 0) + && sourceLocation_ != null + && sourceLocation_ + != com.google.logging.v2.LogEntrySourceLocation.getDefaultInstance()) { + getSourceLocationBuilder().mergeFrom(value); } else { sourceLocation_ = value; } - onChanged(); } else { sourceLocationBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00008000; + onChanged(); return this; } /** @@ -4864,14 +4875,13 @@ public Builder mergeSourceLocation(com.google.logging.v2.LogEntrySourceLocation * */ public Builder clearSourceLocation() { - if (sourceLocationBuilder_ == null) { - sourceLocation_ = null; - onChanged(); - } else { - sourceLocation_ = null; + bitField0_ = (bitField0_ & ~0x00008000); + sourceLocation_ = null; + if (sourceLocationBuilder_ != null) { + sourceLocationBuilder_.dispose(); sourceLocationBuilder_ = null; } - + onChanged(); return this; } /** @@ -4886,7 +4896,7 @@ public Builder clearSourceLocation() { * */ public com.google.logging.v2.LogEntrySourceLocation.Builder getSourceLocationBuilder() { - + bitField0_ |= 0x00008000; onChanged(); return getSourceLocationFieldBuilder().getBuilder(); } @@ -4958,7 +4968,7 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr * @return Whether the split field is set. */ public boolean hasSplit() { - return splitBuilder_ != null || split_ != null; + return ((bitField0_ & 0x00010000) != 0); } /** * @@ -4997,11 +5007,11 @@ public Builder setSplit(com.google.logging.v2.LogSplit value) { throw new NullPointerException(); } split_ = value; - onChanged(); } else { splitBuilder_.setMessage(value); } - + bitField0_ |= 0x00010000; + onChanged(); return this; } /** @@ -5018,11 +5028,11 @@ public Builder setSplit(com.google.logging.v2.LogSplit value) { public Builder setSplit(com.google.logging.v2.LogSplit.Builder builderForValue) { if (splitBuilder_ == null) { split_ = builderForValue.build(); - onChanged(); } else { splitBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00010000; + onChanged(); return this; } /** @@ -5038,17 +5048,18 @@ public Builder setSplit(com.google.logging.v2.LogSplit.Builder builderForValue) */ public Builder mergeSplit(com.google.logging.v2.LogSplit value) { if (splitBuilder_ == null) { - if (split_ != null) { - split_ = - com.google.logging.v2.LogSplit.newBuilder(split_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00010000) != 0) + && split_ != null + && split_ != com.google.logging.v2.LogSplit.getDefaultInstance()) { + getSplitBuilder().mergeFrom(value); } else { split_ = value; } - onChanged(); } else { splitBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00010000; + onChanged(); return this; } /** @@ -5063,14 +5074,13 @@ public Builder mergeSplit(com.google.logging.v2.LogSplit value) { * */ public Builder clearSplit() { - if (splitBuilder_ == null) { - split_ = null; - onChanged(); - } else { - split_ = null; + bitField0_ = (bitField0_ & ~0x00010000); + split_ = null; + if (splitBuilder_ != null) { + splitBuilder_.dispose(); splitBuilder_ = null; } - + onChanged(); return this; } /** @@ -5085,7 +5095,7 @@ public Builder clearSplit() { * */ public com.google.logging.v2.LogSplit.Builder getSplitBuilder() { - + bitField0_ |= 0x00010000; onChanged(); return getSplitFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java index 403b4c2fb..1d614e715 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ID_FIELD_NUMBER = 1; - private volatile java.lang.Object id_; + + @SuppressWarnings("serial") + private volatile java.lang.Object id_ = ""; /** * * @@ -121,7 +123,9 @@ public com.google.protobuf.ByteString getIdBytes() { } public static final int PRODUCER_FIELD_NUMBER = 2; - private volatile java.lang.Object producer_; + + @SuppressWarnings("serial") + private volatile java.lang.Object producer_ = ""; /** * * @@ -174,7 +178,7 @@ public com.google.protobuf.ByteString getProducerBytes() { } public static final int FIRST_FIELD_NUMBER = 3; - private boolean first_; + private boolean first_ = false; /** * * @@ -192,7 +196,7 @@ public boolean getFirst() { } public static final int LAST_FIELD_NUMBER = 4; - private boolean last_; + private boolean last_ = false; /** * * @@ -433,14 +437,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; id_ = ""; - producer_ = ""; - first_ = false; - last_ = false; - return this; } @@ -468,14 +469,29 @@ public com.google.logging.v2.LogEntryOperation build() { public com.google.logging.v2.LogEntryOperation buildPartial() { com.google.logging.v2.LogEntryOperation result = new com.google.logging.v2.LogEntryOperation(this); - result.id_ = id_; - result.producer_ = producer_; - result.first_ = first_; - result.last_ = last_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.LogEntryOperation result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.id_ = id_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.producer_ = producer_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.first_ = first_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.last_ = last_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -523,10 +539,12 @@ public Builder mergeFrom(com.google.logging.v2.LogEntryOperation other) { if (other == com.google.logging.v2.LogEntryOperation.getDefaultInstance()) return this; if (!other.getId().isEmpty()) { id_ = other.id_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getProducer().isEmpty()) { producer_ = other.producer_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getFirst() != false) { @@ -564,25 +582,25 @@ public Builder mergeFrom( case 10: { id_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { producer_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { first_ = input.readBool(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { last_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 32 default: @@ -602,6 +620,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object id_ = ""; /** * @@ -666,8 +686,8 @@ public Builder setId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - id_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -684,8 +704,8 @@ public Builder setId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearId() { - id_ = getDefaultInstance().getId(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -707,8 +727,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - id_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -780,8 +800,8 @@ public Builder setProducer(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - producer_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -799,8 +819,8 @@ public Builder setProducer(java.lang.String value) { * @return This builder for chaining. */ public Builder clearProducer() { - producer_ = getDefaultInstance().getProducer(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -823,8 +843,8 @@ public Builder setProducerBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - producer_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -860,6 +880,7 @@ public boolean getFirst() { public Builder setFirst(boolean value) { first_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -875,7 +896,7 @@ public Builder setFirst(boolean value) { * @return This builder for chaining. */ public Builder clearFirst() { - + bitField0_ = (bitField0_ & ~0x00000004); first_ = false; onChanged(); return this; @@ -912,6 +933,7 @@ public boolean getLast() { public Builder setLast(boolean value) { last_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -927,7 +949,7 @@ public Builder setLast(boolean value) { * @return This builder for chaining. */ public Builder clearLast() { - + bitField0_ = (bitField0_ & ~0x00000008); last_ = false; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java index a9032be56..8a3d69f58 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java @@ -554,7 +554,6 @@ public interface LogEntryOrBuilder * * map<string, string> labels = 11 [(.google.api.field_behavior) = OPTIONAL]; */ - /* nullable */ java.lang.String getLabelsOrDefault( java.lang.String key, diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java index a0969ce33..3b95154fe 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FILE_FIELD_NUMBER = 1; - private volatile java.lang.Object file_; + + @SuppressWarnings("serial") + private volatile java.lang.Object file_ = ""; /** * * @@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getFileBytes() { } public static final int LINE_FIELD_NUMBER = 2; - private long line_; + private long line_ = 0L; /** * * @@ -140,7 +142,9 @@ public long getLine() { } public static final int FUNCTION_FIELD_NUMBER = 3; - private volatile java.lang.Object function_; + + @SuppressWarnings("serial") + private volatile java.lang.Object function_ = ""; /** * * @@ -414,12 +418,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; file_ = ""; - line_ = 0L; - function_ = ""; - return this; } @@ -447,13 +449,26 @@ public com.google.logging.v2.LogEntrySourceLocation build() { public com.google.logging.v2.LogEntrySourceLocation buildPartial() { com.google.logging.v2.LogEntrySourceLocation result = new com.google.logging.v2.LogEntrySourceLocation(this); - result.file_ = file_; - result.line_ = line_; - result.function_ = function_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.LogEntrySourceLocation result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.file_ = file_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.line_ = line_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.function_ = function_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -501,6 +516,7 @@ public Builder mergeFrom(com.google.logging.v2.LogEntrySourceLocation other) { if (other == com.google.logging.v2.LogEntrySourceLocation.getDefaultInstance()) return this; if (!other.getFile().isEmpty()) { file_ = other.file_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getLine() != 0L) { @@ -508,6 +524,7 @@ public Builder mergeFrom(com.google.logging.v2.LogEntrySourceLocation other) { } if (!other.getFunction().isEmpty()) { function_ = other.function_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -539,19 +556,19 @@ public Builder mergeFrom( case 10: { file_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { line_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { function_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -571,6 +588,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object file_ = ""; /** * @@ -635,8 +654,8 @@ public Builder setFile(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - file_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -653,8 +672,8 @@ public Builder setFile(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFile() { - file_ = getDefaultInstance().getFile(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -676,8 +695,8 @@ public Builder setFileBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - file_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -715,6 +734,7 @@ public long getLine() { public Builder setLine(long value) { line_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -731,7 +751,7 @@ public Builder setLine(long value) { * @return This builder for chaining. */ public Builder clearLine() { - + bitField0_ = (bitField0_ & ~0x00000002); line_ = 0L; onChanged(); return this; @@ -813,8 +833,8 @@ public Builder setFunction(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - function_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -835,8 +855,8 @@ public Builder setFunction(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFunction() { - function_ = getDefaultInstance().getFunction(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -862,8 +882,8 @@ public Builder setFunctionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - function_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java index c019cf1ae..c963aff80 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java @@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -129,7 +131,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 2; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -178,7 +182,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() { } public static final int FILTER_FIELD_NUMBER = 3; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -241,7 +247,7 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int DISABLED_FIELD_NUMBER = 4; - private boolean disabled_; + private boolean disabled_ = false; /** * * @@ -310,7 +316,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 6; @@ -362,7 +368,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } private byte memoizedIsInitialized = -1; @@ -619,24 +625,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - description_ = ""; - filter_ = ""; - disabled_ = false; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } return this; @@ -665,24 +666,35 @@ public com.google.logging.v2.LogExclusion build() { @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_; - result.description_ = description_; - result.filter_ = filter_; - result.disabled_ = disabled_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); - } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.LogExclusion result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.disabled_ = disabled_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -730,14 +742,17 @@ public Builder mergeFrom(com.google.logging.v2.LogExclusion other) { if (other == com.google.logging.v2.LogExclusion.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000004; onChanged(); } if (other.getDisabled() != false) { @@ -778,37 +793,37 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { disabled_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 50: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000020; break; } // case 50 default: @@ -828,6 +843,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -898,8 +915,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -918,8 +935,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -943,8 +960,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1010,8 +1027,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1027,8 +1044,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1049,8 +1066,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1137,8 +1154,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1161,8 +1178,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1190,8 +1207,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1233,6 +1250,7 @@ public boolean getDisabled() { public Builder setDisabled(boolean value) { disabled_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1251,7 +1269,7 @@ public Builder setDisabled(boolean value) { * @return This builder for chaining. */ public Builder clearDisabled() { - + bitField0_ = (bitField0_ & ~0x00000008); disabled_ = false; onChanged(); return this; @@ -1278,7 +1296,7 @@ public Builder clearDisabled() { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1321,11 +1339,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1343,11 +1361,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1364,17 +1382,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1390,14 +1409,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1413,7 +1431,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1488,7 +1506,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000020) != 0); } /** * @@ -1531,11 +1549,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -1553,11 +1571,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -1574,17 +1592,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000020) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -1600,14 +1619,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000020); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1623,7 +1641,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000020; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java index 44ac18baa..ac60f5f15 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java @@ -222,7 +222,9 @@ private ApiVersion(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -291,7 +293,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 2; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -342,7 +346,9 @@ public com.google.protobuf.ByteString getDescriptionBytes() { } public static final int FILTER_FIELD_NUMBER = 3; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -399,7 +405,7 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int DISABLED_FIELD_NUMBER = 12; - private boolean disabled_; + private boolean disabled_ = false; /** * * @@ -516,11 +522,15 @@ public com.google.api.MetricDescriptor getMetricDescriptor() { */ @java.lang.Override public com.google.api.MetricDescriptorOrBuilder getMetricDescriptorOrBuilder() { - return getMetricDescriptor(); + return metricDescriptor_ == null + ? com.google.api.MetricDescriptor.getDefaultInstance() + : metricDescriptor_; } public static final int VALUE_EXTRACTOR_FIELD_NUMBER = 6; - private volatile java.lang.Object valueExtractor_; + + @SuppressWarnings("serial") + private volatile java.lang.Object valueExtractor_ = ""; /** * * @@ -613,6 +623,7 @@ private static final class LabelExtractorsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField labelExtractors_; private com.google.protobuf.MapField @@ -708,8 +719,10 @@ public java.util.Map getLabelExtractorsMap() * */ @java.lang.Override - public java.lang.String getLabelExtractorsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelExtractorsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -806,7 +819,9 @@ public com.google.api.Distribution.BucketOptions getBucketOptions() { */ @java.lang.Override public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuilder() { - return getBucketOptions(); + return bucketOptions_ == null + ? com.google.api.Distribution.BucketOptions.getDefaultInstance() + : bucketOptions_; } public static final int CREATE_TIME_FIELD_NUMBER = 9; @@ -858,7 +873,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 10; @@ -910,11 +925,11 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } public static final int VERSION_FIELD_NUMBER = 4; - private int version_; + private int version_ = 0; /** * * @@ -951,9 +966,8 @@ public int getVersionValue() { @java.lang.Override @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_); + com.google.logging.v2.LogMetric.ApiVersion.forNumber(version_); return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result; } @@ -1294,43 +1308,34 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - description_ = ""; - filter_ = ""; - disabled_ = false; - - if (metricDescriptorBuilder_ == null) { - metricDescriptor_ = null; - } else { - metricDescriptor_ = null; + metricDescriptor_ = null; + if (metricDescriptorBuilder_ != null) { + metricDescriptorBuilder_.dispose(); metricDescriptorBuilder_ = null; } valueExtractor_ = ""; - internalGetMutableLabelExtractors().clear(); - if (bucketOptionsBuilder_ == null) { - bucketOptions_ = null; - } else { - bucketOptions_ = null; + bucketOptions_ = null; + if (bucketOptionsBuilder_ != null) { + bucketOptionsBuilder_.dispose(); bucketOptionsBuilder_ = null; } - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } version_ = 0; - return this; } @@ -1357,37 +1362,51 @@ public com.google.logging.v2.LogMetric build() { @java.lang.Override public com.google.logging.v2.LogMetric buildPartial() { com.google.logging.v2.LogMetric result = new com.google.logging.v2.LogMetric(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.logging.v2.LogMetric result) { int from_bitField0_ = bitField0_; - result.name_ = name_; - result.description_ = description_; - result.filter_ = filter_; - result.disabled_ = disabled_; - if (metricDescriptorBuilder_ == null) { - result.metricDescriptor_ = metricDescriptor_; - } else { - result.metricDescriptor_ = metricDescriptorBuilder_.build(); + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } - result.valueExtractor_ = valueExtractor_; - result.labelExtractors_ = internalGetLabelExtractors(); - result.labelExtractors_.makeImmutable(); - if (bucketOptionsBuilder_ == null) { - result.bucketOptions_ = bucketOptions_; - } else { - result.bucketOptions_ = bucketOptionsBuilder_.build(); + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; } - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000004) != 0)) { + result.filter_ = filter_; } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000008) != 0)) { + result.disabled_ = disabled_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.metricDescriptor_ = + metricDescriptorBuilder_ == null ? metricDescriptor_ : metricDescriptorBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.valueExtractor_ = valueExtractor_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.labelExtractors_ = internalGetLabelExtractors(); + result.labelExtractors_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.bucketOptions_ = + bucketOptionsBuilder_ == null ? bucketOptions_ : bucketOptionsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000200) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000400) != 0)) { + result.version_ = version_; } - result.version_ = version_; - onBuilt(); - return result; } @java.lang.Override @@ -1437,14 +1456,17 @@ public Builder mergeFrom(com.google.logging.v2.LogMetric other) { if (other == com.google.logging.v2.LogMetric.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000004; onChanged(); } if (other.getDisabled() != false) { @@ -1455,9 +1477,11 @@ public Builder mergeFrom(com.google.logging.v2.LogMetric other) { } if (!other.getValueExtractor().isEmpty()) { valueExtractor_ = other.valueExtractor_; + bitField0_ |= 0x00000020; onChanged(); } internalGetMutableLabelExtractors().mergeFrom(other.internalGetLabelExtractors()); + bitField0_ |= 0x00000040; if (other.hasBucketOptions()) { mergeBucketOptions(other.getBucketOptions()); } @@ -1499,38 +1523,38 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { version_ = input.readEnum(); - + bitField0_ |= 0x00000400; break; } // case 32 case 42: { input.readMessage( getMetricDescriptorFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 50: { valueExtractor_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 58: @@ -1542,30 +1566,31 @@ public Builder mergeFrom( internalGetMutableLabelExtractors() .getMutableMap() .put(labelExtractors__.getKey(), labelExtractors__.getValue()); + bitField0_ |= 0x00000040; break; } // case 58 case 66: { input.readMessage(getBucketOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 66 case 74: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000100; break; } // case 74 case 82: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000200; break; } // case 82 case 96: { disabled_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 96 default: @@ -1678,8 +1703,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1705,8 +1730,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1737,8 +1762,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1807,8 +1832,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1825,8 +1850,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1848,8 +1873,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1927,8 +1952,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1948,8 +1973,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1974,8 +1999,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2013,6 +2038,7 @@ public boolean getDisabled() { public Builder setDisabled(boolean value) { disabled_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2029,7 +2055,7 @@ public Builder setDisabled(boolean value) { * @return This builder for chaining. */ public Builder clearDisabled() { - + bitField0_ = (bitField0_ & ~0x00000008); disabled_ = false; onChanged(); return this; @@ -2071,7 +2097,7 @@ public Builder clearDisabled() { * @return Whether the metricDescriptor field is set. */ public boolean hasMetricDescriptor() { - return metricDescriptorBuilder_ != null || metricDescriptor_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -2144,11 +2170,11 @@ public Builder setMetricDescriptor(com.google.api.MetricDescriptor value) { throw new NullPointerException(); } metricDescriptor_ = value; - onChanged(); } else { metricDescriptorBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2181,11 +2207,11 @@ public Builder setMetricDescriptor(com.google.api.MetricDescriptor value) { public Builder setMetricDescriptor(com.google.api.MetricDescriptor.Builder builderForValue) { if (metricDescriptorBuilder_ == null) { metricDescriptor_ = builderForValue.build(); - onChanged(); } else { metricDescriptorBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2217,19 +2243,18 @@ public Builder setMetricDescriptor(com.google.api.MetricDescriptor.Builder build */ public Builder mergeMetricDescriptor(com.google.api.MetricDescriptor value) { if (metricDescriptorBuilder_ == null) { - if (metricDescriptor_ != null) { - metricDescriptor_ = - com.google.api.MetricDescriptor.newBuilder(metricDescriptor_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && metricDescriptor_ != null + && metricDescriptor_ != com.google.api.MetricDescriptor.getDefaultInstance()) { + getMetricDescriptorBuilder().mergeFrom(value); } else { metricDescriptor_ = value; } - onChanged(); } else { metricDescriptorBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2260,14 +2285,13 @@ public Builder mergeMetricDescriptor(com.google.api.MetricDescriptor value) { * */ public Builder clearMetricDescriptor() { - if (metricDescriptorBuilder_ == null) { - metricDescriptor_ = null; - onChanged(); - } else { - metricDescriptor_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + metricDescriptor_ = null; + if (metricDescriptorBuilder_ != null) { + metricDescriptorBuilder_.dispose(); metricDescriptorBuilder_ = null; } - + onChanged(); return this; } /** @@ -2298,7 +2322,7 @@ public Builder clearMetricDescriptor() { * */ public com.google.api.MetricDescriptor.Builder getMetricDescriptorBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getMetricDescriptorFieldBuilder().getBuilder(); } @@ -2491,8 +2515,8 @@ public Builder setValueExtractor(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - valueExtractor_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2524,8 +2548,8 @@ public Builder setValueExtractor(java.lang.String value) { * @return This builder for chaining. */ public Builder clearValueExtractor() { - valueExtractor_ = getDefaultInstance().getValueExtractor(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -2562,8 +2586,8 @@ public Builder setValueExtractorBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - valueExtractor_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2581,8 +2605,6 @@ public Builder setValueExtractorBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.MapField internalGetMutableLabelExtractors() { - onChanged(); - ; if (labelExtractors_ == null) { labelExtractors_ = com.google.protobuf.MapField.newMapField( @@ -2591,6 +2613,8 @@ public Builder setValueExtractorBytes(com.google.protobuf.ByteString value) { if (!labelExtractors_.isMutable()) { labelExtractors_ = labelExtractors_.copy(); } + bitField0_ |= 0x00000040; + onChanged(); return labelExtractors_; } @@ -2681,8 +2705,10 @@ public java.util.Map getLabelExtractorsMap() * */ @java.lang.Override - public java.lang.String getLabelExtractorsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelExtractorsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -2724,6 +2750,7 @@ public java.lang.String getLabelExtractorsOrThrow(java.lang.String key) { } public Builder clearLabelExtractors() { + bitField0_ = (bitField0_ & ~0x00000040); internalGetMutableLabelExtractors().getMutableMap().clear(); return this; } @@ -2759,6 +2786,7 @@ public Builder removeLabelExtractors(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabelExtractors() { + bitField0_ |= 0x00000040; return internalGetMutableLabelExtractors().getMutableMap(); } /** @@ -2790,8 +2818,8 @@ public Builder putLabelExtractors(java.lang.String key, java.lang.String value) if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableLabelExtractors().getMutableMap().put(key, value); + bitField0_ |= 0x00000040; return this; } /** @@ -2818,6 +2846,7 @@ public Builder putLabelExtractors(java.lang.String key, java.lang.String value) */ public Builder putAllLabelExtractors(java.util.Map values) { internalGetMutableLabelExtractors().getMutableMap().putAll(values); + bitField0_ |= 0x00000040; return this; } @@ -2843,7 +2872,7 @@ public Builder putAllLabelExtractors(java.util.Map */ public Builder clearBucketOptions() { - if (bucketOptionsBuilder_ == null) { - bucketOptions_ = null; - onChanged(); - } else { - bucketOptions_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + bucketOptions_ = null; + if (bucketOptionsBuilder_ != null) { + bucketOptionsBuilder_.dispose(); bucketOptionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -2987,7 +3014,7 @@ public Builder clearBucketOptions() { * */ public com.google.api.Distribution.BucketOptions.Builder getBucketOptionsBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getBucketOptionsFieldBuilder().getBuilder(); } @@ -3064,7 +3091,7 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000100) != 0); } /** * @@ -3107,11 +3134,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -3129,11 +3156,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -3150,17 +3177,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000100) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000100; + onChanged(); return this; } /** @@ -3176,14 +3204,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000100); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3199,7 +3226,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000100; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -3274,7 +3301,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000200) != 0); } /** * @@ -3317,11 +3344,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3339,11 +3366,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3360,17 +3387,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000200) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000200; + onChanged(); return this; } /** @@ -3386,14 +3414,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000200); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3409,7 +3436,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000200; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } @@ -3500,8 +3527,8 @@ public int getVersionValue() { */ @java.lang.Deprecated public Builder setVersionValue(int value) { - version_ = value; + bitField0_ |= 0x00000400; onChanged(); return this; } @@ -3522,9 +3549,8 @@ public Builder setVersionValue(int value) { @java.lang.Override @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_); + com.google.logging.v2.LogMetric.ApiVersion.forNumber(version_); return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result; } /** @@ -3547,7 +3573,7 @@ public Builder setVersion(com.google.logging.v2.LogMetric.ApiVersion value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000400; version_ = value.getNumber(); onChanged(); return this; @@ -3568,7 +3594,7 @@ public Builder setVersion(com.google.logging.v2.LogMetric.ApiVersion value) { */ @java.lang.Deprecated public Builder clearVersion() { - + bitField0_ = (bitField0_ & ~0x00000400); version_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricOrBuilder.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricOrBuilder.java index 93a389403..3f71ddb4c 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricOrBuilder.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricOrBuilder.java @@ -378,7 +378,6 @@ public interface LogMetricOrBuilder *

map<string, string> label_extractors = 7 [(.google.api.field_behavior) = OPTIONAL];
    *

*/ - /* nullable */ java.lang.String getLabelExtractorsOrDefault( java.lang.String key, diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java index 3425b4c4c..b66b0b057 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java @@ -278,7 +278,9 @@ public OptionsCase getOptionsCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -335,7 +337,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DESTINATION_FIELD_NUMBER = 3; - private volatile java.lang.Object destination_; + + @SuppressWarnings("serial") + private volatile java.lang.Object destination_ = ""; /** * * @@ -404,7 +408,9 @@ public com.google.protobuf.ByteString getDestinationBytes() { } public static final int FILTER_FIELD_NUMBER = 5; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -463,7 +469,9 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 18; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -514,7 +522,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() { } public static final int DISABLED_FIELD_NUMBER = 19; - private boolean disabled_; + private boolean disabled_ = false; /** * * @@ -533,6 +541,8 @@ public boolean getDisabled() { } public static final int EXCLUSIONS_FIELD_NUMBER = 16; + + @SuppressWarnings("serial") private java.util.List exclusions_; /** * @@ -622,7 +632,7 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionsOrBuilder(int in } public static final int OUTPUT_VERSION_FORMAT_FIELD_NUMBER = 6; - private int outputVersionFormat_; + private int outputVersionFormat_ = 0; /** * * @@ -659,14 +669,15 @@ public int getOutputVersionFormatValue() { @java.lang.Override @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_); + com.google.logging.v2.LogSink.VersionFormat.forNumber(outputVersionFormat_); return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result; } public static final int WRITER_IDENTITY_FIELD_NUMBER = 8; - private volatile java.lang.Object writerIdentity_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writerIdentity_ = ""; /** * * @@ -743,7 +754,7 @@ public com.google.protobuf.ByteString getWriterIdentityBytes() { } public static final int INCLUDE_CHILDREN_FIELD_NUMBER = 9; - private boolean includeChildren_; + private boolean includeChildren_ = false; /** * * @@ -879,7 +890,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 14; @@ -931,7 +942,7 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } private byte memoizedIsInitialized = -1; @@ -1260,42 +1271,33 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - destination_ = ""; - filter_ = ""; - description_ = ""; - disabled_ = false; - if (exclusionsBuilder_ == null) { exclusions_ = java.util.Collections.emptyList(); } else { exclusions_ = null; exclusionsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000020); outputVersionFormat_ = 0; - writerIdentity_ = ""; - includeChildren_ = false; - if (bigqueryOptionsBuilder_ != null) { bigqueryOptionsBuilder_.clear(); } - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } optionsCase_ = 0; @@ -1326,44 +1328,67 @@ public com.google.logging.v2.LogSink build() { @java.lang.Override public com.google.logging.v2.LogSink buildPartial() { com.google.logging.v2.LogSink result = new com.google.logging.v2.LogSink(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.destination_ = destination_; - result.filter_ = filter_; - result.description_ = description_; - result.disabled_ = disabled_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.LogSink result) { if (exclusionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000020) != 0)) { exclusions_ = java.util.Collections.unmodifiableList(exclusions_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000020); } result.exclusions_ = exclusions_; } else { result.exclusions_ = exclusionsBuilder_.build(); } - result.outputVersionFormat_ = outputVersionFormat_; - result.writerIdentity_ = writerIdentity_; - result.includeChildren_ = includeChildren_; - if (optionsCase_ == 12) { - if (bigqueryOptionsBuilder_ == null) { - result.options_ = options_; - } else { - result.options_ = bigqueryOptionsBuilder_.build(); - } + } + + private void buildPartial0(com.google.logging.v2.LogSink result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000002) != 0)) { + result.destination_ = destination_; } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000004) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.description_ = description_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.disabled_ = disabled_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.outputVersionFormat_ = outputVersionFormat_; + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.writerIdentity_ = writerIdentity_; + } + if (((from_bitField0_ & 0x00000100) != 0)) { + result.includeChildren_ = includeChildren_; } + if (((from_bitField0_ & 0x00000400) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000800) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + } + + private void buildPartialOneofs(com.google.logging.v2.LogSink result) { result.optionsCase_ = optionsCase_; - onBuilt(); - return result; + result.options_ = this.options_; + if (optionsCase_ == 12 && bigqueryOptionsBuilder_ != null) { + result.options_ = bigqueryOptionsBuilder_.build(); + } } @java.lang.Override @@ -1413,18 +1438,22 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) { if (other == com.google.logging.v2.LogSink.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDestination().isEmpty()) { destination_ = other.destination_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000008; onChanged(); } if (other.getDisabled() != false) { @@ -1434,7 +1463,7 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) { if (!other.exclusions_.isEmpty()) { if (exclusions_.isEmpty()) { exclusions_ = other.exclusions_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureExclusionsIsMutable(); exclusions_.addAll(other.exclusions_); @@ -1447,7 +1476,7 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) { exclusionsBuilder_.dispose(); exclusionsBuilder_ = null; exclusions_ = other.exclusions_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000020); exclusionsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getExclusionsFieldBuilder() @@ -1462,6 +1491,7 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) { } if (!other.getWriterIdentity().isEmpty()) { writerIdentity_ = other.writerIdentity_; + bitField0_ |= 0x00000080; onChanged(); } if (other.getIncludeChildren() != false) { @@ -1513,37 +1543,37 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 26: { destination_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 26 case 42: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 42 case 48: { outputVersionFormat_ = input.readEnum(); - + bitField0_ |= 0x00000040; break; } // case 48 case 66: { writerIdentity_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000080; break; } // case 66 case 72: { includeChildren_ = input.readBool(); - + bitField0_ |= 0x00000100; break; } // case 72 case 98: @@ -1555,13 +1585,13 @@ public Builder mergeFrom( case 106: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000400; break; } // case 106 case 114: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000800; break; } // case 114 case 130: @@ -1580,13 +1610,13 @@ public Builder mergeFrom( case 146: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 146 case 152: { disabled_ = input.readBool(); - + bitField0_ |= 0x00000010; break; } // case 152 default: @@ -1695,8 +1725,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1716,8 +1746,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1742,8 +1772,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1839,8 +1869,8 @@ public Builder setDestination(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - destination_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1866,8 +1896,8 @@ public Builder setDestination(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDestination() { - destination_ = getDefaultInstance().getDestination(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1898,8 +1928,8 @@ public Builder setDestinationBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - destination_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1980,8 +2010,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2002,8 +2032,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -2029,8 +2059,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2099,8 +2129,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2117,8 +2147,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -2140,8 +2170,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2179,6 +2209,7 @@ public boolean getDisabled() { public Builder setDisabled(boolean value) { disabled_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2195,7 +2226,7 @@ public Builder setDisabled(boolean value) { * @return This builder for chaining. */ public Builder clearDisabled() { - + bitField0_ = (bitField0_ & ~0x00000010); disabled_ = false; onChanged(); return this; @@ -2205,9 +2236,9 @@ public Builder clearDisabled() { java.util.Collections.emptyList(); private void ensureExclusionsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000020) != 0)) { exclusions_ = new java.util.ArrayList(exclusions_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000020; } } @@ -2466,7 +2497,7 @@ public Builder addAllExclusions( public Builder clearExclusions() { if (exclusionsBuilder_ == null) { exclusions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { exclusionsBuilder_.clear(); @@ -2615,7 +2646,7 @@ public java.util.List getExclusionsB com.google.logging.v2.LogExclusion, com.google.logging.v2.LogExclusion.Builder, com.google.logging.v2.LogExclusionOrBuilder>( - exclusions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + exclusions_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); exclusions_ = null; } return exclusionsBuilder_; @@ -2658,8 +2689,8 @@ public int getOutputVersionFormatValue() { */ @java.lang.Deprecated public Builder setOutputVersionFormatValue(int value) { - outputVersionFormat_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2680,9 +2711,8 @@ public Builder setOutputVersionFormatValue(int value) { @java.lang.Override @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_); + com.google.logging.v2.LogSink.VersionFormat.forNumber(outputVersionFormat_); return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result; } /** @@ -2705,7 +2735,7 @@ public Builder setOutputVersionFormat(com.google.logging.v2.LogSink.VersionForma if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000040; outputVersionFormat_ = value.getNumber(); onChanged(); return this; @@ -2726,7 +2756,7 @@ public Builder setOutputVersionFormat(com.google.logging.v2.LogSink.VersionForma */ @java.lang.Deprecated public Builder clearOutputVersionFormat() { - + bitField0_ = (bitField0_ & ~0x00000040); outputVersionFormat_ = 0; onChanged(); return this; @@ -2835,8 +2865,8 @@ public Builder setWriterIdentity(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writerIdentity_ = value; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2866,8 +2896,8 @@ public Builder setWriterIdentity(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriterIdentity() { - writerIdentity_ = getDefaultInstance().getWriterIdentity(); + bitField0_ = (bitField0_ & ~0x00000080); onChanged(); return this; } @@ -2902,8 +2932,8 @@ public Builder setWriterIdentityBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writerIdentity_ = value; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2965,6 +2995,7 @@ public boolean getIncludeChildren() { public Builder setIncludeChildren(boolean value) { includeChildren_ = value; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -2993,7 +3024,7 @@ public Builder setIncludeChildren(boolean value) { * @return This builder for chaining. */ public Builder clearIncludeChildren() { - + bitField0_ = (bitField0_ & ~0x00000100); includeChildren_ = false; onChanged(); return this; @@ -3223,7 +3254,6 @@ public com.google.logging.v2.BigQueryOptionsOrBuilder getBigqueryOptionsOrBuilde } optionsCase_ = 12; onChanged(); - ; return bigqueryOptionsBuilder_; } @@ -3248,7 +3278,7 @@ public com.google.logging.v2.BigQueryOptionsOrBuilder getBigqueryOptionsOrBuilde * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000400) != 0); } /** * @@ -3291,11 +3321,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000400; + onChanged(); return this; } /** @@ -3313,11 +3343,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000400; + onChanged(); return this; } /** @@ -3334,17 +3364,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000400) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000400; + onChanged(); return this; } /** @@ -3360,14 +3391,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000400); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3383,7 +3413,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000400; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -3458,7 +3488,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000800) != 0); } /** * @@ -3501,11 +3531,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -3523,11 +3553,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -3544,17 +3574,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000800) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000800; + onChanged(); return this; } /** @@ -3570,14 +3601,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000800); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3593,7 +3623,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000800; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSplit.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSplit.java index e1d3c1f23..8dcdfb34f 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSplit.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSplit.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int UID_FIELD_NUMBER = 1; - private volatile java.lang.Object uid_; + + @SuppressWarnings("serial") + private volatile java.lang.Object uid_ = ""; /** * * @@ -122,7 +124,7 @@ public com.google.protobuf.ByteString getUidBytes() { } public static final int INDEX_FIELD_NUMBER = 2; - private int index_; + private int index_ = 0; /** * * @@ -142,7 +144,7 @@ public int getIndex() { } public static final int TOTAL_SPLITS_FIELD_NUMBER = 3; - private int totalSplits_; + private int totalSplits_ = 0; /** * * @@ -373,12 +375,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; uid_ = ""; - index_ = 0; - totalSplits_ = 0; - return this; } @@ -405,13 +405,26 @@ public com.google.logging.v2.LogSplit build() { @java.lang.Override public com.google.logging.v2.LogSplit buildPartial() { com.google.logging.v2.LogSplit result = new com.google.logging.v2.LogSplit(this); - result.uid_ = uid_; - result.index_ = index_; - result.totalSplits_ = totalSplits_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.LogSplit result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.uid_ = uid_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.index_ = index_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.totalSplits_ = totalSplits_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -459,6 +472,7 @@ public Builder mergeFrom(com.google.logging.v2.LogSplit other) { if (other == com.google.logging.v2.LogSplit.getDefaultInstance()) return this; if (!other.getUid().isEmpty()) { uid_ = other.uid_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getIndex() != 0) { @@ -496,19 +510,19 @@ public Builder mergeFrom( case 10: { uid_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { index_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 case 24: { totalSplits_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -528,6 +542,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object uid_ = ""; /** * @@ -595,8 +611,8 @@ public Builder setUid(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - uid_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -614,8 +630,8 @@ public Builder setUid(java.lang.String value) { * @return This builder for chaining. */ public Builder clearUid() { - uid_ = getDefaultInstance().getUid(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -638,8 +654,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - uid_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -679,6 +695,7 @@ public int getIndex() { public Builder setIndex(int value) { index_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -696,7 +713,7 @@ public Builder setIndex(int value) { * @return This builder for chaining. */ public Builder clearIndex() { - + bitField0_ = (bitField0_ & ~0x00000002); index_ = 0; onChanged(); return this; @@ -733,6 +750,7 @@ public int getTotalSplits() { public Builder setTotalSplits(int value) { totalSplits_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -748,7 +766,7 @@ public Builder setTotalSplits(int value) { * @return This builder for chaining. */ public Builder clearTotalSplits() { - + bitField0_ = (bitField0_ & ~0x00000004); totalSplits_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogView.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogView.java index 5a572bb39..bb07d0dca 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogView.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogView.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -122,7 +124,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 3; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -216,7 +220,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int UPDATE_TIME_FIELD_NUMBER = 5; @@ -265,11 +269,13 @@ public com.google.protobuf.Timestamp getUpdateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { - return getUpdateTime(); + return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_; } public static final int FILTER_FIELD_NUMBER = 7; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -575,24 +581,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - description_ = ""; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (updateTimeBuilder_ == null) { - updateTime_ = null; - } else { - updateTime_ = null; + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } filter_ = ""; - return this; } @@ -619,23 +621,32 @@ public com.google.logging.v2.LogView build() { @java.lang.Override public com.google.logging.v2.LogView buildPartial() { com.google.logging.v2.LogView result = new com.google.logging.v2.LogView(this); - result.name_ = name_; - result.description_ = description_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (updateTimeBuilder_ == null) { - result.updateTime_ = updateTime_; - } else { - result.updateTime_ = updateTimeBuilder_.build(); - } - result.filter_ = filter_; onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.LogView result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.description_ = description_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.filter_ = filter_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -683,10 +694,12 @@ public Builder mergeFrom(com.google.logging.v2.LogView other) { if (other == com.google.logging.v2.LogView.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasCreateTime()) { @@ -697,6 +710,7 @@ public Builder mergeFrom(com.google.logging.v2.LogView other) { } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -728,31 +742,31 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 26: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 26 case 34: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 34 case 42: { input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 42 case 58: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 58 default: @@ -772,6 +786,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -839,8 +855,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -858,8 +874,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -882,8 +898,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -949,8 +965,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -966,8 +982,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -988,8 +1004,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1014,7 +1030,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1055,11 +1071,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1076,11 +1092,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1096,17 +1112,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1121,14 +1138,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1143,7 +1159,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1215,7 +1231,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the updateTime field is set. */ public boolean hasUpdateTime() { - return updateTimeBuilder_ != null || updateTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1256,11 +1272,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } updateTime_ = value; - onChanged(); } else { updateTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1277,11 +1293,11 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) { public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (updateTimeBuilder_ == null) { updateTime_ = builderForValue.build(); - onChanged(); } else { updateTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1297,17 +1313,18 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { if (updateTimeBuilder_ == null) { - if (updateTime_ != null) { - updateTime_ = - com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && updateTime_ != null + && updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getUpdateTimeBuilder().mergeFrom(value); } else { updateTime_ = value; } - onChanged(); } else { updateTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1322,14 +1339,13 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearUpdateTime() { - if (updateTimeBuilder_ == null) { - updateTime_ = null; - onChanged(); - } else { - updateTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + updateTime_ = null; + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.dispose(); updateTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1344,7 +1360,7 @@ public Builder clearUpdateTime() { * */ public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getUpdateTimeFieldBuilder().getBuilder(); } @@ -1484,8 +1500,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1510,8 +1526,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1541,8 +1557,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/Settings.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/Settings.java index 70cf8bca2..24cba8637 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/Settings.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/Settings.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -120,7 +122,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int KMS_KEY_NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object kmsKeyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kmsKeyName_ = ""; /** * * @@ -201,7 +205,9 @@ public com.google.protobuf.ByteString getKmsKeyNameBytes() { } public static final int KMS_SERVICE_ACCOUNT_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object kmsServiceAccountId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kmsServiceAccountId_ = ""; /** * * @@ -268,7 +274,9 @@ public com.google.protobuf.ByteString getKmsServiceAccountIdBytes() { } public static final int STORAGE_LOCATION_FIELD_NUMBER = 4; - private volatile java.lang.Object storageLocation_; + + @SuppressWarnings("serial") + private volatile java.lang.Object storageLocation_ = ""; /** * * @@ -321,7 +329,7 @@ public com.google.protobuf.ByteString getStorageLocationBytes() { } public static final int DISABLE_DEFAULT_SINK_FIELD_NUMBER = 5; - private boolean disableDefaultSink_; + private boolean disableDefaultSink_ = false; /** * * @@ -572,16 +580,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - kmsKeyName_ = ""; - kmsServiceAccountId_ = ""; - storageLocation_ = ""; - disableDefaultSink_ = false; - return this; } @@ -608,15 +612,32 @@ public com.google.logging.v2.Settings build() { @java.lang.Override public com.google.logging.v2.Settings buildPartial() { com.google.logging.v2.Settings result = new com.google.logging.v2.Settings(this); - result.name_ = name_; - result.kmsKeyName_ = kmsKeyName_; - result.kmsServiceAccountId_ = kmsServiceAccountId_; - result.storageLocation_ = storageLocation_; - result.disableDefaultSink_ = disableDefaultSink_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.Settings result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.kmsKeyName_ = kmsKeyName_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.kmsServiceAccountId_ = kmsServiceAccountId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.storageLocation_ = storageLocation_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.disableDefaultSink_ = disableDefaultSink_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -664,18 +685,22 @@ public Builder mergeFrom(com.google.logging.v2.Settings other) { if (other == com.google.logging.v2.Settings.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getKmsKeyName().isEmpty()) { kmsKeyName_ = other.kmsKeyName_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getKmsServiceAccountId().isEmpty()) { kmsServiceAccountId_ = other.kmsServiceAccountId_; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getStorageLocation().isEmpty()) { storageLocation_ = other.storageLocation_; + bitField0_ |= 0x00000008; onChanged(); } if (other.getDisableDefaultSink() != false) { @@ -710,31 +735,31 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { kmsKeyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { kmsServiceAccountId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { storageLocation_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 case 40: { disableDefaultSink_ = input.readBool(); - + bitField0_ |= 0x00000010; break; } // case 40 default: @@ -754,6 +779,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -815,8 +842,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -832,8 +859,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -854,8 +881,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -969,8 +996,8 @@ public Builder setKmsKeyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kmsKeyName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1002,8 +1029,8 @@ public Builder setKmsKeyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKmsKeyName() { - kmsKeyName_ = getDefaultInstance().getKmsKeyName(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1040,8 +1067,8 @@ public Builder setKmsKeyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kmsKeyName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1134,8 +1161,8 @@ public Builder setKmsServiceAccountId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kmsServiceAccountId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1160,8 +1187,8 @@ public Builder setKmsServiceAccountId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKmsServiceAccountId() { - kmsServiceAccountId_ = getDefaultInstance().getKmsServiceAccountId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1191,8 +1218,8 @@ public Builder setKmsServiceAccountIdBytes(com.google.protobuf.ByteString value) throw new NullPointerException(); } checkByteStringIsUtf8(value); - kmsServiceAccountId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1264,8 +1291,8 @@ public Builder setStorageLocation(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - storageLocation_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1283,8 +1310,8 @@ public Builder setStorageLocation(java.lang.String value) { * @return This builder for chaining. */ public Builder clearStorageLocation() { - storageLocation_ = getDefaultInstance().getStorageLocation(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1307,8 +1334,8 @@ public Builder setStorageLocationBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - storageLocation_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1350,6 +1377,7 @@ public boolean getDisableDefaultSink() { public Builder setDisableDefaultSink(boolean value) { disableDefaultSink_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1368,7 +1396,7 @@ public Builder setDisableDefaultSink(boolean value) { * @return This builder for chaining. */ public Builder clearDisableDefaultSink() { - + bitField0_ = (bitField0_ & ~0x00000010); disableDefaultSink_ = false; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequest.java index e71966d62..cfb935850 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequest.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RESOURCE_NAMES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList resourceNames_; /** * @@ -166,7 +168,9 @@ public com.google.protobuf.ByteString getResourceNamesBytes(int index) { } public static final int FILTER_FIELD_NUMBER = 2; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -283,7 +287,9 @@ public com.google.protobuf.Duration getBufferWindow() { */ @java.lang.Override public com.google.protobuf.DurationOrBuilder getBufferWindowOrBuilder() { - return getBufferWindow(); + return bufferWindow_ == null + ? com.google.protobuf.Duration.getDefaultInstance() + : bufferWindow_; } private byte memoizedIsInitialized = -1; @@ -513,14 +519,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; resourceNames_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); filter_ = ""; - - if (bufferWindowBuilder_ == null) { - bufferWindow_ = null; - } else { - bufferWindow_ = null; + bufferWindow_ = null; + if (bufferWindowBuilder_ != null) { + bufferWindowBuilder_.dispose(); bufferWindowBuilder_ = null; } return this; @@ -550,20 +555,31 @@ public com.google.logging.v2.TailLogEntriesRequest build() { public com.google.logging.v2.TailLogEntriesRequest buildPartial() { com.google.logging.v2.TailLogEntriesRequest result = new com.google.logging.v2.TailLogEntriesRequest(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.TailLogEntriesRequest result) { if (((bitField0_ & 0x00000001) != 0)) { resourceNames_ = resourceNames_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.resourceNames_ = resourceNames_; - result.filter_ = filter_; - if (bufferWindowBuilder_ == null) { - result.bufferWindow_ = bufferWindow_; - } else { - result.bufferWindow_ = bufferWindowBuilder_.build(); + } + + private void buildPartial0(com.google.logging.v2.TailLogEntriesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.bufferWindow_ = + bufferWindowBuilder_ == null ? bufferWindow_ : bufferWindowBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -623,6 +639,7 @@ public Builder mergeFrom(com.google.logging.v2.TailLogEntriesRequest other) { } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasBufferWindow()) { @@ -664,13 +681,13 @@ public Builder mergeFrom( case 18: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getBufferWindowFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1020,8 +1037,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1043,8 +1060,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1071,8 +1088,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1099,7 +1116,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { * @return Whether the bufferWindow field is set. */ public boolean hasBufferWindow() { - return bufferWindowBuilder_ != null || bufferWindow_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1144,11 +1161,11 @@ public Builder setBufferWindow(com.google.protobuf.Duration value) { throw new NullPointerException(); } bufferWindow_ = value; - onChanged(); } else { bufferWindowBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1167,11 +1184,11 @@ public Builder setBufferWindow(com.google.protobuf.Duration value) { public Builder setBufferWindow(com.google.protobuf.Duration.Builder builderForValue) { if (bufferWindowBuilder_ == null) { bufferWindow_ = builderForValue.build(); - onChanged(); } else { bufferWindowBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1189,19 +1206,18 @@ public Builder setBufferWindow(com.google.protobuf.Duration.Builder builderForVa */ public Builder mergeBufferWindow(com.google.protobuf.Duration value) { if (bufferWindowBuilder_ == null) { - if (bufferWindow_ != null) { - bufferWindow_ = - com.google.protobuf.Duration.newBuilder(bufferWindow_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && bufferWindow_ != null + && bufferWindow_ != com.google.protobuf.Duration.getDefaultInstance()) { + getBufferWindowBuilder().mergeFrom(value); } else { bufferWindow_ = value; } - onChanged(); } else { bufferWindowBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1218,14 +1234,13 @@ public Builder mergeBufferWindow(com.google.protobuf.Duration value) { * */ public Builder clearBufferWindow() { - if (bufferWindowBuilder_ == null) { - bufferWindow_ = null; - onChanged(); - } else { - bufferWindow_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + bufferWindow_ = null; + if (bufferWindowBuilder_ != null) { + bufferWindowBuilder_.dispose(); bufferWindowBuilder_ = null; } - + onChanged(); return this; } /** @@ -1242,7 +1257,7 @@ public Builder clearBufferWindow() { * */ public com.google.protobuf.Duration.Builder getBufferWindowBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getBufferWindowFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponse.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponse.java index 3da34cc7b..a7e023a54 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponse.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponse.java @@ -328,7 +328,7 @@ private Reason(int value) { } public static final int REASON_FIELD_NUMBER = 1; - private int reason_; + private int reason_ = 0; /** * * @@ -357,16 +357,15 @@ public int getReasonValue() { */ @java.lang.Override public com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason getReason() { - @SuppressWarnings("deprecation") com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason result = - com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.valueOf(reason_); + com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.forNumber(reason_); return result == null ? com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.UNRECOGNIZED : result; } public static final int SUPPRESSED_COUNT_FIELD_NUMBER = 2; - private int suppressedCount_; + private int suppressedCount_ = 0; /** * * @@ -596,10 +595,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; reason_ = 0; - suppressedCount_ = 0; - return this; } @@ -628,12 +626,24 @@ public com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo build() { public com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo buildPartial() { com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo result = new com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo(this); - result.reason_ = reason_; - result.suppressedCount_ = suppressedCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.reason_ = reason_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.suppressedCount_ = suppressedCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -718,13 +728,13 @@ public Builder mergeFrom( case 8: { reason_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { suppressedCount_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -744,6 +754,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int reason_ = 0; /** * @@ -773,8 +785,8 @@ public int getReasonValue() { * @return This builder for chaining. */ public Builder setReasonValue(int value) { - reason_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -791,9 +803,8 @@ public Builder setReasonValue(int value) { */ @java.lang.Override public com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason getReason() { - @SuppressWarnings("deprecation") com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason result = - com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.valueOf(reason_); + com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.forNumber(reason_); return result == null ? com.google.logging.v2.TailLogEntriesResponse.SuppressionInfo.Reason.UNRECOGNIZED : result; @@ -815,7 +826,7 @@ public Builder setReason( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; reason_ = value.getNumber(); onChanged(); return this; @@ -832,7 +843,7 @@ public Builder setReason( * @return This builder for chaining. */ public Builder clearReason() { - + bitField0_ = (bitField0_ & ~0x00000001); reason_ = 0; onChanged(); return this; @@ -869,6 +880,7 @@ public int getSuppressedCount() { public Builder setSuppressedCount(int value) { suppressedCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -884,7 +896,7 @@ public Builder setSuppressedCount(int value) { * @return This builder for chaining. */ public Builder clearSuppressedCount() { - + bitField0_ = (bitField0_ & ~0x00000002); suppressedCount_ = 0; onChanged(); return this; @@ -958,6 +970,8 @@ public com.google.protobuf.Parser getParserForType() { } public static final int ENTRIES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List entries_; /** * @@ -1037,6 +1051,8 @@ public com.google.logging.v2.LogEntryOrBuilder getEntriesOrBuilder(int index) { } public static final int SUPPRESSION_INFO_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List suppressionInfo_; /** @@ -1345,6 +1361,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); } else { @@ -1386,7 +1403,15 @@ public com.google.logging.v2.TailLogEntriesResponse build() { public com.google.logging.v2.TailLogEntriesResponse buildPartial() { com.google.logging.v2.TailLogEntriesResponse result = new com.google.logging.v2.TailLogEntriesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.TailLogEntriesResponse result) { if (entriesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); @@ -1405,8 +1430,10 @@ public com.google.logging.v2.TailLogEntriesResponse buildPartial() { } else { result.suppressionInfo_ = suppressionInfoBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.TailLogEntriesResponse result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequest.java index 2230b5921..e9a9cf93a 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -329,8 +331,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -358,11 +360,20 @@ public com.google.logging.v2.UndeleteBucketRequest build() { public com.google.logging.v2.UndeleteBucketRequest buildPartial() { com.google.logging.v2.UndeleteBucketRequest result = new com.google.logging.v2.UndeleteBucketRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UndeleteBucketRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -410,6 +421,7 @@ public Builder mergeFrom(com.google.logging.v2.UndeleteBucketRequest other) { if (other == com.google.logging.v2.UndeleteBucketRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -441,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -461,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -546,8 +560,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -571,8 +585,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -601,8 +615,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequest.java index adb19c4cb..2bb718aed 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -175,7 +177,7 @@ public com.google.logging.v2.LogBucket getBucket() { */ @java.lang.Override public com.google.logging.v2.LogBucketOrBuilder getBucketOrBuilder() { - return getBucket(); + return bucket_ == null ? com.google.logging.v2.LogBucket.getDefaultInstance() : bucket_; } public static final int UPDATE_MASK_FIELD_NUMBER = 4; @@ -239,7 +241,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -467,18 +469,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (bucketBuilder_ == null) { - bucket_ = null; - } else { - bucket_ = null; + bucket_ = null; + if (bucketBuilder_ != null) { + bucketBuilder_.dispose(); bucketBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -508,21 +508,26 @@ public com.google.logging.v2.UpdateBucketRequest build() { public com.google.logging.v2.UpdateBucketRequest buildPartial() { com.google.logging.v2.UpdateBucketRequest result = new com.google.logging.v2.UpdateBucketRequest(this); - result.name_ = name_; - if (bucketBuilder_ == null) { - result.bucket_ = bucket_; - } else { - result.bucket_ = bucketBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateBucketRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.bucket_ = bucketBuilder_ == null ? bucket_ : bucketBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -570,6 +575,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateBucketRequest other) { if (other == com.google.logging.v2.UpdateBucketRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasBucket()) { @@ -607,19 +613,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getBucketFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 34: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 34 default: @@ -639,6 +645,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -724,8 +732,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -749,8 +757,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -779,8 +787,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -804,7 +812,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the bucket field is set. */ public boolean hasBucket() { - return bucketBuilder_ != null || bucket_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -841,11 +849,11 @@ public Builder setBucket(com.google.logging.v2.LogBucket value) { throw new NullPointerException(); } bucket_ = value; - onChanged(); } else { bucketBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -861,11 +869,11 @@ public Builder setBucket(com.google.logging.v2.LogBucket value) { public Builder setBucket(com.google.logging.v2.LogBucket.Builder builderForValue) { if (bucketBuilder_ == null) { bucket_ = builderForValue.build(); - onChanged(); } else { bucketBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -880,17 +888,18 @@ public Builder setBucket(com.google.logging.v2.LogBucket.Builder builderForValue */ public Builder mergeBucket(com.google.logging.v2.LogBucket value) { if (bucketBuilder_ == null) { - if (bucket_ != null) { - bucket_ = - com.google.logging.v2.LogBucket.newBuilder(bucket_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && bucket_ != null + && bucket_ != com.google.logging.v2.LogBucket.getDefaultInstance()) { + getBucketBuilder().mergeFrom(value); } else { bucket_ = value; } - onChanged(); } else { bucketBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -904,14 +913,13 @@ public Builder mergeBucket(com.google.logging.v2.LogBucket value) { * */ public Builder clearBucket() { - if (bucketBuilder_ == null) { - bucket_ = null; - onChanged(); - } else { - bucket_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + bucket_ = null; + if (bucketBuilder_ != null) { + bucketBuilder_.dispose(); bucketBuilder_ = null; } - + onChanged(); return this; } /** @@ -925,7 +933,7 @@ public Builder clearBucket() { * */ public com.google.logging.v2.LogBucket.Builder getBucketBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getBucketFieldBuilder().getBuilder(); } @@ -997,7 +1005,7 @@ public com.google.logging.v2.LogBucketOrBuilder getBucketOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1046,11 +1054,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1071,11 +1079,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1095,17 +1103,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1124,14 +1133,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1150,7 +1158,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequest.java index 3c9788bae..c4b50d200 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequest.java @@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -198,7 +200,9 @@ public com.google.logging.v2.CmekSettings getCmekSettings() { */ @java.lang.Override public com.google.logging.v2.CmekSettingsOrBuilder getCmekSettingsOrBuilder() { - return getCmekSettings(); + return cmekSettings_ == null + ? com.google.logging.v2.CmekSettings.getDefaultInstance() + : cmekSettings_; } public static final int UPDATE_MASK_FIELD_NUMBER = 3; @@ -259,7 +263,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -491,18 +495,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (cmekSettingsBuilder_ == null) { - cmekSettings_ = null; - } else { - cmekSettings_ = null; + cmekSettings_ = null; + if (cmekSettingsBuilder_ != null) { + cmekSettingsBuilder_.dispose(); cmekSettingsBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -532,21 +534,27 @@ public com.google.logging.v2.UpdateCmekSettingsRequest build() { public com.google.logging.v2.UpdateCmekSettingsRequest buildPartial() { com.google.logging.v2.UpdateCmekSettingsRequest result = new com.google.logging.v2.UpdateCmekSettingsRequest(this); - result.name_ = name_; - if (cmekSettingsBuilder_ == null) { - result.cmekSettings_ = cmekSettings_; - } else { - result.cmekSettings_ = cmekSettingsBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateCmekSettingsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.cmekSettings_ = + cmekSettingsBuilder_ == null ? cmekSettings_ : cmekSettingsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -595,6 +603,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateCmekSettingsRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasCmekSettings()) { @@ -632,19 +641,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getCmekSettingsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -664,6 +673,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -752,8 +763,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -778,8 +789,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -809,8 +820,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -838,7 +849,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the cmekSettings field is set. */ public boolean hasCmekSettings() { - return cmekSettingsBuilder_ != null || cmekSettings_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -885,11 +896,11 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings value) { throw new NullPointerException(); } cmekSettings_ = value; - onChanged(); } else { cmekSettingsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -909,11 +920,11 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings value) { public Builder setCmekSettings(com.google.logging.v2.CmekSettings.Builder builderForValue) { if (cmekSettingsBuilder_ == null) { cmekSettings_ = builderForValue.build(); - onChanged(); } else { cmekSettingsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -932,19 +943,18 @@ public Builder setCmekSettings(com.google.logging.v2.CmekSettings.Builder builde */ public Builder mergeCmekSettings(com.google.logging.v2.CmekSettings value) { if (cmekSettingsBuilder_ == null) { - if (cmekSettings_ != null) { - cmekSettings_ = - com.google.logging.v2.CmekSettings.newBuilder(cmekSettings_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && cmekSettings_ != null + && cmekSettings_ != com.google.logging.v2.CmekSettings.getDefaultInstance()) { + getCmekSettingsBuilder().mergeFrom(value); } else { cmekSettings_ = value; } - onChanged(); } else { cmekSettingsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -962,14 +972,13 @@ public Builder mergeCmekSettings(com.google.logging.v2.CmekSettings value) { * */ public Builder clearCmekSettings() { - if (cmekSettingsBuilder_ == null) { - cmekSettings_ = null; - onChanged(); - } else { - cmekSettings_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + cmekSettings_ = null; + if (cmekSettingsBuilder_ != null) { + cmekSettingsBuilder_.dispose(); cmekSettingsBuilder_ = null; } - + onChanged(); return this; } /** @@ -987,7 +996,7 @@ public Builder clearCmekSettings() { * */ public com.google.logging.v2.CmekSettings.Builder getCmekSettingsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getCmekSettingsFieldBuilder().getBuilder(); } @@ -1068,7 +1077,7 @@ public com.google.logging.v2.CmekSettingsOrBuilder getCmekSettingsOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1115,11 +1124,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1139,11 +1148,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1162,17 +1171,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1190,14 +1200,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1215,7 +1224,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java index f84adc16e..0706f8d3c 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -183,7 +185,9 @@ public com.google.logging.v2.LogExclusion getExclusion() { */ @java.lang.Override public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { - return getExclusion(); + return exclusion_ == null + ? com.google.logging.v2.LogExclusion.getDefaultInstance() + : exclusion_; } public static final int UPDATE_MASK_FIELD_NUMBER = 3; @@ -247,7 +251,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -475,18 +479,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (exclusionBuilder_ == null) { - exclusion_ = null; - } else { - exclusion_ = null; + exclusion_ = null; + if (exclusionBuilder_ != null) { + exclusionBuilder_.dispose(); exclusionBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -516,21 +518,26 @@ public com.google.logging.v2.UpdateExclusionRequest build() { public com.google.logging.v2.UpdateExclusionRequest buildPartial() { com.google.logging.v2.UpdateExclusionRequest result = new com.google.logging.v2.UpdateExclusionRequest(this); - result.name_ = name_; - if (exclusionBuilder_ == null) { - result.exclusion_ = exclusion_; - } else { - result.exclusion_ = exclusionBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateExclusionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.exclusion_ = exclusionBuilder_ == null ? exclusion_ : exclusionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -578,6 +585,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateExclusionRequest other) { if (other == com.google.logging.v2.UpdateExclusionRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasExclusion()) { @@ -615,19 +623,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getExclusionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -647,6 +655,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -732,8 +742,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -757,8 +767,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -787,8 +797,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -814,7 +824,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the exclusion field is set. */ public boolean hasExclusion() { - return exclusionBuilder_ != null || exclusion_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -857,11 +867,11 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion value) { throw new NullPointerException(); } exclusion_ = value; - onChanged(); } else { exclusionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -879,11 +889,11 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion value) { public Builder setExclusion(com.google.logging.v2.LogExclusion.Builder builderForValue) { if (exclusionBuilder_ == null) { exclusion_ = builderForValue.build(); - onChanged(); } else { exclusionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -900,19 +910,18 @@ public Builder setExclusion(com.google.logging.v2.LogExclusion.Builder builderFo */ public Builder mergeExclusion(com.google.logging.v2.LogExclusion value) { if (exclusionBuilder_ == null) { - if (exclusion_ != null) { - exclusion_ = - com.google.logging.v2.LogExclusion.newBuilder(exclusion_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && exclusion_ != null + && exclusion_ != com.google.logging.v2.LogExclusion.getDefaultInstance()) { + getExclusionBuilder().mergeFrom(value); } else { exclusion_ = value; } - onChanged(); } else { exclusionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -928,14 +937,13 @@ public Builder mergeExclusion(com.google.logging.v2.LogExclusion value) { * */ public Builder clearExclusion() { - if (exclusionBuilder_ == null) { - exclusion_ = null; - onChanged(); - } else { - exclusion_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + exclusion_ = null; + if (exclusionBuilder_ != null) { + exclusionBuilder_.dispose(); exclusionBuilder_ = null; } - + onChanged(); return this; } /** @@ -951,7 +959,7 @@ public Builder clearExclusion() { * */ public com.google.logging.v2.LogExclusion.Builder getExclusionBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getExclusionFieldBuilder().getBuilder(); } @@ -1029,7 +1037,7 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1078,11 +1086,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1103,11 +1111,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1127,17 +1135,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1156,14 +1165,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1182,7 +1190,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java index c268877a8..9d9e562c1 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int METRIC_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object metricName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object metricName_ = ""; /** * * @@ -171,7 +173,7 @@ public com.google.logging.v2.LogMetric getMetric() { */ @java.lang.Override public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() { - return getMetric(); + return metric_ == null ? com.google.logging.v2.LogMetric.getDefaultInstance() : metric_; } private byte memoizedIsInitialized = -1; @@ -385,12 +387,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; metricName_ = ""; - - if (metricBuilder_ == null) { - metric_ = null; - } else { - metric_ = null; + metric_ = null; + if (metricBuilder_ != null) { + metricBuilder_.dispose(); metricBuilder_ = null; } return this; @@ -420,16 +421,23 @@ public com.google.logging.v2.UpdateLogMetricRequest build() { public com.google.logging.v2.UpdateLogMetricRequest buildPartial() { com.google.logging.v2.UpdateLogMetricRequest result = new com.google.logging.v2.UpdateLogMetricRequest(this); - result.metricName_ = metricName_; - if (metricBuilder_ == null) { - result.metric_ = metric_; - } else { - result.metric_ = metricBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateLogMetricRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.metricName_ = metricName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.metric_ = metricBuilder_ == null ? metric_ : metricBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -477,6 +485,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateLogMetricRequest other) { if (other == com.google.logging.v2.UpdateLogMetricRequest.getDefaultInstance()) return this; if (!other.getMetricName().isEmpty()) { metricName_ = other.metricName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasMetric()) { @@ -511,13 +520,13 @@ public Builder mergeFrom( case 10: { metricName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getMetricFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -537,6 +546,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object metricName_ = ""; /** * @@ -616,8 +627,8 @@ public Builder setMetricName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -639,8 +650,8 @@ public Builder setMetricName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearMetricName() { - metricName_ = getDefaultInstance().getMetricName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -667,8 +678,8 @@ public Builder setMetricNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - metricName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -692,7 +703,7 @@ public Builder setMetricNameBytes(com.google.protobuf.ByteString value) { * @return Whether the metric field is set. */ public boolean hasMetric() { - return metricBuilder_ != null || metric_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -729,11 +740,11 @@ public Builder setMetric(com.google.logging.v2.LogMetric value) { throw new NullPointerException(); } metric_ = value; - onChanged(); } else { metricBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -749,11 +760,11 @@ public Builder setMetric(com.google.logging.v2.LogMetric value) { public Builder setMetric(com.google.logging.v2.LogMetric.Builder builderForValue) { if (metricBuilder_ == null) { metric_ = builderForValue.build(); - onChanged(); } else { metricBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -768,17 +779,18 @@ public Builder setMetric(com.google.logging.v2.LogMetric.Builder builderForValue */ public Builder mergeMetric(com.google.logging.v2.LogMetric value) { if (metricBuilder_ == null) { - if (metric_ != null) { - metric_ = - com.google.logging.v2.LogMetric.newBuilder(metric_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && metric_ != null + && metric_ != com.google.logging.v2.LogMetric.getDefaultInstance()) { + getMetricBuilder().mergeFrom(value); } else { metric_ = value; } - onChanged(); } else { metricBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -792,14 +804,13 @@ public Builder mergeMetric(com.google.logging.v2.LogMetric value) { * */ public Builder clearMetric() { - if (metricBuilder_ == null) { - metric_ = null; - onChanged(); - } else { - metric_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + metric_ = null; + if (metricBuilder_ != null) { + metricBuilder_.dispose(); metricBuilder_ = null; } - + onChanged(); return this; } /** @@ -813,7 +824,7 @@ public Builder clearMetric() { * */ public com.google.logging.v2.LogMetric.Builder getMetricBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getMetricFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSettingsRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSettingsRequest.java index 29017c351..39fde22de 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSettingsRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSettingsRequest.java @@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -187,7 +189,7 @@ public com.google.logging.v2.Settings getSettings() { */ @java.lang.Override public com.google.logging.v2.SettingsOrBuilder getSettingsOrBuilder() { - return getSettings(); + return settings_ == null ? com.google.logging.v2.Settings.getDefaultInstance() : settings_; } public static final int UPDATE_MASK_FIELD_NUMBER = 3; @@ -248,7 +250,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -480,18 +482,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (settingsBuilder_ == null) { - settings_ = null; - } else { - settings_ = null; + settings_ = null; + if (settingsBuilder_ != null) { + settingsBuilder_.dispose(); settingsBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -521,21 +521,26 @@ public com.google.logging.v2.UpdateSettingsRequest build() { public com.google.logging.v2.UpdateSettingsRequest buildPartial() { com.google.logging.v2.UpdateSettingsRequest result = new com.google.logging.v2.UpdateSettingsRequest(this); - result.name_ = name_; - if (settingsBuilder_ == null) { - result.settings_ = settings_; - } else { - result.settings_ = settingsBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateSettingsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.settings_ = settingsBuilder_ == null ? settings_ : settingsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -583,6 +588,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateSettingsRequest other) { if (other == com.google.logging.v2.UpdateSettingsRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasSettings()) { @@ -620,19 +626,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getSettingsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -652,6 +658,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -731,8 +739,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -754,8 +762,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -782,8 +790,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -810,7 +818,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the settings field is set. */ public boolean hasSettings() { - return settingsBuilder_ != null || settings_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -853,11 +861,11 @@ public Builder setSettings(com.google.logging.v2.Settings value) { throw new NullPointerException(); } settings_ = value; - onChanged(); } else { settingsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -876,11 +884,11 @@ public Builder setSettings(com.google.logging.v2.Settings value) { public Builder setSettings(com.google.logging.v2.Settings.Builder builderForValue) { if (settingsBuilder_ == null) { settings_ = builderForValue.build(); - onChanged(); } else { settingsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -898,17 +906,18 @@ public Builder setSettings(com.google.logging.v2.Settings.Builder builderForValu */ public Builder mergeSettings(com.google.logging.v2.Settings value) { if (settingsBuilder_ == null) { - if (settings_ != null) { - settings_ = - com.google.logging.v2.Settings.newBuilder(settings_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && settings_ != null + && settings_ != com.google.logging.v2.Settings.getDefaultInstance()) { + getSettingsBuilder().mergeFrom(value); } else { settings_ = value; } - onChanged(); } else { settingsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -925,14 +934,13 @@ public Builder mergeSettings(com.google.logging.v2.Settings value) { * */ public Builder clearSettings() { - if (settingsBuilder_ == null) { - settings_ = null; - onChanged(); - } else { - settings_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + settings_ = null; + if (settingsBuilder_ != null) { + settingsBuilder_.dispose(); settingsBuilder_ = null; } - + onChanged(); return this; } /** @@ -949,7 +957,7 @@ public Builder clearSettings() { * */ public com.google.logging.v2.Settings.Builder getSettingsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getSettingsFieldBuilder().getBuilder(); } @@ -1026,7 +1034,7 @@ public com.google.logging.v2.SettingsOrBuilder getSettingsOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1073,11 +1081,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1097,11 +1105,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1120,17 +1128,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1148,14 +1157,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1173,7 +1181,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java index 73bdf50a9..7876a6db3 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SINK_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object sinkName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sinkName_ = ""; /** * * @@ -180,11 +182,11 @@ public com.google.logging.v2.LogSink getSink() { */ @java.lang.Override public com.google.logging.v2.LogSinkOrBuilder getSinkOrBuilder() { - return getSink(); + return sink_ == null ? com.google.logging.v2.LogSink.getDefaultInstance() : sink_; } public static final int UNIQUE_WRITER_IDENTITY_FIELD_NUMBER = 3; - private boolean uniqueWriterIdentity_; + private boolean uniqueWriterIdentity_ = false; /** * * @@ -286,7 +288,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -522,20 +524,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; sinkName_ = ""; - - if (sinkBuilder_ == null) { - sink_ = null; - } else { - sink_ = null; + sink_ = null; + if (sinkBuilder_ != null) { + sinkBuilder_.dispose(); sinkBuilder_ = null; } uniqueWriterIdentity_ = false; - - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -565,22 +564,29 @@ public com.google.logging.v2.UpdateSinkRequest build() { public com.google.logging.v2.UpdateSinkRequest buildPartial() { com.google.logging.v2.UpdateSinkRequest result = new com.google.logging.v2.UpdateSinkRequest(this); - result.sinkName_ = sinkName_; - if (sinkBuilder_ == null) { - result.sink_ = sink_; - } else { - result.sink_ = sinkBuilder_.build(); - } - result.uniqueWriterIdentity_ = uniqueWriterIdentity_; - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateSinkRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.sinkName_ = sinkName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sink_ = sinkBuilder_ == null ? sink_ : sinkBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.uniqueWriterIdentity_ = uniqueWriterIdentity_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -628,6 +634,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateSinkRequest other) { if (other == com.google.logging.v2.UpdateSinkRequest.getDefaultInstance()) return this; if (!other.getSinkName().isEmpty()) { sinkName_ = other.sinkName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasSink()) { @@ -668,25 +675,25 @@ public Builder mergeFrom( case 10: { sinkName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getSinkFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { uniqueWriterIdentity_ = input.readBool(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -706,6 +713,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object sinkName_ = ""; /** * @@ -794,8 +803,8 @@ public Builder setSinkName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -820,8 +829,8 @@ public Builder setSinkName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSinkName() { - sinkName_ = getDefaultInstance().getSinkName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -851,8 +860,8 @@ public Builder setSinkNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sinkName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -876,7 +885,7 @@ public Builder setSinkNameBytes(com.google.protobuf.ByteString value) { * @return Whether the sink field is set. */ public boolean hasSink() { - return sinkBuilder_ != null || sink_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -913,11 +922,11 @@ public Builder setSink(com.google.logging.v2.LogSink value) { throw new NullPointerException(); } sink_ = value; - onChanged(); } else { sinkBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -933,11 +942,11 @@ public Builder setSink(com.google.logging.v2.LogSink value) { public Builder setSink(com.google.logging.v2.LogSink.Builder builderForValue) { if (sinkBuilder_ == null) { sink_ = builderForValue.build(); - onChanged(); } else { sinkBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -952,16 +961,18 @@ public Builder setSink(com.google.logging.v2.LogSink.Builder builderForValue) { */ public Builder mergeSink(com.google.logging.v2.LogSink value) { if (sinkBuilder_ == null) { - if (sink_ != null) { - sink_ = com.google.logging.v2.LogSink.newBuilder(sink_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && sink_ != null + && sink_ != com.google.logging.v2.LogSink.getDefaultInstance()) { + getSinkBuilder().mergeFrom(value); } else { sink_ = value; } - onChanged(); } else { sinkBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -975,14 +986,13 @@ public Builder mergeSink(com.google.logging.v2.LogSink value) { * .google.logging.v2.LogSink sink = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearSink() { - if (sinkBuilder_ == null) { - sink_ = null; - onChanged(); - } else { - sink_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + sink_ = null; + if (sinkBuilder_ != null) { + sinkBuilder_.dispose(); sinkBuilder_ = null; } - + onChanged(); return this; } /** @@ -996,7 +1006,7 @@ public Builder clearSink() { * .google.logging.v2.LogSink sink = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.logging.v2.LogSink.Builder getSinkBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getSinkFieldBuilder().getBuilder(); } @@ -1093,6 +1103,7 @@ public boolean getUniqueWriterIdentity() { public Builder setUniqueWriterIdentity(boolean value) { uniqueWriterIdentity_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1117,7 +1128,7 @@ public Builder setUniqueWriterIdentity(boolean value) { * @return This builder for chaining. */ public Builder clearUniqueWriterIdentity() { - + bitField0_ = (bitField0_ & ~0x00000004); uniqueWriterIdentity_ = false; onChanged(); return this; @@ -1152,7 +1163,7 @@ public Builder clearUniqueWriterIdentity() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1211,11 +1222,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1241,11 +1252,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1270,17 +1281,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1304,14 +1316,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1335,7 +1346,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequest.java index 0958962a8..b68e1fc33 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -165,7 +167,7 @@ public com.google.logging.v2.LogView getView() { */ @java.lang.Override public com.google.logging.v2.LogViewOrBuilder getViewOrBuilder() { - return getView(); + return view_ == null ? com.google.logging.v2.LogView.getDefaultInstance() : view_; } public static final int UPDATE_MASK_FIELD_NUMBER = 4; @@ -229,7 +231,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -456,18 +458,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (viewBuilder_ == null) { - view_ = null; - } else { - view_ = null; + view_ = null; + if (viewBuilder_ != null) { + viewBuilder_.dispose(); viewBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -497,21 +497,26 @@ public com.google.logging.v2.UpdateViewRequest build() { public com.google.logging.v2.UpdateViewRequest buildPartial() { com.google.logging.v2.UpdateViewRequest result = new com.google.logging.v2.UpdateViewRequest(this); - result.name_ = name_; - if (viewBuilder_ == null) { - result.view_ = view_; - } else { - result.view_ = viewBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.UpdateViewRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.view_ = viewBuilder_ == null ? view_ : viewBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -559,6 +564,7 @@ public Builder mergeFrom(com.google.logging.v2.UpdateViewRequest other) { if (other == com.google.logging.v2.UpdateViewRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasView()) { @@ -596,19 +602,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getViewFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 34: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 34 default: @@ -628,6 +634,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -698,8 +706,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -718,8 +726,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -743,8 +751,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -767,7 +775,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the view field is set. */ public boolean hasView() { - return viewBuilder_ != null || view_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -802,11 +810,11 @@ public Builder setView(com.google.logging.v2.LogView value) { throw new NullPointerException(); } view_ = value; - onChanged(); } else { viewBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -821,11 +829,11 @@ public Builder setView(com.google.logging.v2.LogView value) { public Builder setView(com.google.logging.v2.LogView.Builder builderForValue) { if (viewBuilder_ == null) { view_ = builderForValue.build(); - onChanged(); } else { viewBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -839,16 +847,18 @@ public Builder setView(com.google.logging.v2.LogView.Builder builderForValue) { */ public Builder mergeView(com.google.logging.v2.LogView value) { if (viewBuilder_ == null) { - if (view_ != null) { - view_ = com.google.logging.v2.LogView.newBuilder(view_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && view_ != null + && view_ != com.google.logging.v2.LogView.getDefaultInstance()) { + getViewBuilder().mergeFrom(value); } else { view_ = value; } - onChanged(); } else { viewBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -861,14 +871,13 @@ public Builder mergeView(com.google.logging.v2.LogView value) { * .google.logging.v2.LogView view = 2 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearView() { - if (viewBuilder_ == null) { - view_ = null; - onChanged(); - } else { - view_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + view_ = null; + if (viewBuilder_ != null) { + viewBuilder_.dispose(); viewBuilder_ = null; } - + onChanged(); return this; } /** @@ -881,7 +890,7 @@ public Builder clearView() { * .google.logging.v2.LogView view = 2 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.logging.v2.LogView.Builder getViewBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getViewFieldBuilder().getBuilder(); } @@ -951,7 +960,7 @@ public com.google.logging.v2.LogViewOrBuilder getViewOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1000,11 +1009,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1025,11 +1034,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1049,17 +1058,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1078,14 +1088,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -1104,7 +1113,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java index 0fc4b465b..598d4ca69 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java @@ -91,6 +91,7 @@ private static final class LogEntryErrorsDefaultEntryHolder { com.google.rpc.Status.getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField logEntryErrors_; private com.google.protobuf.MapField @@ -160,8 +161,10 @@ public java.util.Map getLogEntryErrors * map<int32, .google.rpc.Status> log_entry_errors = 1; */ @java.lang.Override - public com.google.rpc.Status getLogEntryErrorsOrDefault( - int key, com.google.rpc.Status defaultValue) { + public /* nullable */ com.google.rpc.Status getLogEntryErrorsOrDefault( + int key, + /* nullable */ + com.google.rpc.Status defaultValue) { java.util.Map map = internalGetLogEntryErrors().getMap(); @@ -416,6 +419,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; internalGetMutableLogEntryErrors().clear(); return this; } @@ -444,13 +448,21 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors build() { public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() { com.google.logging.v2.WriteLogEntriesPartialErrors result = new com.google.logging.v2.WriteLogEntriesPartialErrors(this); - int from_bitField0_ = bitField0_; - result.logEntryErrors_ = internalGetLogEntryErrors(); - result.logEntryErrors_.makeImmutable(); + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.logging.v2.WriteLogEntriesPartialErrors result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logEntryErrors_ = internalGetLogEntryErrors(); + result.logEntryErrors_.makeImmutable(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -498,6 +510,7 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesPartialErrors othe if (other == com.google.logging.v2.WriteLogEntriesPartialErrors.getDefaultInstance()) return this; internalGetMutableLogEntryErrors().mergeFrom(other.internalGetLogEntryErrors()); + bitField0_ |= 0x00000001; this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -534,6 +547,7 @@ public Builder mergeFrom( internalGetMutableLogEntryErrors() .getMutableMap() .put(logEntryErrors__.getKey(), logEntryErrors__.getValue()); + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -568,8 +582,6 @@ public Builder mergeFrom( private com.google.protobuf.MapField internalGetMutableLogEntryErrors() { - onChanged(); - ; if (logEntryErrors_ == null) { logEntryErrors_ = com.google.protobuf.MapField.newMapField(LogEntryErrorsDefaultEntryHolder.defaultEntry); @@ -577,6 +589,8 @@ public Builder mergeFrom( if (!logEntryErrors_.isMutable()) { logEntryErrors_ = logEntryErrors_.copy(); } + bitField0_ |= 0x00000001; + onChanged(); return logEntryErrors_; } @@ -638,8 +652,10 @@ public java.util.Map getLogEntryErrors * map<int32, .google.rpc.Status> log_entry_errors = 1; */ @java.lang.Override - public com.google.rpc.Status getLogEntryErrorsOrDefault( - int key, com.google.rpc.Status defaultValue) { + public /* nullable */ com.google.rpc.Status getLogEntryErrorsOrDefault( + int key, + /* nullable */ + com.google.rpc.Status defaultValue) { java.util.Map map = internalGetLogEntryErrors().getMap(); @@ -670,6 +686,7 @@ public com.google.rpc.Status getLogEntryErrorsOrThrow(int key) { } public Builder clearLogEntryErrors() { + bitField0_ = (bitField0_ & ~0x00000001); internalGetMutableLogEntryErrors().getMutableMap().clear(); return this; } @@ -694,6 +711,7 @@ public Builder removeLogEntryErrors(int key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLogEntryErrors() { + bitField0_ |= 0x00000001; return internalGetMutableLogEntryErrors().getMutableMap(); } /** @@ -714,8 +732,8 @@ public Builder putLogEntryErrors(int key, com.google.rpc.Status value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableLogEntryErrors().getMutableMap().put(key, value); + bitField0_ |= 0x00000001; return this; } /** @@ -734,6 +752,7 @@ public Builder putLogEntryErrors(int key, com.google.rpc.Status value) { public Builder putAllLogEntryErrors( java.util.Map values) { internalGetMutableLogEntryErrors().getMutableMap().putAll(values); + bitField0_ |= 0x00000001; return this; } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrorsOrBuilder.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrorsOrBuilder.java index 983342815..5dc69287d 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrorsOrBuilder.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrorsOrBuilder.java @@ -81,7 +81,6 @@ public interface WriteLogEntriesPartialErrorsOrBuilder * * map<int32, .google.rpc.Status> log_entry_errors = 1; */ - /* nullable */ com.google.rpc.Status getLogEntryErrorsOrDefault( int key, diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java index 5511b24b9..abefaae25 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java @@ -80,7 +80,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { } public static final int LOG_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object logName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object logName_ = ""; /** * * @@ -217,7 +219,7 @@ public com.google.api.MonitoredResource getResource() { */ @java.lang.Override public com.google.api.MonitoredResourceOrBuilder getResourceOrBuilder() { - return getResource(); + return resource_ == null ? com.google.api.MonitoredResource.getDefaultInstance() : resource_; } public static final int LABELS_FIELD_NUMBER = 3; @@ -233,6 +235,7 @@ private static final class LabelsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField labels_; private com.google.protobuf.MapField internalGetLabels() { @@ -299,7 +302,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 3 [(.google.api.field_behavior) = OPTIONAL]; */ @java.lang.Override - public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -331,6 +337,8 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { } public static final int ENTRIES_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List entries_; /** * @@ -510,7 +518,7 @@ public com.google.logging.v2.LogEntryOrBuilder getEntriesOrBuilder(int index) { } public static final int PARTIAL_SUCCESS_FIELD_NUMBER = 5; - private boolean partialSuccess_; + private boolean partialSuccess_ = false; /** * * @@ -532,7 +540,7 @@ public boolean getPartialSuccess() { } public static final int DRY_RUN_FIELD_NUMBER = 6; - private boolean dryRun_; + private boolean dryRun_ = false; /** * * @@ -828,12 +836,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; logName_ = ""; - - if (resourceBuilder_ == null) { - resource_ = null; - } else { - resource_ = null; + resource_ = null; + if (resourceBuilder_ != null) { + resourceBuilder_.dispose(); resourceBuilder_ = null; } internalGetMutableLabels().clear(); @@ -843,11 +850,9 @@ public Builder clear() { entries_ = null; entriesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); partialSuccess_ = false; - dryRun_ = false; - return this; } @@ -875,28 +880,44 @@ public com.google.logging.v2.WriteLogEntriesRequest build() { public com.google.logging.v2.WriteLogEntriesRequest buildPartial() { com.google.logging.v2.WriteLogEntriesRequest result = new com.google.logging.v2.WriteLogEntriesRequest(this); - int from_bitField0_ = bitField0_; - result.logName_ = logName_; - if (resourceBuilder_ == null) { - result.resource_ = resource_; - } else { - result.resource_ = resourceBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.labels_ = internalGetLabels(); - result.labels_.makeImmutable(); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.logging.v2.WriteLogEntriesRequest result) { if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); } result.entries_ = entries_; } else { result.entries_ = entriesBuilder_.build(); } - result.partialSuccess_ = partialSuccess_; - result.dryRun_ = dryRun_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.logging.v2.WriteLogEntriesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.logName_ = logName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.resource_ = resourceBuilder_ == null ? resource_ : resourceBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.labels_ = internalGetLabels(); + result.labels_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.partialSuccess_ = partialSuccess_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.dryRun_ = dryRun_; + } } @java.lang.Override @@ -946,17 +967,19 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesRequest other) { if (other == com.google.logging.v2.WriteLogEntriesRequest.getDefaultInstance()) return this; if (!other.getLogName().isEmpty()) { logName_ = other.logName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasResource()) { mergeResource(other.getResource()); } internalGetMutableLabels().mergeFrom(other.internalGetLabels()); + bitField0_ |= 0x00000004; if (entriesBuilder_ == null) { if (!other.entries_.isEmpty()) { if (entries_.isEmpty()) { entries_ = other.entries_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureEntriesIsMutable(); entries_.addAll(other.entries_); @@ -969,7 +992,7 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesRequest other) { entriesBuilder_.dispose(); entriesBuilder_ = null; entries_ = other.entries_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); entriesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getEntriesFieldBuilder() @@ -1014,13 +1037,13 @@ public Builder mergeFrom( case 10: { logName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getResourceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -1032,6 +1055,7 @@ public Builder mergeFrom( internalGetMutableLabels() .getMutableMap() .put(labels__.getKey(), labels__.getValue()); + bitField0_ |= 0x00000004; break; } // case 26 case 34: @@ -1049,13 +1073,13 @@ public Builder mergeFrom( case 40: { partialSuccess_ = input.readBool(); - + bitField0_ |= 0x00000010; break; } // case 40 case 48: { dryRun_ = input.readBool(); - + bitField0_ |= 0x00000020; break; } // case 48 default: @@ -1180,8 +1204,8 @@ public Builder setLogName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1211,8 +1235,8 @@ public Builder setLogName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLogName() { - logName_ = getDefaultInstance().getLogName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1247,8 +1271,8 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - logName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1277,7 +1301,7 @@ public Builder setLogNameBytes(com.google.protobuf.ByteString value) { * @return Whether the resource field is set. */ public boolean hasResource() { - return resourceBuilder_ != null || resource_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1326,11 +1350,11 @@ public Builder setResource(com.google.api.MonitoredResource value) { throw new NullPointerException(); } resource_ = value; - onChanged(); } else { resourceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1351,11 +1375,11 @@ public Builder setResource(com.google.api.MonitoredResource value) { public Builder setResource(com.google.api.MonitoredResource.Builder builderForValue) { if (resourceBuilder_ == null) { resource_ = builderForValue.build(); - onChanged(); } else { resourceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1375,19 +1399,18 @@ public Builder setResource(com.google.api.MonitoredResource.Builder builderForVa */ public Builder mergeResource(com.google.api.MonitoredResource value) { if (resourceBuilder_ == null) { - if (resource_ != null) { - resource_ = - com.google.api.MonitoredResource.newBuilder(resource_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && resource_ != null + && resource_ != com.google.api.MonitoredResource.getDefaultInstance()) { + getResourceBuilder().mergeFrom(value); } else { resource_ = value; } - onChanged(); } else { resourceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1406,14 +1429,13 @@ public Builder mergeResource(com.google.api.MonitoredResource value) { * */ public Builder clearResource() { - if (resourceBuilder_ == null) { - resource_ = null; - onChanged(); - } else { - resource_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + resource_ = null; + if (resourceBuilder_ != null) { + resourceBuilder_.dispose(); resourceBuilder_ = null; } - + onChanged(); return this; } /** @@ -1432,7 +1454,7 @@ public Builder clearResource() { * */ public com.google.api.MonitoredResource.Builder getResourceBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getResourceFieldBuilder().getBuilder(); } @@ -1503,14 +1525,14 @@ private com.google.protobuf.MapField interna private com.google.protobuf.MapField internalGetMutableLabels() { - onChanged(); - ; if (labels_ == null) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); } if (!labels_.isMutable()) { labels_ = labels_.copy(); } + bitField0_ |= 0x00000004; + onChanged(); return labels_; } @@ -1571,8 +1593,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 3 [(.google.api.field_behavior) = OPTIONAL]; */ @java.lang.Override - public java.lang.String getLabelsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1604,6 +1628,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { } public Builder clearLabels() { + bitField0_ = (bitField0_ & ~0x00000004); internalGetMutableLabels().getMutableMap().clear(); return this; } @@ -1629,6 +1654,7 @@ public Builder removeLabels(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { + bitField0_ |= 0x00000004; return internalGetMutableLabels().getMutableMap(); } /** @@ -1650,8 +1676,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableLabels().getMutableMap().put(key, value); + bitField0_ |= 0x00000004; return this; } /** @@ -1668,6 +1694,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { */ public Builder putAllLabels(java.util.Map values) { internalGetMutableLabels().getMutableMap().putAll(values); + bitField0_ |= 0x00000004; return this; } @@ -1675,9 +1702,9 @@ public Builder putAllLabels(java.util.Map va java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { entries_ = new java.util.ArrayList(entries_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; } } @@ -2132,7 +2159,7 @@ public Builder addAllEntries( public Builder clearEntries() { if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { entriesBuilder_.clear(); @@ -2407,7 +2434,7 @@ public java.util.List getEntriesBuilderL com.google.logging.v2.LogEntry, com.google.logging.v2.LogEntry.Builder, com.google.logging.v2.LogEntryOrBuilder>( - entries_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + entries_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; @@ -2452,6 +2479,7 @@ public boolean getPartialSuccess() { public Builder setPartialSuccess(boolean value) { partialSuccess_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2471,7 +2499,7 @@ public Builder setPartialSuccess(boolean value) { * @return This builder for chaining. */ public Builder clearPartialSuccess() { - + bitField0_ = (bitField0_ & ~0x00000010); partialSuccess_ = false; onChanged(); return this; @@ -2512,6 +2540,7 @@ public boolean getDryRun() { public Builder setDryRun(boolean value) { dryRun_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2529,7 +2558,7 @@ public Builder setDryRun(boolean value) { * @return This builder for chaining. */ public Builder clearDryRun() { - + bitField0_ = (bitField0_ & ~0x00000020); dryRun_ = false; onChanged(); return this; diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java index 055f8462a..1e9bad481 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java @@ -183,7 +183,6 @@ public interface WriteLogEntriesRequestOrBuilder * * map<string, string> labels = 3 [(.google.api.field_behavior) = OPTIONAL]; */ - /* nullable */ java.lang.String getLabelsOrDefault( java.lang.String key, diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 58785e7ed..8d8e24092 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.14.1 + 3.14.2 diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index fc081289b..480e6bc9d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.4.0 + 26.6.0 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2e934765c..37306bb4a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.14.2 + 3.14.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9dbc96daf..336017309 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.4.0 + 26.6.0 pom import diff --git a/versions.txt b/versions.txt index 999e6e76e..f002736c8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.14.2:3.14.2 -grpc-google-cloud-logging-v2:0.103.2:0.103.2 -proto-google-cloud-logging-v2:0.103.2:0.103.2 +google-cloud-logging:3.14.3:3.14.3 +grpc-google-cloud-logging-v2:0.103.3:0.103.3 +proto-google-cloud-logging-v2:0.103.3:0.103.3 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies: