From 9e54e785a446f61f537c96cddbc0b0155b443d86 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Thu, 22 Aug 2019 14:50:49 -0400 Subject: [PATCH] Regenerate conformance-tests with protoc 3.9.1 * Update generate-conformance-tests.sh to append all message to generate.log --- .../generate-conformance-tests.sh | 19 +- .../bigtable/v2/TestDefinition.java | 90 +++--- .../firestore/v1/TestDefinition.java | 289 +++++++++++------- .../conformance/storage/v1/SigningV4Test.java | 13 +- .../conformance/storage/v1/TestFile.java | 6 + .../cloud/conformance/storage/v1/Tests.java | 20 +- 6 files changed, 265 insertions(+), 172 deletions(-) diff --git a/google-cloud-testing/google-cloud-conformance-tests/generate-conformance-tests.sh b/google-cloud-testing/google-cloud-conformance-tests/generate-conformance-tests.sh index 844cb6ba8640..b74d9bcc07dc 100755 --- a/google-cloud-testing/google-cloud-conformance-tests/generate-conformance-tests.sh +++ b/google-cloud-testing/google-cloud-conformance-tests/generate-conformance-tests.sh @@ -15,9 +15,13 @@ set -o errexit -o errtrace -o nounset -o pipefail +MODULE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +LOG_FILE_NAME="generate.log" +LOG_FILE=${MODULE_DIR}/${LOG_FILE_NAME} + function errNotify() { echo "Error while generating conformance tests" >&2; - echo "See generate.log for details" >&2; + echo "See ${LOG_FILE_NAME} for details" >&2; return 1 } trap errNotify ERR @@ -28,7 +32,7 @@ function cpDir() { } function main() { - rm generate.log 2> /dev/null || true + rm ${LOG_FILE} 2> /dev/null || true local javaBasePackage="com/google/cloud/conformance" local firestorePackage="${javaBasePackage}/firestore/v1" @@ -58,17 +62,16 @@ function main() { cpDir "src/main/resources/${bigtablePackage}/" conformance-tests/bigtable/v2/*.json msg "Generating protos" - mvn -Pgen-conformance-protos clean verify > generate.log 2>&1 + mvn -Pgen-conformance-protos clean verify >> ${LOG_FILE} 2>&1 msg "Adding copyright header to generated sources" ## java classes generated from protoc do not include the copyright header ## prepend it to the generated files - local moduleDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" pushd target/generated-sources/protobuf/java/ > /dev/null 2>&1 for f in $(find ./ -type f -name '*.java' | sort); do msg "Processing $f" mv ${f} ${f}.tmp - cat ${moduleDir}/copyright-header.txt > ${f} + cat ${MODULE_DIR}/copyright-header.txt > ${f} cat ${f}.tmp >> ${f} rm ${f}.tmp done @@ -78,16 +81,16 @@ function main() { cpDir src/main/java/ target/generated-sources/protobuf/java/* ## cleanup any generated files that may have not been moved over - mvn clean > /dev/null 2>&1 + mvn clean >> ${LOG_FILE} 2>&1 msg "Building module..." ## ensure building of the module still works - mvn clean package + mvn clean package | tee -a ${LOG_FILE} msg "Complete" } function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} -function msg { println "$*" >&2 ;} +function msg { println "$*" | tee -a ${LOG_FILE} >&2 ;} function println { printf '%s\n' "$(now) $*" ;} main diff --git a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/bigtable/v2/TestDefinition.java b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/bigtable/v2/TestDefinition.java index 9676e07ac19f..0782d8211395 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/bigtable/v2/TestDefinition.java +++ b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/bigtable/v2/TestDefinition.java @@ -73,6 +73,12 @@ private TestFile() { readRowsTests_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new TestFile(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -965,6 +971,12 @@ private ReadRowsTest() { results_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new ReadRowsTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -998,10 +1010,10 @@ private ReadRowsTest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { chunks_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } chunks_.add( input.readMessage( @@ -1011,12 +1023,12 @@ private ReadRowsTest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest .Result>(); - mutable_bitField0_ |= 0x00000004; + mutable_bitField0_ |= 0x00000002; } results_.add( input.readMessage( @@ -1039,10 +1051,10 @@ private ReadRowsTest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { chunks_ = java.util.Collections.unmodifiableList(chunks_); } - if (((mutable_bitField0_ & 0x00000004) != 0)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); } this.unknownFields = unknownFields.build(); @@ -1129,6 +1141,12 @@ private Result() { label_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Result(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -1142,7 +1160,6 @@ private Result( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -2192,7 +2209,6 @@ public com.google.protobuf.Parser getParserForType() { } } - private int bitField0_; public static final int DESCRIPTION_FIELD_NUMBER = 1; private volatile java.lang.Object description_; /** string description = 1; */ @@ -2518,13 +2534,13 @@ public Builder clear() { if (chunksBuilder_ == null) { chunks_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { chunksBuilder_.clear(); } if (resultsBuilder_ == null) { results_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } else { resultsBuilder_.clear(); } @@ -2559,27 +2575,25 @@ public com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest buil com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest result = new com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; result.description_ = description_; if (chunksBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { chunks_ = java.util.Collections.unmodifiableList(chunks_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.chunks_ = chunks_; } else { result.chunks_ = chunksBuilder_.build(); } if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } result.results_ = results_; } else { result.results_ = resultsBuilder_.build(); } - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -2643,7 +2657,7 @@ public Builder mergeFrom( if (!other.chunks_.isEmpty()) { if (chunks_.isEmpty()) { chunks_ = other.chunks_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureChunksIsMutable(); chunks_.addAll(other.chunks_); @@ -2656,7 +2670,7 @@ public Builder mergeFrom( chunksBuilder_.dispose(); chunksBuilder_ = null; chunks_ = other.chunks_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); chunksBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getChunksFieldBuilder() @@ -2670,7 +2684,7 @@ public Builder mergeFrom( if (!other.results_.isEmpty()) { if (results_.isEmpty()) { results_ = other.results_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureResultsIsMutable(); results_.addAll(other.results_); @@ -2683,7 +2697,7 @@ public Builder mergeFrom( resultsBuilder_.dispose(); resultsBuilder_ = null; results_ = other.results_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); resultsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getResultsFieldBuilder() @@ -2784,10 +2798,10 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureChunksIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { chunks_ = new java.util.ArrayList(chunks_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -2915,7 +2929,7 @@ public Builder addAllChunks( public Builder clearChunks() { if (chunksBuilder_ == null) { chunks_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { chunksBuilder_.clear(); @@ -2983,7 +2997,7 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk.Builder addChunksBuilde com.google.bigtable.v2.ReadRowsResponse.CellChunk, com.google.bigtable.v2.ReadRowsResponse.CellChunk.Builder, com.google.bigtable.v2.ReadRowsResponse.CellChunkOrBuilder>( - chunks_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + chunks_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); chunks_ = null; } return chunksBuilder_; @@ -2994,12 +3008,12 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk.Builder addChunksBuilde results_ = java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000004) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { results_ = new java.util.ArrayList< com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest.Result>( results_); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } @@ -3176,7 +3190,7 @@ public Builder addAllResults( public Builder clearResults() { if (resultsBuilder_ == null) { results_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { resultsBuilder_.clear(); @@ -3278,7 +3292,7 @@ public Builder removeResults(int index) { .Builder, com.google.cloud.conformance.bigtable.v2.TestDefinition.ReadRowsTest .ResultOrBuilder>( - results_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); + results_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -3378,20 +3392,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "loud.Bigtable.V2.Tests.Conformanceb\006prot" + "o3" }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.bigtable.v2.BigtableProto.getDescriptor(), - }, - assigner); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.bigtable.v2.BigtableProto.getDescriptor(), + }); internal_static_google_cloud_conformance_bigtable_v2_TestFile_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_google_cloud_conformance_bigtable_v2_TestFile_fieldAccessorTable = diff --git a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/firestore/v1/TestDefinition.java b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/firestore/v1/TestDefinition.java index b7a5dd79e641..5cb099a8d104 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/firestore/v1/TestDefinition.java +++ b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/firestore/v1/TestDefinition.java @@ -68,6 +68,12 @@ private TestFile() { tests_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new TestFile(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -955,6 +961,12 @@ private Test() { comment_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Test(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -968,7 +980,6 @@ private Test( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -3589,6 +3600,12 @@ private GetTest() { docRefPath_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new GetTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -3602,7 +3619,6 @@ private GetTest( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -4562,6 +4578,12 @@ private CreateTest() { jsonData_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new CreateTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -4575,7 +4597,6 @@ private CreateTest( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -5818,6 +5839,12 @@ private SetTest() { jsonData_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new SetTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -5831,7 +5858,6 @@ private SetTest( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -7334,6 +7360,12 @@ private UpdateTest() { jsonData_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new UpdateTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -7347,7 +7379,6 @@ private UpdateTest( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -8915,6 +8946,12 @@ private UpdatePathsTest() { jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new UpdatePathsTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -8964,11 +9001,11 @@ private UpdatePathsTest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath>(); - mutable_bitField0_ |= 0x00000004; + mutable_bitField0_ |= 0x00000001; } fieldPaths_.add( input.readMessage( @@ -8979,9 +9016,9 @@ private UpdatePathsTest( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) != 0)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { jsonValues_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000008; + mutable_bitField0_ |= 0x00000002; } jsonValues_.add(s); break; @@ -9021,10 +9058,10 @@ private UpdatePathsTest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fieldPaths_ = java.util.Collections.unmodifiableList(fieldPaths_); } - if (((mutable_bitField0_ & 0x00000008) != 0)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { jsonValues_ = jsonValues_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -9048,7 +9085,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { .class); } - private int bitField0_; public static final int DOC_REF_PATH_FIELD_NUMBER = 1; private volatile java.lang.Object docRefPath_; /** @@ -9602,12 +9638,12 @@ public Builder clear() { } if (fieldPathsBuilder_ == null) { fieldPaths_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); } else { fieldPathsBuilder_.clear(); } jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); if (requestBuilder_ == null) { request_ = null; } else { @@ -9648,7 +9684,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.UpdatePathsTest com.google.cloud.conformance.firestore.v1.TestDefinition.UpdatePathsTest result = new com.google.cloud.conformance.firestore.v1.TestDefinition.UpdatePathsTest(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; result.docRefPath_ = docRefPath_; if (preconditionBuilder_ == null) { result.precondition_ = precondition_; @@ -9656,17 +9691,17 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.UpdatePathsTest result.precondition_ = preconditionBuilder_.build(); } if (fieldPathsBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = java.util.Collections.unmodifiableList(fieldPaths_); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); } result.fieldPaths_ = fieldPaths_; } else { result.fieldPaths_ = fieldPathsBuilder_.build(); } - if (((bitField0_ & 0x00000008) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { jsonValues_ = jsonValues_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); } result.jsonValues_ = jsonValues_; if (requestBuilder_ == null) { @@ -9675,7 +9710,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.UpdatePathsTest result.request_ = requestBuilder_.build(); } result.isError_ = isError_; - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -9743,7 +9777,7 @@ public Builder mergeFrom( if (!other.fieldPaths_.isEmpty()) { if (fieldPaths_.isEmpty()) { fieldPaths_ = other.fieldPaths_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureFieldPathsIsMutable(); fieldPaths_.addAll(other.fieldPaths_); @@ -9756,7 +9790,7 @@ public Builder mergeFrom( fieldPathsBuilder_.dispose(); fieldPathsBuilder_ = null; fieldPaths_ = other.fieldPaths_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); fieldPathsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFieldPathsFieldBuilder() @@ -9769,7 +9803,7 @@ public Builder mergeFrom( if (!other.jsonValues_.isEmpty()) { if (jsonValues_.isEmpty()) { jsonValues_ = other.jsonValues_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureJsonValuesIsMutable(); jsonValues_.addAll(other.jsonValues_); @@ -10095,11 +10129,11 @@ public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() fieldPaths_ = java.util.Collections.emptyList(); private void ensureFieldPathsIsMutable() { - if (!((bitField0_ & 0x00000004) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath>(fieldPaths_); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } @@ -10327,7 +10361,7 @@ public Builder addAllFieldPaths( public Builder clearFieldPaths() { if (fieldPathsBuilder_ == null) { fieldPaths_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { fieldPathsBuilder_.clear(); @@ -10460,7 +10494,7 @@ public Builder removeFieldPaths(int index) { com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath, com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath.Builder, com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPathOrBuilder>( - fieldPaths_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); + fieldPaths_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fieldPaths_ = null; } return fieldPathsBuilder_; @@ -10470,9 +10504,9 @@ public Builder removeFieldPaths(int index) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureJsonValuesIsMutable() { - if (!((bitField0_ & 0x00000008) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { jsonValues_ = new com.google.protobuf.LazyStringArrayList(jsonValues_); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } /** @@ -10585,7 +10619,7 @@ public Builder addAllJsonValues(java.lang.Iterable values) { */ public Builder clearJsonValues() { jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -10988,6 +11022,12 @@ private DeleteTest() { docRefPath_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new DeleteTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -11001,7 +11041,6 @@ private DeleteTest( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -12185,6 +12224,12 @@ private SetOption() { fields_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new SetOption(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -12216,11 +12261,11 @@ private SetOption( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath>(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } fields_.add( input.readMessage( @@ -12242,7 +12287,7 @@ private SetOption( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -12265,7 +12310,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.conformance.firestore.v1.TestDefinition.SetOption.Builder.class); } - private int bitField0_; public static final int ALL_FIELD_NUMBER = 1; private boolean all_; /** @@ -12575,7 +12619,7 @@ public Builder clear() { if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { fieldsBuilder_.clear(); } @@ -12609,18 +12653,16 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.SetOption buildP com.google.cloud.conformance.firestore.v1.TestDefinition.SetOption result = new com.google.cloud.conformance.firestore.v1.TestDefinition.SetOption(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; result.all_ = all_; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.fields_ = fields_; } else { result.fields_ = fieldsBuilder_.build(); } - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -12683,7 +12725,7 @@ public Builder mergeFrom( if (!other.fields_.isEmpty()) { if (fields_.isEmpty()) { fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureFieldsIsMutable(); fields_.addAll(other.fields_); @@ -12696,7 +12738,7 @@ public Builder mergeFrom( fieldsBuilder_.dispose(); fieldsBuilder_ = null; fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); fieldsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFieldsFieldBuilder() @@ -12787,11 +12829,11 @@ public Builder clearAll() { fields_ = java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath>(fields_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -13019,7 +13061,7 @@ public Builder addAllFields( public Builder clearFields() { if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { fieldsBuilder_.clear(); @@ -13152,7 +13194,7 @@ public Builder removeFields(int index) { com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath, com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPath.Builder, com.google.cloud.conformance.firestore.v1.TestDefinition.FieldPathOrBuilder>( - fields_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -13280,6 +13322,12 @@ private QueryTest() { clauses_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new QueryTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -13313,11 +13361,11 @@ private QueryTest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { clauses_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.Clause>(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } clauses_.add( input.readMessage( @@ -13360,7 +13408,7 @@ private QueryTest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { clauses_ = java.util.Collections.unmodifiableList(clauses_); } this.unknownFields = unknownFields.build(); @@ -13383,7 +13431,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.conformance.firestore.v1.TestDefinition.QueryTest.Builder.class); } - private int bitField0_; public static final int COLL_PATH_FIELD_NUMBER = 1; private volatile java.lang.Object collPath_; /** @@ -13718,7 +13765,7 @@ public Builder clear() { if (clausesBuilder_ == null) { clauses_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { clausesBuilder_.clear(); } @@ -13760,12 +13807,11 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.QueryTest buildP com.google.cloud.conformance.firestore.v1.TestDefinition.QueryTest result = new com.google.cloud.conformance.firestore.v1.TestDefinition.QueryTest(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; result.collPath_ = collPath_; if (clausesBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { clauses_ = java.util.Collections.unmodifiableList(clauses_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.clauses_ = clauses_; } else { @@ -13777,7 +13823,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.QueryTest buildP result.query_ = queryBuilder_.build(); } result.isError_ = isError_; - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -13841,7 +13886,7 @@ public Builder mergeFrom( if (!other.clauses_.isEmpty()) { if (clauses_.isEmpty()) { clauses_ = other.clauses_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureClausesIsMutable(); clauses_.addAll(other.clauses_); @@ -13854,7 +13899,7 @@ public Builder mergeFrom( clausesBuilder_.dispose(); clausesBuilder_ = null; clauses_ = other.clauses_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); clausesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getClausesFieldBuilder() @@ -14001,11 +14046,11 @@ public Builder setCollPathBytes(com.google.protobuf.ByteString value) { clauses_ = java.util.Collections.emptyList(); private void ensureClausesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { clauses_ = new java.util.ArrayList< com.google.cloud.conformance.firestore.v1.TestDefinition.Clause>(clauses_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -14141,7 +14186,7 @@ public Builder addAllClauses( public Builder clearClauses() { if (clausesBuilder_ == null) { clauses_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { clausesBuilder_.clear(); @@ -14217,7 +14262,7 @@ public Builder removeClauses(int index) { com.google.cloud.conformance.firestore.v1.TestDefinition.Clause, com.google.cloud.conformance.firestore.v1.TestDefinition.Clause.Builder, com.google.cloud.conformance.firestore.v1.TestDefinition.ClauseOrBuilder>( - clauses_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); + clauses_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); clauses_ = null; } return clausesBuilder_; @@ -14485,6 +14530,12 @@ private Clause(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Clause() {} + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Clause(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -14498,7 +14549,6 @@ private Clause( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -16632,6 +16682,12 @@ private Select() { fields_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Select(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -17422,6 +17478,12 @@ private Where() { jsonValue_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Where(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -17435,7 +17497,6 @@ private Where( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -18275,6 +18336,12 @@ private OrderBy() { direction_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new OrderBy(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -18288,7 +18355,6 @@ private OrderBy( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -19097,6 +19163,12 @@ private Cursor() { jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Cursor(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -19143,9 +19215,9 @@ private Cursor( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { jsonValues_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } jsonValues_.add(s); break; @@ -19164,7 +19236,7 @@ private Cursor( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { jsonValues_ = jsonValues_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -19187,7 +19259,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.conformance.firestore.v1.TestDefinition.Cursor.Builder.class); } - private int bitField0_; public static final int DOC_SNAPSHOT_FIELD_NUMBER = 1; private com.google.cloud.conformance.firestore.v1.TestDefinition.DocSnapshot docSnapshot_; /** @@ -19479,7 +19550,7 @@ public Builder clear() { docSnapshotBuilder_ = null; } jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -19509,18 +19580,16 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.Cursor buildPart com.google.cloud.conformance.firestore.v1.TestDefinition.Cursor result = new com.google.cloud.conformance.firestore.v1.TestDefinition.Cursor(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; if (docSnapshotBuilder_ == null) { result.docSnapshot_ = docSnapshot_; } else { result.docSnapshot_ = docSnapshotBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { jsonValues_ = jsonValues_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.jsonValues_ = jsonValues_; - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -19581,7 +19650,7 @@ public Builder mergeFrom( if (!other.jsonValues_.isEmpty()) { if (jsonValues_.isEmpty()) { jsonValues_ = other.jsonValues_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureJsonValuesIsMutable(); jsonValues_.addAll(other.jsonValues_); @@ -19815,9 +19884,9 @@ public Builder clearDocSnapshot() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureJsonValuesIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { jsonValues_ = new com.google.protobuf.LazyStringArrayList(jsonValues_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } /** repeated string json_values = 2; */ @@ -19866,7 +19935,7 @@ public Builder addAllJsonValues(java.lang.Iterable values) { /** repeated string json_values = 2; */ public Builder clearJsonValues() { jsonValues_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -19968,6 +20037,12 @@ private DocSnapshot() { jsonData_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new DocSnapshot(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -19981,7 +20056,6 @@ private DocSnapshot( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -20626,6 +20700,12 @@ private FieldPath() { field_ = com.google.protobuf.LazyStringArrayList.EMPTY; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new FieldPath(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -21252,6 +21332,12 @@ private ListenTest() { snapshots_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new ListenTest(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -21346,7 +21432,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.conformance.firestore.v1.TestDefinition.ListenTest.Builder.class); } - private int bitField0_; public static final int RESPONSES_FIELD_NUMBER = 1; private java.util.List responses_; /** repeated .google.firestore.v1.ListenResponse responses = 1; */ @@ -21693,7 +21778,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.ListenTest build com.google.cloud.conformance.firestore.v1.TestDefinition.ListenTest result = new com.google.cloud.conformance.firestore.v1.TestDefinition.ListenTest(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; if (responsesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { responses_ = java.util.Collections.unmodifiableList(responses_); @@ -21713,7 +21797,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.ListenTest build result.snapshots_ = snapshotsBuilder_.build(); } result.isError_ = isError_; - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -22424,6 +22507,12 @@ private Snapshot() { changes_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Snapshot(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -22528,7 +22617,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.conformance.firestore.v1.TestDefinition.Snapshot.Builder.class); } - private int bitField0_; public static final int DOCS_FIELD_NUMBER = 1; private java.util.List docs_; /** repeated .google.firestore.v1.Document docs = 1; */ @@ -22876,7 +22964,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.Snapshot buildPa com.google.cloud.conformance.firestore.v1.TestDefinition.Snapshot result = new com.google.cloud.conformance.firestore.v1.TestDefinition.Snapshot(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; if (docsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { docs_ = java.util.Collections.unmodifiableList(docs_); @@ -22900,7 +22987,6 @@ public com.google.cloud.conformance.firestore.v1.TestDefinition.Snapshot buildPa } else { result.readTime_ = readTimeBuilder_.build(); } - result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -23675,6 +23761,12 @@ private DocChange() { kind_ = 0; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new DocChange(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -23688,7 +23780,6 @@ private DocChange( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -24718,24 +24809,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "store.Tests.Proto\312\002(Google\\Cloud\\Firesto" + "re\\Tests\\Conformanceb\006proto3" }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.firestore.v1.CommonProto.getDescriptor(), - com.google.firestore.v1.DocumentProto.getDescriptor(), - com.google.firestore.v1.FirestoreProto.getDescriptor(), - com.google.firestore.v1.QueryProto.getDescriptor(), - com.google.protobuf.TimestampProto.getDescriptor(), - }, - assigner); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.firestore.v1.CommonProto.getDescriptor(), + com.google.firestore.v1.DocumentProto.getDescriptor(), + com.google.firestore.v1.FirestoreProto.getDescriptor(), + com.google.firestore.v1.QueryProto.getDescriptor(), + com.google.protobuf.TimestampProto.getDescriptor(), + }); internal_static_google_cloud_conformance_firestore_v1_TestFile_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_google_cloud_conformance_firestore_v1_TestFile_fieldAccessorTable = diff --git a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/SigningV4Test.java b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/SigningV4Test.java index ae98a1f53829..e5b69b502a04 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/SigningV4Test.java +++ b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/SigningV4Test.java @@ -38,6 +38,12 @@ private SigningV4Test() { expectedUrl_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new SigningV4Test(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; @@ -126,11 +132,11 @@ private SigningV4Test( } case 74: { - if (!((mutable_bitField0_ & 0x00000100) != 0)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { headers_ = com.google.protobuf.MapField.newMapField( HeadersDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000100; + mutable_bitField0_ |= 0x00000001; } com.google.protobuf.MapEntry headers__ = input.readMessage( @@ -183,7 +189,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { com.google.cloud.conformance.storage.v1.SigningV4Test.Builder.class); } - private int bitField0_; public static final int FILENAME_FIELD_NUMBER = 1; private volatile java.lang.Object fileName_; /** string fileName = 1; */ @@ -780,7 +785,6 @@ public com.google.cloud.conformance.storage.v1.SigningV4Test buildPartial() { com.google.cloud.conformance.storage.v1.SigningV4Test result = new com.google.cloud.conformance.storage.v1.SigningV4Test(this); int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; result.fileName_ = fileName_; result.description_ = description_; result.bucket_ = bucket_; @@ -795,7 +799,6 @@ public com.google.cloud.conformance.storage.v1.SigningV4Test buildPartial() { result.expectedUrl_ = expectedUrl_; result.headers_ = internalGetHeaders(); result.headers_.makeImmutable(); - result.bitField0_ = to_bitField0_; onBuilt(); return result; } diff --git a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/TestFile.java b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/TestFile.java index 3fe7a6a0d015..3a088c88765d 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/TestFile.java +++ b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/TestFile.java @@ -33,6 +33,12 @@ private TestFile() { signingV4Tests_ = java.util.Collections.emptyList(); } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new TestFile(); + } + @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; diff --git a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/Tests.java b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/Tests.java index 350f04797a7d..0e9ff2f8d530 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/Tests.java +++ b/google-cloud-testing/google-cloud-conformance-tests/src/main/java/com/google/cloud/conformance/storage/v1/Tests.java @@ -65,20 +65,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ance.storage.v1P\001\252\002)Google.Cloud.Storage" + ".V1.Tests.Conformanceb\006proto3" }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.protobuf.TimestampProto.getDescriptor(), - }, - assigner); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + com.google.protobuf.TimestampProto.getDescriptor(), + }); internal_static_google_cloud_conformance_storage_v1_TestFile_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_google_cloud_conformance_storage_v1_TestFile_fieldAccessorTable =