Skip to content

Commit 257c515

Browse files
committed
set System::getenv as envProvider.
1 parent 9901656 commit 257c515

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ public static EndpointContext getDefaultInstance() {
126126
public static Builder newBuilder() {
127127
return new AutoValue_EndpointContext.Builder()
128128
.setSwitchToMtlsEndpointAllowed(false)
129-
.setUsingGDCH(false);
129+
.setUsingGDCH(false)
130+
.setEnvProvider(System::getenv);
130131
}
131132

132133
/** Configure the existing EndpointContext to be using GDC-H */
@@ -308,11 +309,7 @@ private String determineEndpoint() throws IOException {
308309
boolean shouldUseS2A() {
309310
// If EXPERIMENTAL_GOOGLE_API_USE_S2A is not set to true, skip S2A.
310311
String s2AEnv;
311-
if (envProvider() != null) {
312-
s2AEnv = envProvider().getenv(S2A_ENV_ENABLE_USE_S2A);
313-
} else {
314-
s2AEnv = System.getenv(S2A_ENV_ENABLE_USE_S2A);
315-
}
312+
s2AEnv = envProvider().getenv(S2A_ENV_ENABLE_USE_S2A);
316313
boolean s2AEnabled = Boolean.parseBoolean(s2AEnv);
317314
if (!s2AEnabled) {
318315
return false;

0 commit comments

Comments
 (0)