Skip to content

Commit e42a9b5

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents d3d112f + 8571ba8 commit e42a9b5

7 files changed

Lines changed: 25 additions & 26 deletions

File tree

‎google-cloud-storage/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-storage</site.installationModule>
19-
<pubsub-proto.version>1.122.1</pubsub-proto.version>
19+
<pubsub-proto.version>1.122.2</pubsub-proto.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>
@@ -239,14 +239,14 @@
239239
<dependency>
240240
<groupId>com.google.api.grpc</groupId>
241241
<artifactId>proto-google-cloud-kms-v1</artifactId>
242-
<version>0.158.0</version>
242+
<version>0.161.0</version>
243243
<scope>test</scope>
244244
</dependency>
245245

246246
<dependency>
247247
<groupId>com.google.cloud</groupId>
248248
<artifactId>google-cloud-kms</artifactId>
249-
<version>2.67.0</version>
249+
<version>2.70.0</version>
250250
<scope>test</scope>
251251
</dependency>
252252
<dependency>

‎google-cloud-storage/src/main/java/com/google/cloud/storage/DefaultBlobWriteSessionConfig.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ WriterFactory createFactory(Clock clock) {
131131

132132
@InternalApi
133133
private static final class Factory implements WriterFactory {
134-
private static final Decoder<WriteObjectResponse, BlobInfo>
135-
WRITE_OBJECT_RESPONSE_BLOB_INFO_DECODER =
136-
Conversions.grpc().blobInfo().compose(WriteObjectResponse::getResource);
137134

138135
private final int chunkSize;
139136

@@ -172,7 +169,7 @@ public WritableByteChannelSession<?, BlobInfo> writeSession(
172169
.setStartAsync(startResumableWrite)
173170
.build();
174171
})),
175-
WRITE_OBJECT_RESPONSE_BLOB_INFO_DECODER);
172+
Conversions.grpc().blobInfo().compose(WriteObjectResponse::getResource));
176173
} else if (s instanceof StorageImpl) {
177174
StorageImpl json = (StorageImpl) s;
178175

‎google-cloud-storage/src/test/java/com/google/cloud/storage/it/GrpcPlainRequestLoggingInterceptor.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ public final class GrpcPlainRequestLoggingInterceptor implements ClientIntercept
7474

7575
private static final Metadata.Key<String> X_GOOG_REQUEST_PARAMS =
7676
Metadata.Key.of("x-goog-request-params", Metadata.ASCII_STRING_MARSHALLER);
77+
private static final Metadata.Key<String> X_RETRY_TEST_ID =
78+
Metadata.Key.of("x-retry-test-id", Metadata.ASCII_STRING_MARSHALLER);
7779

7880
/**
7981
* Define a map of message types we want to try to unpack from an {@link Any}.
@@ -116,7 +118,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
116118
return new SimpleForwardingClientCall<ReqT, RespT>(call) {
117119
@Override
118120
public void start(Listener<RespT> responseListener, Metadata headers) {
119-
if (headers.containsKey(X_GOOG_REQUEST_PARAMS)) {
121+
if (headers.containsKey(X_GOOG_REQUEST_PARAMS) || headers.containsKey(X_RETRY_TEST_ID)) {
120122
LOGGER.atDebug().log(() -> String.format(">>> headers = %s", headers));
121123
}
122124
SimpleForwardingClientCallListener<RespT> listener =
@@ -187,10 +189,10 @@ static String fmtProto(@NonNull WriteObjectRequest msg) {
187189
ByteString trim = snipBytes(content);
188190
b.getChecksummedDataBuilder().setContent(trim);
189191

190-
return b.build().toString();
192+
return fmtProto((MessageOrBuilder) b.build());
191193
}
192194
}
193-
return msg.toString();
195+
return fmtProto((MessageOrBuilder) msg);
194196
}
195197

196198
@NonNull
@@ -202,10 +204,10 @@ static String fmtProto(@NonNull BidiWriteObjectRequest msg) {
202204
ByteString trim = snipBytes(content);
203205
b.getChecksummedDataBuilder().setContent(trim);
204206

205-
return b.build().toString();
207+
return fmtProto((MessageOrBuilder) b.build());
206208
}
207209
}
208-
return msg.toString();
210+
return fmtProto((MessageOrBuilder) msg);
209211
}
210212

211213
@NonNull
@@ -217,7 +219,7 @@ static String fmtProto(@NonNull ReadObjectResponse msg) {
217219
ByteString trim = snipBytes(content);
218220
b.getChecksummedDataBuilder().setContent(trim);
219221

220-
return b.build().toString();
222+
return fmtProto((MessageOrBuilder) b.build());
221223
}
222224
}
223225
return msg.toString();
@@ -243,9 +245,9 @@ public static String fmtProto(@NonNull BidiReadObjectResponse msg) {
243245
}
244246
BidiReadObjectResponse snipped =
245247
msg.toBuilder().clearObjectDataRanges().addAllObjectDataRanges(snips).build();
246-
return snipped.toString();
248+
return fmtProto((MessageOrBuilder) snipped);
247249
}
248-
return msg.toString();
250+
return fmtProto((MessageOrBuilder) msg);
249251
}
250252

251253
private static ByteString snipBytes(ByteString content) {

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>com.google.cloud</groupId>
9494
<artifactId>google-cloud-pubsub</artifactId>
95-
<version>1.140.1</version>
95+
<version>1.140.2</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>

‎samples/install-without-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-storage</artifactId>
33-
<version>2.53.1</version>
33+
<version>2.53.2</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>com.google.cloud</groupId>
3737
<artifactId>google-cloud-storage-control</artifactId>
38-
<version>2.53.1</version>
38+
<version>2.53.2</version>
3939
</dependency>
4040
<!-- [END storage_install_without_bom] -->
4141

@@ -66,19 +66,19 @@
6666
<dependency>
6767
<groupId>com.google.cloud</groupId>
6868
<artifactId>google-cloud-pubsub</artifactId>
69-
<version>1.140.1</version>
69+
<version>1.140.2</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.cloud</groupId>
7474
<artifactId>google-cloud-kms</artifactId>
75-
<version>2.67.0</version>
75+
<version>2.70.0</version>
7676
<scope>test</scope>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.cloud</groupId>
8080
<artifactId>google-cloud-storage</artifactId>
81-
<version>2.53.1</version>
81+
<version>2.53.2</version>
8282
<classifier>tests</classifier>
8383
<scope>test</scope>
8484
</dependency>

‎samples/snapshot/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-pubsub</artifactId>
61-
<version>1.140.1</version>
61+
<version>1.140.2</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.cloud</groupId>
6666
<artifactId>google-cloud-kms</artifactId>
67-
<version>2.67.0</version>
67+
<version>2.70.0</version>
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>

‎samples/snippets/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
<dependency>
7777
<groupId>com.google.cloud</groupId>
7878
<artifactId>google-cloud-pubsub</artifactId>
79-
<version>1.140.1</version>
79+
<version>1.140.2</version>
8080
<scope>test</scope>
8181
</dependency>
8282
<dependency>
8383
<groupId>com.google.cloud</groupId>
8484
<artifactId>google-cloud-kms</artifactId>
85-
<version>2.67.0</version>
85+
<version>2.70.0</version>
8686
<scope>test</scope>
8787
</dependency>
8888
<dependency>
@@ -99,7 +99,7 @@
9999
<!-- tests jars aren't in the bom, manually include the version here -->
100100
<groupId>com.google.cloud</groupId>
101101
<artifactId>google-cloud-storage</artifactId>
102-
<version>2.53.1</version>
102+
<version>2.53.2</version>
103103
<classifier>tests</classifier>
104104
<scope>test</scope>
105105
</dependency>

0 commit comments

Comments
 (0)