Skip to content

Commit 1ba9484

Browse files
committed
fix: NPE when retrieving configuration
1 parent 7e37e60 commit 1ba9484

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

kubernetes-client/src/main/java/com/marcnuri/yakc/config/OkHttpClientConfigurator.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import javax.net.ssl.SSLContext;
2929
import javax.net.ssl.TrustManager;
3030
import javax.net.ssl.X509TrustManager;
31+
import java.io.IOException;
3132
import java.security.SecureRandom;
3233
import java.util.Optional;
3334
import java.util.logging.Level;
@@ -72,16 +73,19 @@ public static OkHttpClient initOkHttpClient(Configuration optionalConfiguration)
7273
log.log(Level.WARNING, String.format("Error while loading certificates: %s", e.getMessage()), e);
7374
}
7475
builder.addInterceptor(c -> {
75-
final String currentUserName = configuration.getUsername().get();
76-
final String currentPassword = configuration.getPassword().get();
76+
final String currentUserName = Optional.ofNullable(configuration.getUsername())
77+
.map(OkHttpClientConfigurator::getConfiguration).orElse(null);
78+
final String currentPassword = Optional.ofNullable(configuration.getPassword())
79+
.map(OkHttpClientConfigurator::getConfiguration).orElse(null);
7780
if (currentUserName != null) {
7881
c.proceed(c.request().newBuilder().addHeader(HEADER_AUTHORIZATION,
7982
Credentials.basic(currentUserName, currentPassword)).build());
8083
}
8184
return c.proceed(c.request());
8285
});
8386
builder.addInterceptor(c -> {
84-
final String currentToken = configuration.getToken().get();
87+
final String currentToken = Optional.ofNullable(configuration.getToken())
88+
.map(OkHttpClientConfigurator::getConfiguration).orElse(null);
8589
if (currentToken != null) {
8690
return c.proceed(c.request().newBuilder().header(HEADER_AUTHORIZATION,
8791
String.format("Bearer %s", currentToken)).build());
@@ -90,4 +94,12 @@ public static OkHttpClient initOkHttpClient(Configuration optionalConfiguration)
9094
});
9195
return builder.build();
9296
}
97+
98+
private static <T> T getConfiguration(ConfigurationSupplier<T> cs) {
99+
try {
100+
return cs.get();
101+
} catch (IOException e) {
102+
return null;
103+
}
104+
}
93105
}

0 commit comments

Comments
 (0)