Skip to content

Commit ebeac9a

Browse files
suztomorajatbhatta
suztomo
and
rajatbhatta
authored
deps: regenerating with new Protobuf (6.4.4-sp) (#2135)
* 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 <[email protected]>
1 parent 5c9933b commit ebeac9a

File tree

87 files changed

+5756
-9019
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+5756
-9019
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ jobs:
9999
with:
100100
java-version: ${{matrix.java}}
101101
- run: java -version
102-
- run: mvn package
102+
- run: mvn package -Denforcer.skip=true
103103
env:
104104
JOB_TYPE: test

‎google-cloud-spanner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<configuration>
7171
<systemPropertyVariables>
7272
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
73-
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-west1</spanner.testenv.instance>
73+
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
7474
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
7575
<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>
7676
</systemPropertyVariables>

‎pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@
6868

6969
<dependencyManagement>
7070
<dependencies>
71+
<dependency>
72+
<groupId>io.grpc</groupId>
73+
<artifactId>grpc-bom</artifactId>
74+
<version>1.36.3</version>
75+
<type>pom</type>
76+
<scope>import</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>com.google.protobuf</groupId>
80+
<artifactId>protobuf-bom</artifactId>
81+
<version>3.16.3</version>
82+
<type>pom</type>
83+
<scope>import</scope>
84+
</dependency>
7185
<dependency>
7286
<groupId>com.google.api.grpc</groupId>
7387
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>

‎proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java‎

Lines changed: 94 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -55,145 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
5555
return this.unknownFields;
5656
}
5757

58-
private Backup(
59-
com.google.protobuf.CodedInputStream input,
60-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
61-
throws com.google.protobuf.InvalidProtocolBufferException {
62-
this();
63-
if (extensionRegistry == null) {
64-
throw new java.lang.NullPointerException();
65-
}
66-
int mutable_bitField0_ = 0;
67-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
68-
com.google.protobuf.UnknownFieldSet.newBuilder();
69-
try {
70-
boolean done = false;
71-
while (!done) {
72-
int tag = input.readTag();
73-
switch (tag) {
74-
case 0:
75-
done = true;
76-
break;
77-
case 10:
78-
{
79-
java.lang.String s = input.readStringRequireUtf8();
80-
81-
name_ = s;
82-
break;
83-
}
84-
case 18:
85-
{
86-
java.lang.String s = input.readStringRequireUtf8();
87-
88-
database_ = s;
89-
break;
90-
}
91-
case 26:
92-
{
93-
com.google.protobuf.Timestamp.Builder subBuilder = null;
94-
if (expireTime_ != null) {
95-
subBuilder = expireTime_.toBuilder();
96-
}
97-
expireTime_ =
98-
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
99-
if (subBuilder != null) {
100-
subBuilder.mergeFrom(expireTime_);
101-
expireTime_ = subBuilder.buildPartial();
102-
}
103-
104-
break;
105-
}
106-
case 34:
107-
{
108-
com.google.protobuf.Timestamp.Builder subBuilder = null;
109-
if (createTime_ != null) {
110-
subBuilder = createTime_.toBuilder();
111-
}
112-
createTime_ =
113-
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
114-
if (subBuilder != null) {
115-
subBuilder.mergeFrom(createTime_);
116-
createTime_ = subBuilder.buildPartial();
117-
}
118-
119-
break;
120-
}
121-
case 40:
122-
{
123-
sizeBytes_ = input.readInt64();
124-
break;
125-
}
126-
case 48:
127-
{
128-
int rawValue = input.readEnum();
129-
130-
state_ = rawValue;
131-
break;
132-
}
133-
case 58:
134-
{
135-
java.lang.String s = input.readStringRequireUtf8();
136-
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
137-
referencingDatabases_ = new com.google.protobuf.LazyStringArrayList();
138-
mutable_bitField0_ |= 0x00000001;
139-
}
140-
referencingDatabases_.add(s);
141-
break;
142-
}
143-
case 66:
144-
{
145-
com.google.spanner.admin.database.v1.EncryptionInfo.Builder subBuilder = null;
146-
if (encryptionInfo_ != null) {
147-
subBuilder = encryptionInfo_.toBuilder();
148-
}
149-
encryptionInfo_ =
150-
input.readMessage(
151-
com.google.spanner.admin.database.v1.EncryptionInfo.parser(),
152-
extensionRegistry);
153-
if (subBuilder != null) {
154-
subBuilder.mergeFrom(encryptionInfo_);
155-
encryptionInfo_ = subBuilder.buildPartial();
156-
}
157-
158-
break;
159-
}
160-
case 74:
161-
{
162-
com.google.protobuf.Timestamp.Builder subBuilder = null;
163-
if (versionTime_ != null) {
164-
subBuilder = versionTime_.toBuilder();
165-
}
166-
versionTime_ =
167-
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
168-
if (subBuilder != null) {
169-
subBuilder.mergeFrom(versionTime_);
170-
versionTime_ = subBuilder.buildPartial();
171-
}
172-
173-
break;
174-
}
175-
default:
176-
{
177-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
178-
done = true;
179-
}
180-
break;
181-
}
182-
}
183-
}
184-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
185-
throw e.setUnfinishedMessage(this);
186-
} catch (java.io.IOException e) {
187-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
188-
} finally {
189-
if (((mutable_bitField0_ & 0x00000001) != 0)) {
190-
referencingDatabases_ = referencingDatabases_.getUnmodifiableView();
191-
}
192-
this.unknownFields = unknownFields.build();
193-
makeExtensionsImmutable();
194-
}
195-
}
196-
19758
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
19859
return com.google.spanner.admin.database.v1.BackupProto
19960
.internal_static_google_spanner_admin_database_v1_Backup_descriptor;
@@ -912,7 +773,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
912773
if (versionTime_ != null) {
913774
output.writeMessage(9, getVersionTime());
914775
}
915-
unknownFields.writeTo(output);
776+
getUnknownFields().writeTo(output);
916777
}
917778

918779
@java.lang.Override
@@ -953,7 +814,7 @@ public int getSerializedSize() {
953814
if (versionTime_ != null) {
954815
size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getVersionTime());
955816
}
956-
size += unknownFields.getSerializedSize();
817+
size += getUnknownFields().getSerializedSize();
957818
memoizedSize = size;
958819
return size;
959820
}
@@ -990,7 +851,7 @@ public boolean equals(final java.lang.Object obj) {
990851
if (hasEncryptionInfo()) {
991852
if (!getEncryptionInfo().equals(other.getEncryptionInfo())) return false;
992853
}
993-
if (!unknownFields.equals(other.unknownFields)) return false;
854+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
994855
return true;
995856
}
996857

@@ -1029,7 +890,7 @@ public int hashCode() {
1029890
hash = (37 * hash) + ENCRYPTION_INFO_FIELD_NUMBER;
1030891
hash = (53 * hash) + getEncryptionInfo().hashCode();
1031892
}
1032-
hash = (29 * hash) + unknownFields.hashCode();
893+
hash = (29 * hash) + getUnknownFields().hashCode();
1033894
memoizedHashCode = hash;
1034895
return hash;
1035896
}
@@ -1158,17 +1019,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11581019
}
11591020

11601021
// Construct using com.google.spanner.admin.database.v1.Backup.newBuilder()
1161-
private Builder() {
1162-
maybeForceBuilderInitialization();
1163-
}
1022+
private Builder() {}
11641023

11651024
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
11661025
super(parent);
1167-
maybeForceBuilderInitialization();
1168-
}
1169-
1170-
private void maybeForceBuilderInitialization() {
1171-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
11721026
}
11731027

11741028
@java.lang.Override
@@ -1350,7 +1204,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
13501204
if (other.hasEncryptionInfo()) {
13511205
mergeEncryptionInfo(other.getEncryptionInfo());
13521206
}
1353-
this.mergeUnknownFields(other.unknownFields);
1207+
this.mergeUnknownFields(other.getUnknownFields());
13541208
onChanged();
13551209
return this;
13561210
}
@@ -1365,17 +1219,86 @@ public Builder mergeFrom(
13651219
com.google.protobuf.CodedInputStream input,
13661220
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13671221
throws java.io.IOException {
1368-
com.google.spanner.admin.database.v1.Backup parsedMessage = null;
1222+
if (extensionRegistry == null) {
1223+
throw new java.lang.NullPointerException();
1224+
}
13691225
try {
1370-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
1226+
boolean done = false;
1227+
while (!done) {
1228+
int tag = input.readTag();
1229+
switch (tag) {
1230+
case 0:
1231+
done = true;
1232+
break;
1233+
case 10:
1234+
{
1235+
name_ = input.readStringRequireUtf8();
1236+
1237+
break;
1238+
} // case 10
1239+
case 18:
1240+
{
1241+
database_ = input.readStringRequireUtf8();
1242+
1243+
break;
1244+
} // case 18
1245+
case 26:
1246+
{
1247+
input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry);
1248+
1249+
break;
1250+
} // case 26
1251+
case 34:
1252+
{
1253+
input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
1254+
1255+
break;
1256+
} // case 34
1257+
case 40:
1258+
{
1259+
sizeBytes_ = input.readInt64();
1260+
1261+
break;
1262+
} // case 40
1263+
case 48:
1264+
{
1265+
state_ = input.readEnum();
1266+
1267+
break;
1268+
} // case 48
1269+
case 58:
1270+
{
1271+
java.lang.String s = input.readStringRequireUtf8();
1272+
ensureReferencingDatabasesIsMutable();
1273+
referencingDatabases_.add(s);
1274+
break;
1275+
} // case 58
1276+
case 66:
1277+
{
1278+
input.readMessage(getEncryptionInfoFieldBuilder().getBuilder(), extensionRegistry);
1279+
1280+
break;
1281+
} // case 66
1282+
case 74:
1283+
{
1284+
input.readMessage(getVersionTimeFieldBuilder().getBuilder(), extensionRegistry);
1285+
1286+
break;
1287+
} // case 74
1288+
default:
1289+
{
1290+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
1291+
done = true; // was an endgroup tag
1292+
}
1293+
break;
1294+
} // default:
1295+
} // switch (tag)
1296+
} // while (!done)
13711297
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
1372-
parsedMessage = (com.google.spanner.admin.database.v1.Backup) e.getUnfinishedMessage();
13731298
throw e.unwrapIOException();
13741299
} finally {
1375-
if (parsedMessage != null) {
1376-
mergeFrom(parsedMessage);
1377-
}
1378-
}
1300+
onChanged();
1301+
} // finally
13791302
return this;
13801303
}
13811304

@@ -2954,7 +2877,18 @@ public Backup parsePartialFrom(
29542877
com.google.protobuf.CodedInputStream input,
29552878
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
29562879
throws com.google.protobuf.InvalidProtocolBufferException {
2957-
return new Backup(input, extensionRegistry);
2880+
Builder builder = newBuilder();
2881+
try {
2882+
builder.mergeFrom(input, extensionRegistry);
2883+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
2884+
throw e.setUnfinishedMessage(builder.buildPartial());
2885+
} catch (com.google.protobuf.UninitializedMessageException e) {
2886+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
2887+
} catch (java.io.IOException e) {
2888+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
2889+
.setUnfinishedMessage(builder.buildPartial());
2890+
}
2891+
return builder.buildPartial();
29582892
}
29592893
};
29602894

0 commit comments

Comments
 (0)