Skip to content

Commit 025c41a

Browse files
authored
BE: Chore: Polishing
1 parent 3690d68 commit 025c41a

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

api/src/main/java/io/kafbat/ui/config/auth/azure/AzureEntraLoginCallbackHandler.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ public class AzureEntraLoginCallbackHandler implements AuthenticateCallbackHandl
3131
private TokenRequestContext tokenRequestContext;
3232

3333
@Override
34-
public void configure(
35-
Map<String, ?> configs, String mechanism, List<AppConfigurationEntry> jaasConfigEntries) {
34+
public void configure(Map<String, ?> configs,
35+
String mechanism,
36+
List<AppConfigurationEntry> jaasConfigEntries) {
3637
tokenRequestContext = buildTokenRequestContext(configs);
3738
}
3839

@@ -45,16 +46,17 @@ private TokenRequestContext buildTokenRequestContext(Map<String, ?> configs) {
4546
return request;
4647
}
4748

49+
@SuppressWarnings("unchecked")
4850
private URI buildEventHubsServerUri(Map<String, ?> configs) {
4951
final List<String> bootstrapServers = (List<String>) configs.get(BOOTSTRAP_SERVERS_CONFIG);
5052

51-
if (null == bootstrapServers) {
53+
if (bootstrapServers == null) {
5254
final String message = BOOTSTRAP_SERVERS_CONFIG + " is missing from the Kafka configuration.";
5355
log.error(message);
5456
throw new IllegalArgumentException(message);
5557
}
5658

57-
if (bootstrapServers.size() != 1) {
59+
if (bootstrapServers.size() > 1) {
5860
final String message =
5961
BOOTSTRAP_SERVERS_CONFIG
6062
+ " contains multiple bootstrap servers. Only a single bootstrap server is supported.";
@@ -72,11 +74,10 @@ private String buildTokenAudience(URI uri) {
7274
@Override
7375
public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
7476
for (Callback callback : callbacks) {
75-
if (callback instanceof OAuthBearerTokenCallback oauthCallback) {
76-
handleOAuthCallback(oauthCallback);
77-
} else {
77+
if (!(callback instanceof OAuthBearerTokenCallback oauthCallback)) {
7878
throw new UnsupportedCallbackException(callback);
7979
}
80+
handleOAuthCallback(oauthCallback);
8081
}
8182
}
8283

@@ -91,7 +92,7 @@ private void handleOAuthCallback(OAuthBearerTokenCallback oauthCallback) {
9192
.block();
9293

9394
oauthCallback.token(token);
94-
} catch (final RuntimeException e) {
95+
} catch (RuntimeException e) {
9596
final String message =
9697
"Failed to acquire Azure token for Event Hub Authentication. "
9798
+ "Please ensure valid Azure credentials are configured.";
@@ -104,7 +105,7 @@ public void close() {
104105
// NOOP
105106
}
106107

107-
void setTokenCredential(final TokenCredential tokenCredential) {
108+
void setTokenCredential(TokenCredential tokenCredential) {
108109
AzureEntraLoginCallbackHandler.tokenCredential = tokenCredential;
109110
}
110111
}

api/src/main/java/io/kafbat/ui/config/auth/azure/AzureEntraOAuthBearerToken.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.nimbusds.jwt.JWTParser;
66
import java.text.ParseException;
77
import java.util.Arrays;
8-
import java.util.Optional;
98
import java.util.Set;
109
import java.util.stream.Collectors;
1110
import org.apache.kafka.common.errors.SaslAuthenticationException;
@@ -14,7 +13,6 @@
1413
public class AzureEntraOAuthBearerToken implements OAuthBearerToken {
1514

1615
private final AccessToken accessToken;
17-
1816
private final JWTClaimsSet claims;
1917

2018
public AzureEntraOAuthBearerToken(AccessToken accessToken) {
@@ -48,7 +46,9 @@ public Set<String> scope() {
4846
// https://docs.microsoft.com/azure/active-directory/develop/access-tokens#payload-claims, the
4947
// scp
5048
// claim is a String which is presented as a space separated list.
51-
return Arrays.stream(((String) claims.getClaim("scp")).split(" ")).collect(Collectors.toSet());
49+
return Arrays
50+
.stream(((String) claims.getClaim("scp")).split(" "))
51+
.collect(Collectors.toSet());
5252
}
5353

5454
@Override

0 commit comments

Comments
 (0)