Skip to content

Commit

Permalink
deps: regenerating with new Protobuf (6.4.4-sp) (#2135)
Browse files Browse the repository at this point in the history 
* fix: applying a different code generation

* deps: Protobuf and GAX bom

* ci: skip enforcer in compile

* change instance to spanner-testing-east1

Co-authored-by: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
  • Loading branch information
@suztomo @rajatbhatta
suztomo and rajatbhatta committed Nov 2, 2022
1 parent 5c9933b commit ebeac9a
Show file tree
Hide file tree
Showing 87 changed files with 5,756 additions and 9,019 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ jobs:
with:
java-version: ${{matrix.java}}
- run: java -version
- run: mvn package
- run: mvn package -Denforcer.skip=true
env:
JOB_TYPE: test
2 changes: 1 addition & 1 deletion google-cloud-spanner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<configuration>
<systemPropertyVariables>
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-west1</spanner.testenv.instance>
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
<spanner.testenv.kms_key.name>projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key</spanner.testenv.kms_key.name>
</systemPropertyVariables>
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.36.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>3.16.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
Expand Down
254 changes: 94 additions & 160 deletions ...-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,145 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
return this.unknownFields;
}

private Backup(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
int tag = input.readTag();
switch (tag) {
case 0:
done = true;
break;
case 10:
{
java.lang.String s = input.readStringRequireUtf8();

name_ = s;
break;
}
case 18:
{
java.lang.String s = input.readStringRequireUtf8();

database_ = s;
break;
}
case 26:
{
com.google.protobuf.Timestamp.Builder subBuilder = null;
if (expireTime_ != null) {
subBuilder = expireTime_.toBuilder();
}
expireTime_ =
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(expireTime_);
expireTime_ = subBuilder.buildPartial();
}

break;
}
case 34:
{
com.google.protobuf.Timestamp.Builder subBuilder = null;
if (createTime_ != null) {
subBuilder = createTime_.toBuilder();
}
createTime_ =
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(createTime_);
createTime_ = subBuilder.buildPartial();
}

break;
}
case 40:
{
sizeBytes_ = input.readInt64();
break;
}
case 48:
{
int rawValue = input.readEnum();

state_ = rawValue;
break;
}
case 58:
{
java.lang.String s = input.readStringRequireUtf8();
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
referencingDatabases_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000001;
}
referencingDatabases_.add(s);
break;
}
case 66:
{
com.google.spanner.admin.database.v1.EncryptionInfo.Builder subBuilder = null;
if (encryptionInfo_ != null) {
subBuilder = encryptionInfo_.toBuilder();
}
encryptionInfo_ =
input.readMessage(
com.google.spanner.admin.database.v1.EncryptionInfo.parser(),
extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(encryptionInfo_);
encryptionInfo_ = subBuilder.buildPartial();
}

break;
}
case 74:
{
com.google.protobuf.Timestamp.Builder subBuilder = null;
if (versionTime_ != null) {
subBuilder = versionTime_.toBuilder();
}
versionTime_ =
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(versionTime_);
versionTime_ = subBuilder.buildPartial();
}

break;
}
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) != 0)) {
referencingDatabases_ = referencingDatabases_.getUnmodifiableView();
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}

public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.spanner.admin.database.v1.BackupProto
.internal_static_google_spanner_admin_database_v1_Backup_descriptor;
Expand Down Expand Up @@ -912,7 +773,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (versionTime_ != null) {
output.writeMessage(9, getVersionTime());
}
unknownFields.writeTo(output);
getUnknownFields().writeTo(output);
}

@java.lang.Override
Expand Down Expand Up @@ -953,7 +814,7 @@ public int getSerializedSize() {
if (versionTime_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getVersionTime());
}
size += unknownFields.getSerializedSize();
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
}
Expand Down Expand Up @@ -990,7 +851,7 @@ public boolean equals(final java.lang.Object obj) {
if (hasEncryptionInfo()) {
if (!getEncryptionInfo().equals(other.getEncryptionInfo())) return false;
}
if (!unknownFields.equals(other.unknownFields)) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}

Expand Down Expand Up @@ -1029,7 +890,7 @@ public int hashCode() {
hash = (37 * hash) + ENCRYPTION_INFO_FIELD_NUMBER;
hash = (53 * hash) + getEncryptionInfo().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
}
Expand Down Expand Up @@ -1158,17 +1019,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}

// Construct using com.google.spanner.admin.database.v1.Backup.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder() {}

private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}

private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
}

@java.lang.Override
Expand Down Expand Up @@ -1350,7 +1204,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (other.hasEncryptionInfo()) {
mergeEncryptionInfo(other.getEncryptionInfo());
}
this.mergeUnknownFields(other.unknownFields);
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
}
Expand All @@ -1365,17 +1219,86 @@ public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.spanner.admin.database.v1.Backup parsedMessage = null;
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
boolean done = false;
while (!done) {
int tag = input.readTag();
switch (tag) {
case 0:
done = true;
break;
case 10:
{
name_ = input.readStringRequireUtf8();

break;
} // case 10
case 18:
{
database_ = input.readStringRequireUtf8();

break;
} // case 18
case 26:
{
input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 26
case 34:
{
input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 34
case 40:
{
sizeBytes_ = input.readInt64();

break;
} // case 40
case 48:
{
state_ = input.readEnum();

break;
} // case 48
case 58:
{
java.lang.String s = input.readStringRequireUtf8();
ensureReferencingDatabasesIsMutable();
referencingDatabases_.add(s);
break;
} // case 58
case 66:
{
input.readMessage(getEncryptionInfoFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 66
case 74:
{
input.readMessage(getVersionTimeFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 74
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
done = true; // was an endgroup tag
}
break;
} // default:
} // switch (tag)
} // while (!done)
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.spanner.admin.database.v1.Backup) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
onChanged();
} // finally
return this;
}

Expand Down Expand Up @@ -2954,7 +2877,18 @@ public Backup parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new Backup(input, extensionRegistry);
Builder builder = newBuilder();
try {
builder.mergeFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(builder.buildPartial());
} catch (com.google.protobuf.UninitializedMessageException e) {
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(e)
.setUnfinishedMessage(builder.buildPartial());
}
return builder.buildPartial();
}
};

Expand Down
Loading

0 comments on commit ebeac9a

Please sign in to comment.