KEYCLOAK-12316 Simplify conditions in packages: authentication, broker, credential, protocol from module "services"

services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java

@@ -127,7 +127,7 @@ public class JWTClientAuthenticator extends AbstractClientAuthenticator {
             boolean signatureValid;
             try {
                 JsonWebToken jwt = context.getSession().tokens().decodeClientJWT(clientAssertion, client, JsonWebToken.class);
-                signatureValid = jwt == null ? false : true;
+                signatureValid = jwt != null;
             } catch (RuntimeException e) {
                 Throwable cause = e.getCause() != null ? e.getCause() : e;
                 throw new RuntimeException("Signature on JWT token failed validation", cause);

services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserConfiguredAuthenticator.java

@@ -33,7 +33,7 @@ public class ConditionalUserConfiguredAuthenticator implements ConditionalAuthen
                 AuthenticatorFactory factory = (AuthenticatorFactory) context.getSession().getKeycloakSessionFactory().getProviderFactory(Authenticator.class, e.getAuthenticator());
                 if (factory != null) {
                     Authenticator auth = factory.create(context.getSession());
-                    if (auth != null && auth instanceof ConditionalAuthenticator) {
+                    if (auth instanceof ConditionalAuthenticator) {
                         isConditionalAuthenticator = true;
                     }
                 }

services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java

@@ -165,7 +165,7 @@ public class WebAuthnRegister implements RequiredActionProvider, CredentialRegis
         Challenge challenge = new DefaultChallenge(context.getAuthenticationSession().getAuthNote(WebAuthnConstants.AUTH_CHALLENGE_NOTE));
         ServerProperty serverProperty = new ServerProperty(origin, rpId, challenge, null);
         // check User Verification by considering a malicious user might modify the result of calling WebAuthn API
-        boolean isUserVerificationRequired = policy.getUserVerificationRequirement().equals(WebAuthnConstants.OPTION_REQUIRED) == true ? true : false;
+        boolean isUserVerificationRequired = policy.getUserVerificationRequirement().equals(WebAuthnConstants.OPTION_REQUIRED);
 
         try {
             WebAuthnRegistrationContext registrationContext = new WebAuthnRegistrationContext(clientDataJSON, attestationObject, serverProperty, isUserVerificationRequired);

services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderConfig.java

@@ -103,7 +103,7 @@ public class OIDCIdentityProviderConfig extends OAuth2IdentityProviderConfig {
 
     public boolean isDisableUserInfoService() {
         String disableUserInfo = getConfig().get("disableUserInfo");
-        return disableUserInfo == null ? false : Boolean.valueOf(disableUserInfo);
+        return Boolean.parseBoolean(disableUserInfo);
     }
 
     public void setDisableUserInfoService(boolean disable) {

services/src/main/java/org/keycloak/credential/UserCredentialStoreManager.java

@@ -152,7 +152,7 @@ public class UserCredentialStoreManager implements UserCredentialManager, OnUser
         } else {
             if (user.getFederationLink() != null) {
                 UserStorageProvider provider = UserStorageManager.getStorageProvider(session, realm, user.getFederationLink());
-                if (provider != null && provider instanceof CredentialInputValidator) {
+                if (provider instanceof CredentialInputValidator) {
                     if (!UserStorageManager.isStorageProviderEnabled(realm, user.getFederationLink())) return false;
                     validate(realm, user, toValidate, ((CredentialInputValidator)provider));
                 }
@@ -205,7 +205,7 @@ public class UserCredentialStoreManager implements UserCredentialManager, OnUser
         } else {
             if (user.getFederationLink() != null) {
                 UserStorageProvider provider = UserStorageManager.getStorageProvider(session, realm, user.getFederationLink());
-                if (provider != null && provider instanceof CredentialInputUpdater) {
+                if (provider instanceof CredentialInputUpdater) {
                     if (!UserStorageManager.isStorageProviderEnabled(realm, user.getFederationLink())) return;
                     if (((CredentialInputUpdater) provider).updateCredential(realm, user, input)) return;
                 }
@@ -236,7 +236,7 @@ public class UserCredentialStoreManager implements UserCredentialManager, OnUser
         } else {
             if (user.getFederationLink() != null) {
                 UserStorageProvider provider = UserStorageManager.getStorageProvider(session, realm, user.getFederationLink());
-                if (provider != null && provider instanceof CredentialInputUpdater) {
+                if (provider instanceof CredentialInputUpdater) {
                     if (!UserStorageManager.isStorageProviderEnabled(realm, user.getFederationLink())) return;
                     ((CredentialInputUpdater) provider).disableCredentialType(realm, user, credentialType);
                 }
@@ -268,7 +268,7 @@ public class UserCredentialStoreManager implements UserCredentialManager, OnUser
         } else {
             if (user.getFederationLink() != null) {
                 UserStorageProvider provider = UserStorageManager.getStorageProvider(session, realm, user.getFederationLink());
-                if (provider != null && provider instanceof CredentialInputUpdater) {
+                if (provider instanceof CredentialInputUpdater) {
                     if (!UserStorageManager.isStorageProviderEnabled(realm, user.getFederationLink())) return Collections.EMPTY_SET;
                     types.addAll(((CredentialInputUpdater) provider).getDisableableCredentialTypes(realm, user));
                 }
@@ -298,7 +298,7 @@ public class UserCredentialStoreManager implements UserCredentialManager, OnUser
         } else {
             if (user.getFederationLink() != null) {
                 UserStorageProvider provider = UserStorageManager.getStorageProvider(session, realm, user.getFederationLink());
-                if (provider != null && provider instanceof CredentialInputValidator) {
+                if (provider instanceof CredentialInputValidator) {
                     if (!UserStorageManager.isStorageProviderEnabled(realm, user.getFederationLink())) return false;
                     if (((CredentialInputValidator) provider).isConfiguredFor(realm, user, type)) return true;
                 }

services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java

@@ -321,7 +321,7 @@ public class AuthorizationEndpoint extends AuthorizationEndpointBase {
             return false;
         }
         Matcher m = VALID_CODE_CHALLENGE_PATTERN.matcher(codeChallenge);
-        return m.matches() ? true : false;
+        return m.matches();
     }
 
     private Response checkParamsForPkceEnforcedClient(String codeChallengeMethod, String pkceCodeChallengeMethod, String codeChallenge) {

services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java

@@ -1203,7 +1203,7 @@ public class TokenEndpoint {
             return false;
         }
         Matcher m = VALID_CODE_VERIFIER_PATTERN.matcher(codeVerifier);
-        return m.matches() ? true : false;
+        return m.matches();
     }
 
     // https://tools.ietf.org/html/rfc7636#section-4.6

services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractUserRoleMappingMapper.java

@@ -115,7 +115,7 @@ abstract class AbstractUserRoleMappingMapper extends AbstractOIDCProtocolMapper
             if (i == length) {
                 // Case when we want to add to existing set of roles
                 Object last = jsonObject.get(component);
-                if (last != null && last instanceof Collection && attributeValue instanceof Collection) {
+                if (last instanceof Collection && attributeValue instanceof Collection) {
                     ((Collection) last).addAll((Collection) attributeValue);
                 } else {
                     jsonObject.put(component, attributeValue);

services/src/main/java/org/keycloak/protocol/saml/SamlService.java

@@ -347,7 +347,7 @@ public class SamlService extends AuthorizationEndpointBase {
                 SubjectType.STSubType subType = subject.getSubType();
                 if (subType != null) {
                     BaseIDAbstractType baseID = subject.getSubType().getBaseID();
-                    if (baseID != null && baseID instanceof NameIDType) {
+                    if (baseID instanceof NameIDType) {
                         NameIDType nameID = (NameIDType) baseID;
                         authSession.setClientNote(OIDCLoginProtocol.LOGIN_HINT_PARAM, nameID.getValue());
                     }
@@ -366,8 +366,7 @@ public class SamlService extends AuthorizationEndpointBase {
             }
 
             //If unset we fall back to default "false"
-            final boolean isPassive = (null == requestAbstractType.isIsPassive() ?
+            final boolean isPassive = (null != requestAbstractType.isIsPassive() && requestAbstractType.isIsPassive().booleanValue());
-                    false : requestAbstractType.isIsPassive().booleanValue());
             return newBrowserAuthentication(authSession, isPassive, redirectToAuthentication);
         }
 

services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java

@@ -104,7 +104,7 @@ public class HttpBasicAuthenticator implements Authenticator {
             if (authHeader.startsWith(BASIC_PREFIX)) {
                 final String[] split = authHeader.trim().split("\\s+");
 
-                if (split == null || split.length != 2) return null;
+                if (split.length != 2) return null;
 
                 credentials = split[1];
             }