This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 70be5940f5061bd41e4d2aeafc0a934487fa03a9 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Feb 9 14:25:13 2026 +0000 (chores): modernize instanceof checks in camel-keycloak --- .../camel/component/keycloak/KeycloakProducer.java | 56 +++++++++++----------- .../keycloak/security/KeycloakSecurityHelper.java | 3 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakProducer.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakProducer.java index 0e40dc1102a1..0d3d605353ef 100644 --- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakProducer.java +++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakProducer.java @@ -367,8 +367,8 @@ public class KeycloakProducer extends DefaultProducer { private void createRealm(Keycloak keycloakClient, Exchange exchange) throws InvalidPayloadException { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RealmRepresentation) { - keycloakClient.realms().create((RealmRepresentation) payload); + if (payload instanceof RealmRepresentation rr) { + keycloakClient.realms().create(rr); Message message = getMessageForResponse(exchange); message.setBody("Realm created successfully"); } @@ -417,8 +417,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RealmRepresentation) { - keycloakClient.realm(realmName).update((RealmRepresentation) payload); + if (payload instanceof RealmRepresentation rr) { + keycloakClient.realm(realmName).update(rr); Message message = getMessageForResponse(exchange); message.setBody("Realm updated successfully"); } @@ -435,8 +435,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof UserRepresentation) { - Response response = keycloakClient.realm(realmName).users().create((UserRepresentation) payload); + if (payload instanceof UserRepresentation ur) { + Response response = keycloakClient.realm(realmName).users().create(ur); Message message = getMessageForResponse(exchange); message.setBody(response); } @@ -510,8 +510,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof UserRepresentation) { - keycloakClient.realm(realmName).users().get(userId).update((UserRepresentation) payload); + if (payload instanceof UserRepresentation ur) { + keycloakClient.realm(realmName).users().get(userId).update(ur); Message message = getMessageForResponse(exchange); message.setBody("User updated successfully"); } @@ -539,8 +539,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RoleRepresentation) { - keycloakClient.realm(realmName).roles().create((RoleRepresentation) payload); + if (payload instanceof RoleRepresentation rr) { + keycloakClient.realm(realmName).roles().create(rr); Message message = getMessageForResponse(exchange); message.setBody("Role created successfully"); } @@ -607,8 +607,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RoleRepresentation) { - keycloakClient.realm(realmName).roles().get(roleName).update((RoleRepresentation) payload); + if (payload instanceof RoleRepresentation rr) { + keycloakClient.realm(realmName).roles().get(roleName).update(rr); Message message = getMessageForResponse(exchange); message.setBody("Role updated successfully"); } @@ -680,8 +680,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof GroupRepresentation) { - Response response = keycloakClient.realm(realmName).groups().add((GroupRepresentation) payload); + if (payload instanceof GroupRepresentation gr) { + Response response = keycloakClient.realm(realmName).groups().add(gr); Message message = getMessageForResponse(exchange); message.setBody(response); } @@ -744,8 +744,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof GroupRepresentation) { - keycloakClient.realm(realmName).groups().group(groupId).update((GroupRepresentation) payload); + if (payload instanceof GroupRepresentation gr) { + keycloakClient.realm(realmName).groups().group(groupId).update(gr); Message message = getMessageForResponse(exchange); message.setBody("Group updated successfully"); } @@ -831,8 +831,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof ClientRepresentation) { - Response response = keycloakClient.realm(realmName).clients().create((ClientRepresentation) payload); + if (payload instanceof ClientRepresentation cr) { + Response response = keycloakClient.realm(realmName).clients().create(cr); Message message = getMessageForResponse(exchange); message.setBody(response); } @@ -896,8 +896,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof ClientRepresentation) { - keycloakClient.realm(realmName).clients().get(clientUuid).update((ClientRepresentation) payload); + if (payload instanceof ClientRepresentation cr) { + keycloakClient.realm(realmName).clients().get(clientUuid).update(cr); Message message = getMessageForResponse(exchange); message.setBody("Client updated successfully"); } @@ -975,8 +975,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RoleRepresentation) { - keycloakClient.realm(realmName).clients().get(clientUuid).roles().create((RoleRepresentation) payload); + if (payload instanceof RoleRepresentation rr) { + keycloakClient.realm(realmName).clients().get(clientUuid).roles().create(rr); Message message = getMessageForResponse(exchange); message.setBody("Client role created successfully"); } @@ -1059,9 +1059,9 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof RoleRepresentation) { + if (payload instanceof RoleRepresentation rr) { keycloakClient.realm(realmName).clients().get(clientUuid).roles().get(roleName) - .update((RoleRepresentation) payload); + .update(rr); Message message = getMessageForResponse(exchange); message.setBody("Client role updated successfully"); } @@ -1212,8 +1212,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof ClientScopeRepresentation) { - Response response = keycloakClient.realm(realmName).clientScopes().create((ClientScopeRepresentation) payload); + if (payload instanceof ClientScopeRepresentation csr) { + Response response = keycloakClient.realm(realmName).clientScopes().create(csr); Message message = getMessageForResponse(exchange); message.setBody(response); } @@ -1277,8 +1277,8 @@ public class KeycloakProducer extends DefaultProducer { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); - if (payload instanceof ClientScopeRepresentation) { - keycloakClient.realm(realmName).clientScopes().get(clientScopeId).update((ClientScopeRepresentation) payload); + if (payload instanceof ClientScopeRepresentation csr) { + keycloakClient.realm(realmName).clientScopes().get(clientScopeId).update(csr); Message message = getMessageForResponse(exchange); message.setBody("Client scope updated successfully"); } diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java index 63754cb0ef36..9ef6a9d6f5ab 100644 --- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java +++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java @@ -161,8 +161,7 @@ public final class KeycloakSecurityHelper { // Also check for scope-based permissions Object scopesClaim = token.getOtherClaims().get("scope"); - if (scopesClaim instanceof String) { - String scopesString = (String) scopesClaim; + if (scopesClaim instanceof String scopesString) { if (!scopesString.isEmpty()) { permissions.addAll(java.util.Arrays.asList(scopesString.split(" "))); }
