Skip to content
This repository was archived by the owner on Jul 11, 2024. It is now read-only.

Commit 45be707

Browse files
chokoswitchchokoswitch
authored
Update dependencies. (#487)
* Update dependencies. * Non-static so disabled properly * Non-static so disabled properly
1 parent 7006be5 commit 45be707

File tree

47 files changed

+190
-245
lines changed

Some content is hidden

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

47 files changed

+190
-245
lines changed

‎common/google-cloud/cloud-storage/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.40
25+
version = 0.0.41

‎common/google-cloud/cloud-storage/src/main/java/org/curioswitch/curiostack/gcloud/storage/FileWriter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.common.util.concurrent.ListenableFuture;
3030
import com.google.protobuf.ByteString;
3131
import com.google.protobuf.InvalidProtocolBufferException;
32-
import com.linecorp.armeria.client.HttpClient;
32+
import com.linecorp.armeria.client.WebClient;
3333
import com.linecorp.armeria.common.CommonPools;
3434
import com.linecorp.armeria.common.HttpData;
3535
import com.linecorp.armeria.common.HttpHeaderNames;
@@ -68,10 +68,10 @@ public class FileWriter {
6868
* upload is cancelled in the middle.
6969
*/
7070
public static class Resumer {
71-
private final HttpClient httpClient;
71+
private final WebClient httpClient;
7272

7373
@Inject
74-
Resumer(@ForStorage HttpClient httpClient) {
74+
Resumer(@ForStorage WebClient httpClient) {
7575
this.httpClient = httpClient;
7676
}
7777

@@ -119,14 +119,14 @@ public ListenableFuture<FileWriter> resume(
119119
private static final int CHUNK_ALIGNMENT = 256 * 1024;
120120

121121
private final String uploadUrl;
122-
private final HttpClient httpClient;
122+
private final WebClient httpClient;
123123
private final ByteBufAllocator alloc;
124124
private final EventLoop eventLoop;
125125

126126
private long filePosition;
127127
@Nullable private ByteBuf unfinishedChunk;
128128

129-
FileWriter(String uploadUrl, ByteBufAllocator alloc, EventLoop eventLoop, HttpClient httpClient) {
129+
FileWriter(String uploadUrl, ByteBufAllocator alloc, EventLoop eventLoop, WebClient httpClient) {
130130
this.uploadUrl = uploadUrl;
131131
this.httpClient = httpClient;
132132
this.alloc = alloc;
@@ -137,7 +137,7 @@ public ListenableFuture<FileWriter> resume(
137137
String uploadUrl,
138138
ByteBufAllocator alloc,
139139
EventLoop eventLoop,
140-
HttpClient httpClient,
140+
WebClient httpClient,
141141
long filePosition,
142142
@Nullable ByteBuf unfinishedChunk) {
143143
this.uploadUrl = uploadUrl;

‎common/google-cloud/cloud-storage/src/main/java/org/curioswitch/curiostack/gcloud/storage/StorageClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
3232
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
3333
import com.google.common.util.concurrent.ListenableFuture;
34-
import com.linecorp.armeria.client.HttpClient;
3534
import com.linecorp.armeria.client.InvalidResponseException;
35+
import com.linecorp.armeria.client.WebClient;
3636
import com.linecorp.armeria.common.CommonPools;
3737
import com.linecorp.armeria.common.HttpData;
3838
import com.linecorp.armeria.common.HttpHeaderNames;
@@ -74,13 +74,13 @@ public class StorageClient {
7474

7575
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().findAndRegisterModules();
7676

77-
private final HttpClient httpClient;
77+
private final WebClient httpClient;
7878

7979
private final String uploadUrl;
8080
private final String objectUrlPrefix;
8181

8282
@Inject
83-
public StorageClient(@ForStorage HttpClient httpClient, StorageConfig config) {
83+
public StorageClient(@ForStorage WebClient httpClient, StorageConfig config) {
8484
this.httpClient = httpClient;
8585

8686
uploadUrl = "/upload/storage/v1/b/" + config.getBucket() + "/o?uploadType=resumable";

‎common/google-cloud/cloud-storage/src/main/java/org/curioswitch/curiostack/gcloud/storage/StorageModule.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
import com.linecorp.armeria.client.ClientDecoration;
2727
import com.linecorp.armeria.client.ClientOption;
2828
import com.linecorp.armeria.client.Clients;
29-
import com.linecorp.armeria.client.HttpClient;
29+
import com.linecorp.armeria.client.WebClient;
3030
import com.linecorp.armeria.client.metric.MetricCollectingClient;
31-
import com.linecorp.armeria.common.HttpRequest;
32-
import com.linecorp.armeria.common.HttpResponse;
3331
import com.typesafe.config.Config;
3432
import com.typesafe.config.ConfigBeanFactory;
3533
import dagger.Module;
@@ -55,13 +53,11 @@ static StorageConfig config(Config config) {
5553
@Provides
5654
@ForStorage
5755
@Singleton
58-
static HttpClient metricClient(@RetryingAuthenticatedGoogleApis HttpClient httpClient) {
56+
static WebClient metricClient(@RetryingAuthenticatedGoogleApis WebClient httpClient) {
5957
return Clients.newDerivedClient(
6058
httpClient,
6159
ClientOption.DECORATION.newValue(
6260
ClientDecoration.of(
63-
HttpRequest.class,
64-
HttpResponse.class,
6561
MetricCollectingClient.newDecorator(MetricLabels.storageRequestLabeler()))));
6662
}
6763

‎common/google-cloud/core/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.40
25+
version = 0.0.41

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/GcloudModule.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,15 @@
2323
*/
2424
package org.curioswitch.curiostack.gcloud.core;
2525

26-
import com.linecorp.armeria.client.ClientBuilder;
2726
import com.linecorp.armeria.client.ClientDecoration;
2827
import com.linecorp.armeria.client.ClientFactory;
2928
import com.linecorp.armeria.client.ClientFactoryBuilder;
3029
import com.linecorp.armeria.client.ClientOption;
3130
import com.linecorp.armeria.client.Clients;
32-
import com.linecorp.armeria.client.HttpClient;
33-
import com.linecorp.armeria.client.logging.LoggingClientBuilder;
31+
import com.linecorp.armeria.client.WebClient;
32+
import com.linecorp.armeria.client.logging.LoggingClient;
3433
import com.linecorp.armeria.client.retry.RetryStrategy;
3534
import com.linecorp.armeria.client.retry.RetryingHttpClient;
36-
import com.linecorp.armeria.common.HttpRequest;
37-
import com.linecorp.armeria.common.HttpResponse;
3835
import com.typesafe.config.Config;
3936
import com.typesafe.config.ConfigBeanFactory;
4037
import dagger.BindsOptionalOf;
@@ -61,7 +58,7 @@ public static GcloudConfig config(Config config) {
6158
@Provides
6259
@Singleton
6360
@GoogleApis
64-
public static HttpClient googleApisClient(
61+
public static WebClient googleApisClient(
6562
Optional<MeterRegistry> meterRegistry, GcloudConfig config) {
6663
ClientFactory factory =
6764
meterRegistry
@@ -75,22 +72,20 @@ public static HttpClient googleApisClient(
7572
return builder.build();
7673
})
7774
.orElse(ClientFactory.DEFAULT);
78-
return new ClientBuilder("none+https://www.googleapis.com/")
75+
return WebClient.builder("https://www.googleapis.com/")
7976
.factory(factory)
80-
.decorator(HttpRequest.class, HttpResponse.class, new LoggingClientBuilder().newDecorator())
81-
.build(HttpClient.class);
77+
.decorator(LoggingClient.builder().newDecorator())
78+
.build();
8279
}
8380

8481
@Provides
8582
@Singleton
8683
@RetryingGoogleApis
87-
public static HttpClient retryingGoogleApisClient(@GoogleApis HttpClient googleApisClient) {
84+
public static WebClient retryingGoogleApisClient(@GoogleApis WebClient googleApisClient) {
8885
return Clients.newDerivedClient(
8986
googleApisClient,
9087
ClientOption.DECORATION.newValue(
9188
ClientDecoration.of(
92-
HttpRequest.class,
93-
HttpResponse.class,
9489
RetryingHttpClient.newDecorator(RetryStrategy.onServerErrorStatus()))));
9590
}
9691

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/AbstractAccessTokenProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.fasterxml.jackson.databind.DeserializationFeature;
2727
import com.fasterxml.jackson.databind.ObjectMapper;
2828
import com.google.auth.oauth2.AccessToken;
29-
import com.linecorp.armeria.client.HttpClient;
29+
import com.linecorp.armeria.client.WebClient;
3030
import com.linecorp.armeria.common.AggregatedHttpResponse;
3131
import com.linecorp.armeria.common.CommonPools;
3232
import com.linecorp.armeria.common.HttpData;
@@ -61,13 +61,13 @@ enum Type {
6161
ID_TOKEN
6262
}
6363

64-
private final HttpClient googleApisClient;
64+
private final WebClient googleApisClient;
6565
private final Clock clock;
6666

6767
private final AsyncRefreshingValue<AccessToken> cachedAccessToken;
6868
private final AsyncRefreshingValue<AccessToken> cachedIdToken;
6969

70-
AbstractAccessTokenProvider(HttpClient googleApisClient, Clock clock) {
70+
AbstractAccessTokenProvider(WebClient googleApisClient, Clock clock) {
7171
this.googleApisClient = googleApisClient;
7272
this.clock = clock;
7373
cachedAccessToken =

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/AccessTokenProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.google.auth.oauth2.ComputeEngineCredentials;
2828
import com.google.auth.oauth2.ServiceAccountCredentials;
2929
import com.google.auth.oauth2.UserCredentials;
30-
import com.linecorp.armeria.client.HttpClient;
30+
import com.linecorp.armeria.client.WebClient;
3131
import java.time.Clock;
3232
import java.util.concurrent.CompletableFuture;
3333
import javax.inject.Inject;
@@ -38,11 +38,11 @@ public interface AccessTokenProvider {
3838

3939
@Singleton
4040
class Factory {
41-
private final HttpClient googleAccountsClient;
41+
private final WebClient googleAccountsClient;
4242
private final Clock clock;
4343

4444
@Inject
45-
public Factory(@RetryingGoogleApis HttpClient googleApisClient, Clock clock) {
45+
public Factory(@RetryingGoogleApis WebClient googleApisClient, Clock clock) {
4646
this.googleAccountsClient = googleApisClient;
4747
this.clock = clock;
4848
}

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/ComputeEngineAccessTokenProvider.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
package org.curioswitch.curiostack.gcloud.core.auth;
2525

2626
import com.google.auth.oauth2.ComputeEngineCredentials;
27-
import com.linecorp.armeria.client.HttpClient;
28-
import com.linecorp.armeria.client.HttpClientBuilder;
29-
import com.linecorp.armeria.client.logging.LoggingClientBuilder;
27+
import com.linecorp.armeria.client.WebClient;
28+
import com.linecorp.armeria.client.logging.LoggingClient;
3029
import com.linecorp.armeria.common.AggregatedHttpResponse;
3130
import com.linecorp.armeria.common.HttpHeaderNames;
3231
import com.linecorp.armeria.common.HttpMethod;
@@ -43,7 +42,7 @@ class ComputeEngineAccessTokenProvider extends AbstractAccessTokenProvider {
4342
private static final AsciiString METADATA_FLAVOR_HEADER = HttpHeaderNames.of("Metadata-Flavor");
4443

4544
@Inject
46-
ComputeEngineAccessTokenProvider(HttpClient googleApisClient, Clock clock) {
45+
ComputeEngineAccessTokenProvider(WebClient googleApisClient, Clock clock) {
4746
super(googleApisClient, clock);
4847
}
4948

@@ -58,9 +57,9 @@ protected CompletableFuture<AggregatedHttpResponse> fetchToken(Type type) {
5857

5958
// In practice, this URL shouldn't change at runtime but it's not infeasible, and since this
6059
// shouldn't be executed often, just create a client every time.
61-
HttpClient client =
62-
new HttpClientBuilder("h1c://" + uri.getAuthority() + "/")
63-
.decorator(new LoggingClientBuilder().newDecorator())
60+
WebClient client =
61+
WebClient.builder("h1c://" + uri.getAuthority() + "/")
62+
.decorator(LoggingClient.builder().newDecorator())
6463
.build();
6564
return client
6665
.execute(RequestHeaders.of(HttpMethod.GET, uri.getPath(), METADATA_FLAVOR_HEADER, "Google"))

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/GcloudAuthModule.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
import com.linecorp.armeria.client.ClientDecoration;
2929
import com.linecorp.armeria.client.ClientOption;
3030
import com.linecorp.armeria.client.Clients;
31-
import com.linecorp.armeria.client.HttpClient;
32-
import com.linecorp.armeria.common.HttpRequest;
33-
import com.linecorp.armeria.common.HttpResponse;
31+
import com.linecorp.armeria.client.WebClient;
3432
import com.typesafe.config.Config;
3533
import com.typesafe.config.ConfigBeanFactory;
3634
import dagger.Module;
@@ -99,30 +97,27 @@ public static AccessTokenProvider accessTokenProvider(
9997
@Provides
10098
@Singleton
10199
@AuthenticatedGoogleApis
102-
public static HttpClient authenticatedGoogleApisClient(
103-
@GoogleApis HttpClient googleApisClient,
100+
public static WebClient authenticatedGoogleApisClient(
101+
@GoogleApis WebClient googleApisClient,
104102
GoogleCredentialsDecoratingClient.Factory credentialsDecorator) {
105103
return authenticated(googleApisClient, credentialsDecorator);
106104
}
107105

108106
@Provides
109107
@Singleton
110108
@RetryingAuthenticatedGoogleApis
111-
public static HttpClient retryingAuthenticatedGoogleApisClient(
112-
@RetryingGoogleApis HttpClient googleApisClient,
109+
public static WebClient retryingAuthenticatedGoogleApisClient(
110+
@RetryingGoogleApis WebClient googleApisClient,
113111
GoogleCredentialsDecoratingClient.Factory credentialsDecorator) {
114112
return authenticated(googleApisClient, credentialsDecorator);
115113
}
116114

117-
private static HttpClient authenticated(
118-
HttpClient client, GoogleCredentialsDecoratingClient.Factory credentialsDecorator) {
115+
private static WebClient authenticated(
116+
WebClient client, GoogleCredentialsDecoratingClient.Factory credentialsDecorator) {
119117
return Clients.newDerivedClient(
120118
client,
121119
ClientOption.DECORATION.newValue(
122-
ClientDecoration.of(
123-
HttpRequest.class,
124-
HttpResponse.class,
125-
credentialsDecorator.newAccessTokenDecorator())));
120+
ClientDecoration.of(credentialsDecorator.newAccessTokenDecorator())));
126121
}
127122

128123
private GcloudAuthModule() {}

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/GoogleCredentialsDecoratingClient.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525

2626
import com.linecorp.armeria.client.Client;
2727
import com.linecorp.armeria.client.ClientRequestContext;
28+
import com.linecorp.armeria.client.HttpClient;
2829
import com.linecorp.armeria.client.SimpleDecoratingClient;
30+
import com.linecorp.armeria.client.SimpleDecoratingHttpClient;
2931
import com.linecorp.armeria.common.HttpHeaderNames;
3032
import com.linecorp.armeria.common.HttpRequest;
3133
import com.linecorp.armeria.common.HttpResponse;
@@ -36,8 +38,7 @@
3638
import javax.inject.Singleton;
3739

3840
/** A {@link SimpleDecoratingClient} that annotates requests with Google authentication metadata. */
39-
public class GoogleCredentialsDecoratingClient
40-
extends SimpleDecoratingClient<HttpRequest, HttpResponse> {
41+
public class GoogleCredentialsDecoratingClient extends SimpleDecoratingHttpClient {
4142

4243
@Singleton
4344
public static class Factory {
@@ -48,25 +49,23 @@ public Factory(AccessTokenProvider accessTokenProvider) {
4849
this.accessTokenProvider = accessTokenProvider;
4950
}
5051

51-
public Function<Client<HttpRequest, HttpResponse>, GoogleCredentialsDecoratingClient>
52-
newAccessTokenDecorator() {
52+
public Function<HttpClient, GoogleCredentialsDecoratingClient> newAccessTokenDecorator() {
5353
return newAccessTokenDecorator(HttpHeaderNames.AUTHORIZATION);
5454
}
5555

56-
public Function<Client<HttpRequest, HttpResponse>, GoogleCredentialsDecoratingClient>
57-
newAccessTokenDecorator(AsciiString header) {
56+
public Function<HttpClient, GoogleCredentialsDecoratingClient> newAccessTokenDecorator(
57+
AsciiString header) {
5858
return client ->
5959
new GoogleCredentialsDecoratingClient(
6060
client, accessTokenProvider, TokenType.ACCESS_TOKEN, header);
6161
}
6262

63-
public Function<Client<HttpRequest, HttpResponse>, GoogleCredentialsDecoratingClient>
64-
newIdTokenDecorator() {
63+
public Function<HttpClient, GoogleCredentialsDecoratingClient> newIdTokenDecorator() {
6564
return newIdTokenDecorator(HttpHeaderNames.AUTHORIZATION);
6665
}
6766

68-
public Function<Client<HttpRequest, HttpResponse>, GoogleCredentialsDecoratingClient>
69-
newIdTokenDecorator(AsciiString header) {
67+
public Function<HttpClient, GoogleCredentialsDecoratingClient> newIdTokenDecorator(
68+
AsciiString header) {
7069
return client ->
7170
new GoogleCredentialsDecoratingClient(
7271
client, accessTokenProvider, TokenType.ID_TOKEN, header);
@@ -84,7 +83,7 @@ private enum TokenType {
8483

8584
/** Creates a new instance that decorates the specified {@link Client}. */
8685
private GoogleCredentialsDecoratingClient(
87-
Client<HttpRequest, HttpResponse> delegate,
86+
HttpClient delegate,
8887
AccessTokenProvider accessTokenProvider,
8988
TokenType type,
9089
AsciiString header) {
@@ -95,7 +94,7 @@ private GoogleCredentialsDecoratingClient(
9594
}
9695

9796
@Override
98-
public HttpResponse execute(ClientRequestContext ctx, HttpRequest req) throws Exception {
97+
public HttpResponse execute(ClientRequestContext ctx, HttpRequest req) {
9998
// if (ctx.additionalRequestHeaders().contains(header) || req.headers().contains(header)) {
10099
// return delegate().execute(ctx, req);
101100
// }

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/auth/GooglePublicKeysManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.fasterxml.jackson.databind.ObjectMapper;
3030
import com.google.common.base.Splitter;
3131
import com.google.common.collect.Streams;
32-
import com.linecorp.armeria.client.HttpClient;
32+
import com.linecorp.armeria.client.WebClient;
3333
import com.linecorp.armeria.common.CommonPools;
3434
import com.linecorp.armeria.common.HttpHeaderNames;
3535
import com.linecorp.armeria.common.HttpHeaders;
@@ -80,14 +80,14 @@ public class GooglePublicKeysManager {
8080
}
8181
}
8282

83-
private final HttpClient googleApisClient;
83+
private final WebClient googleApisClient;
8484
private final Clock clock;
8585
private final AsyncRefreshingValue<CachedPublicKeys> keysCache;
8686

8787
@Inject
8888
// We want to use seconds like the HTTP response.
8989
@SuppressWarnings({"CanonicalDuration", "ConstructorLeaksThis"})
90-
public GooglePublicKeysManager(@RetryingGoogleApis HttpClient googleApisClient, Clock clock) {
90+
public GooglePublicKeysManager(@RetryingGoogleApis WebClient googleApisClient, Clock clock) {
9191
this.googleApisClient = googleApisClient;
9292
this.clock = clock;
9393

0 commit comments

Comments
 (0)