Skip to content

deps: regenerating with new Protobuf (6.23.x) #2103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
suztomo merged 3 commits into from
Oct 12, 2022
Merged

deps: regenerating with new Protobuf (6.23.x) #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dcf5eb
fix: applying a different code generation
suztomo Oct 11, 2022
0f50463
deps: shared deps 2.10.1
suztomo Oct 11, 2022
532cfa8
Update and rename y_90_nested.json to y_80_nested.json
rajatbhatta Oct 12, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e/cloud/spanner/it/valid/y_90_nested.json → ...e/cloud/spanner/it/valid/y_80_nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{"nest":{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>${google.cloud.shared-dependencies.version}</version>
<version>2.10.1</version>
Copy link
Contributor

@mpeddada1 mpeddada1 Oct 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may need to manually update the shared-dependencies.version variable here?
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
308 changes: 113 additions & 195 deletions ...-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,180 +57,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;
}
case 80:
{
int rawValue = input.readEnum();

databaseDialect_ = rawValue;
break;
}
case 90:
{
java.lang.String s = input.readStringRequireUtf8();
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
referencingBackups_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
referencingBackups_.add(s);
break;
}
case 98:
{
com.google.protobuf.Timestamp.Builder subBuilder = null;
if (maxExpireTime_ != null) {
subBuilder = maxExpireTime_.toBuilder();
}
maxExpireTime_ =
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(maxExpireTime_);
maxExpireTime_ = 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();
}
if (((mutable_bitField0_ & 0x00000002) != 0)) {
referencingBackups_ = referencingBackups_.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 @@ -1161,7 +987,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (maxExpireTime_ != null) {
output.writeMessage(12, getMaxExpireTime());
}
unknownFields.writeTo(output);
getUnknownFields().writeTo(output);
}

@java.lang.Override
Expand Down Expand Up @@ -1218,7 +1044,7 @@ public int getSerializedSize() {
if (maxExpireTime_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getMaxExpireTime());
}
size += unknownFields.getSerializedSize();
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
}
Expand Down Expand Up @@ -1261,7 +1087,7 @@ public boolean equals(final java.lang.Object obj) {
if (hasMaxExpireTime()) {
if (!getMaxExpireTime().equals(other.getMaxExpireTime())) return false;
}
if (!unknownFields.equals(other.unknownFields)) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}

Expand Down Expand Up @@ -1310,7 +1136,7 @@ public int hashCode() {
hash = (37 * hash) + MAX_EXPIRE_TIME_FIELD_NUMBER;
hash = (53 * hash) + getMaxExpireTime().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
}
Expand Down Expand Up @@ -1439,17 +1265,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 @@ -1668,7 +1487,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (other.hasMaxExpireTime()) {
mergeMaxExpireTime(other.getMaxExpireTime());
}
this.mergeUnknownFields(other.unknownFields);
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
}
Expand All @@ -1683,17 +1502,105 @@ 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
case 80:
{
databaseDialect_ = input.readEnum();

break;
} // case 80
case 90:
{
java.lang.String s = input.readStringRequireUtf8();
ensureReferencingBackupsIsMutable();
referencingBackups_.add(s);
break;
} // case 90
case 98:
{
input.readMessage(getMaxExpireTimeFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 98
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 @@ -3854,7 +3761,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