Merge pull request #2129 from georgekankava/staging/literal-boolean-v…

…alues-should-not-be-used-in-condition-expressions-fix-1

squid:S1125 - Literal boolean values should not be used in condition expressions

adapters/oidc/as7-eap6/as7-adapter-spi/src/main/java/org/keycloak/adapters/jbossweb/JBossWebPrincipalFactory.java

@@ -125,7 +125,7 @@ protected Group createGroup(String name, Set<Principal> principals) {
         Iterator<Principal> iter = principals.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            if ((next instanceof Group) == false)
+            if (!(next instanceof Group))
                 continue;
             Group grp = (Group) next;
             if (grp.getName().equals(name)) {

adapters/oidc/jetty/jetty9.1/src/main/java/org/keycloak/adapters/jetty/Jetty91RequestAuthenticator.java

@@ -24,7 +24,7 @@ protected String changeHttpSessionId(boolean create) {
         if (session == null) {
             return request.getSession(true).getId();
         }
-        if (deployment.isTurnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.isTurnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/oidc/jetty/jetty9.2/src/main/java/org/keycloak/adapters/jetty/Jetty92RequestAuthenticator.java

@@ -24,7 +24,7 @@ protected String changeHttpSessionId(boolean create) {
         if (session == null) {
             return request.getSession(true).getId();
         }
-        if (deployment.isTurnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.isTurnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/oidc/tomcat/tomcat8/src/main/java/org/keycloak/adapters/tomcat/Tomcat8RequestAuthenticator.java

@@ -22,7 +22,7 @@ protected String changeHttpSessionId(boolean create) {
         if (session == null) {
             return request.getSession(true).getId();
         }
-        if (deployment.isTurnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.isTurnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java

@@ -64,7 +64,7 @@ protected KeycloakUndertowAccount createAccount(KeycloakPrincipal<RefreshableKey
 
     @Override
     protected String changeHttpSessionId(boolean create) {
-        if (deployment.isTurnOffChangeSessionIdOnLogin() == false) return ChangeSessionId.changeSessionId(exchange, create);
+        if (!deployment.isTurnOffChangeSessionIdOnLogin()) return ChangeSessionId.changeSessionId(exchange, create);
         else return getHttpSessionId(create);
     }
 

adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java

@@ -89,7 +89,7 @@ protected static Group createGroup(String name, Set<Principal> principals) {
         Iterator<Principal> iter = principals.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            if ((next instanceof Group) == false)
+            if (!(next instanceof Group))
                 continue;
             Group grp = (Group) next;
             if (grp.getName().equals(name)) {

adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java

@@ -108,7 +108,7 @@ protected Group createGroup(String name, Set<Principal> principals) {
         Iterator<Principal> iter = principals.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            if ((next instanceof Group) == false)
+            if (!(next instanceof Group))
                 continue;
             Group grp = (Group) next;
             if (grp.getName().equals(name)) {

adapters/saml/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java

@@ -21,7 +21,7 @@ public Jetty9SamlSessionStore(Request request, AdapterSessionStore sessionStore,
     @Override
     protected String changeSessionId(HttpSession session) {
         Request request = this.request;
-        if (deployment.turnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.turnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/saml/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java

@@ -21,7 +21,7 @@ public Jetty9SamlSessionStore(Request request, AdapterSessionStore sessionStore,
     @Override
     protected String changeSessionId(HttpSession session) {
         Request request = this.request;
-        if (deployment.turnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.turnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/saml/tomcat/tomcat8/src/main/java/org/keycloak/adapters/saml/tomcat/Tomcat8SamlSessionStore.java

@@ -22,7 +22,7 @@ public Tomcat8SamlSessionStore(CatalinaUserSessionManagement sessionManagement,
     @Override
     protected String changeSessionId(Session session) {
         Request request = this.request;
-        if (deployment.turnOffChangeSessionIdOnLogin() == false) return request.changeSessionId();
+        if (!deployment.turnOffChangeSessionIdOnLogin()) return request.changeSessionId();
         else return session.getId();
     }
 }

adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java

@@ -165,7 +165,7 @@ public void saveAccount(SamlSession account) {
     }
 
     protected String changeSessionId(HttpSession session) {
-        if (deployment.turnOffChangeSessionIdOnLogin() == false) return ChangeSessionId.changeSessionId(exchange, false);
+        if (!deployment.turnOffChangeSessionIdOnLogin()) return ChangeSessionId.changeSessionId(exchange, false);
         else return session.getId();
     }
 

adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java

@@ -89,7 +89,7 @@ protected static Group createGroup(String name, Set<Principal> principals) {
         Iterator<Principal> iter = principals.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            if ((next instanceof Group) == false)
+            if (!(next instanceof Group))
                 continue;
             Group grp = (Group) next;
             if (grp.getName().equals(name)) {

adapters/spi/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java

@@ -30,7 +30,7 @@ public class KeycloakLoginModule extends AbstractServerLoginModule {
     @Override
     public boolean login() throws LoginException {
         log.debug("KeycloakLoginModule.login()");
-        if (super.login() == true) {
+        if (super.login()) {
             log.debug("super.login()==true");
             return true;
         }

adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/GenericPrincipalFactory.java

@@ -81,7 +81,7 @@ protected Group createGroup(String name, Set<Principal> principals) {
         Iterator<Principal> iter = principals.iterator();
         while (iter.hasNext()) {
             Object next = iter.next();
-            if ((next instanceof Group) == false)
+            if (!(next instanceof Group))
                 continue;
             Group grp = (Group) next;
             if (grp.getName().equals(name)) {

common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java

@@ -207,7 +207,7 @@ else if (PATH_SEPARATOR_ALIAS.equals(key))
         }
 
         // No properties
-        if (properties == false)
+        if (!properties)
             return string;
 
         // Collect the trailing characters

saml-core/src/main/java/org/keycloak/saml/common/util/StringUtil.java

@@ -130,7 +130,7 @@ public static String getSystemPropertyAsString(String str) {
      * @param second
      */
     public static void match(String first, String second) {
-        if (first.equals(second) == false)
+        if (!first.equals(second))
             throw logger.notEqualError(first, second);
     }
 

saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java

@@ -191,7 +191,7 @@ private static class PicketLinkStaxToDOMTransformer extends Transformer {
         public void transform(Source xmlSource, Result outputTarget) throws TransformerException {
             if (!(xmlSource instanceof StAXSource))
                 throw logger.wrongTypeError("xmlSource should be a stax source");
-            if (outputTarget instanceof DOMResult == false)
+            if (!(outputTarget instanceof DOMResult))
                 throw logger.wrongTypeError("outputTarget should be a dom result");
 
             String rootTag = null;
@@ -208,7 +208,7 @@ public void transform(Source xmlSource, Result outputTarget) throws TransformerE
 
             try {
                 XMLEvent xmlEvent = StaxParserUtil.getNextEvent(xmlEventReader);
-                if (xmlEvent instanceof StartElement == false)
+                if (!(xmlEvent instanceof StartElement))
                     throw new TransformerException(ErrorCodes.WRITER_SHOULD_START_ELEMENT);
 
                 StartElement rootElement = (StartElement) xmlEvent;

saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java

@@ -167,7 +167,7 @@ public static AttributeStatementType createAttributeStatement(List<String> roles
      * @return
      */
     public static AttributeStatementType createAttributeStatementForRoles(List<String> roles, boolean multivalued) {
-        if (multivalued == false) {
+        if (!multivalued) {
             return createAttributeStatement(roles);
         }
         AttributeStatementType attrStatement = new AttributeStatementType();

saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXPValidationUtil.java

@@ -136,7 +136,7 @@ private static class CustomErrorHandler implements ErrorHandler {
 
         public void error(SAXParseException ex) throws SAXException {
             logException(ex);
-            if (ex.getMessage().contains("null") == false) {
+            if (!ex.getMessage().contains("null")) {
                 throw ex;
             }
         }