8000 default unsupported exception. · rmehta19/sdk-platform-java@04d47a0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 04d47a0

Browse files
committed
default unsupported exception.
1 parent 91175ef commit 04d47a0

File tree

4 files changed

+8
-25
lines changed

4 files changed

+8
-25
lines changed

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/LocalChannelProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public class LocalChannelProvider implements TransportChannelProvider {
6060

6161
private final List<LocalHeaderInterceptor> interceptors;
6262
private final String address;
63-
private boolean useS2A;
6463

6564
private volatile HeaderProvider headerProvider;
6665

@@ -109,7 +108,7 @@ public TransportChannelProvider withEndpoint(String endpoint) {
109108

110109
@Override
111110
public TransportChannelProvider withUseS2A(boolean useS2A) {
112-
this.useS2A = useS2A;
111+
// Overriden for technical reasons. This method is a no-op for LocalChannelProvider.
113112
return this;
114113
}
115114

gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public final class InstantiatingHttpJsonChannelProvider implements TransportChan
6565
private final HeaderProvider headerProvider;
6666
private final HttpJsonInterceptorProvider interceptorProvider;
6767
private final String endpoint;
68-
private final boolean useS2A;
6968
private final HttpTransport httpTransport;
7069
private final MtlsProvider mtlsProvider;
7170

@@ -74,14 +73,12 @@ private InstantiatingHttpJsonChannelProvider(
7473
HeaderProvider headerProvider,
7574
HttpJsonInterceptorProvider interceptorProvider,
7675
String endpoint,
77-
boolean useS2A,
7876
HttpTransport httpTransport,
7977
MtlsProvider mtlsProvider) {
8078
this.executor = executor;
8179
this.headerProvider = headerProvider;
8280
this.interceptorProvider = interceptorProvider;
8381
this.endpoint = endpoint;
84-
this.useS2A = useS2A;
8582
this.httpTransport = httpTransport;
8683
this.mtlsProvider = mtlsProvider;
8784
}
@@ -129,7 +126,7 @@ public TransportChannelProvider withEndpoint(String endpoint) {
129126

130127
@Override
131128
public TransportChannelProvider withUseS2A(boolean useS2A) {
132-
return toBuilder().setUseS2A(useS2A).build();
129+
return this;
133130
}
134131

135132
/** @deprecated REST transport channel doesn't support channel pooling */
@@ -239,7 +236,6 @@ public static final class Builder {
239236
private HeaderProvider headerProvider;
240237
private HttpJsonInterceptorProvider interceptorProvider;
241238
private String endpoint;
242-
private boolean useS2A;
243239
private HttpTransport httpTransport;
244240
private MtlsProvider mtlsProvider = new MtlsProvider();
245241

@@ -249,7 +245,6 @@ private Builder(InstantiatingHttpJsonChannelProvider provider) {
249245
this.executor = provider.executor;
250246
this.headerProvider = provider.headerProvider;
251247
this.endpoint = provider.endpoint;
252-
this.useS2A = provider.useS2A;
253248
this.httpTransport = provider.httpTransport;
254249
this.mtlsProvider = provider.mtlsProvider;
255250
this.interceptorProvider = provider.interceptorProvider;
@@ -304,12 +299,6 @@ public Builder setEndpoint(String endpoint) {
304299
return this;
305300
}
306301

307-
/** Sets whether to use S2A */
308-
public Builder setUseS2A(boolean useS2A) {
309-
this.useS2A = useS2A;
310-
return this;
311-
}
312-
313302
/** Sets the HTTP transport to be used. */
314303
public Builder setHttpTransport(HttpTransport httpTransport) {
315304
this.httpTransport = httpTransport;
@@ -328,13 +317,7 @@ Builder setMtlsProvider(MtlsProvider mtlsProvider) {
328317

329318
public InstantiatingHttpJsonChannelProvider build() {
330319
return new InstantiatingHttpJsonChannelProvider(
331-
executor,
332-
headerProvider,
333-
interceptorProvider,
334-
endpoint,
335-
useS2A,
336-
httpTransport,
337-
mtlsProvider);
320+
executor, headerProvider, interceptorProvider, endpoint, httpTransport, mtlsProvider);
338321
}
339322
}
340323
}

gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedTransportChannelProvider.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
public class FixedTransportChannelProvider implements TransportChannelProvider {
4343

4444
private final TransportChannel transportChannel;
45-
private boolean useS2A;
4645

4746
private FixedTransportChannelProvider(TransportChannel transportChannel) {
4847
this.transportChannel = Preconditions.checkNotNull(transportChannel);
@@ -91,8 +90,8 @@ public TransportChannelProvider withEndpoint(String endpoint) {
9190
}
9291

9392
@Override
94-
public TransportChannelProvider withUseS2A(boolean useS2A) {
95-
this.useS2A = useS2A;
93+
public TransportChannelProvider withUseS2A(boolean useS2A) throws UnsupportedOperationException {
94+
// Overriden for technical reasons. This method is a no-op for FixedTransportChannelProvider.
9695
return this;
9796
}
9897

gax-java/gax/src/main/java/com/google/api/gax/rpc/TransportChannelProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ public interface TransportChannelProvider {
9898
TransportChannelProvider withEndpoint(String endpoint);
9999

100100
/** Sets whether to use S2A when constructing a new {@link TransportChannel}. */
101-
TransportChannelProvider withUseS2A(boolean useS2A);
101+
default TransportChannelProvider withUseS2A(boolean useS2A) {
102+
throw new UnsupportedOperationException("S2A is not supported");
103+
}
102104

103105
/**
104106
* Reports whether this provider allows pool size customization.

0 commit comments

Comments
 (0)
0