From 7f178f6b45c469ce67005d3114f319cb4259be86 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Wed, 14 Jun 2023 16:42:55 +0300
Subject: [PATCH] RED-6686 - fixed PMD

---
 build.gradle.kts                                 | 16 ++++++++--------
 config/pmd/pmd.xml                               |  1 +
 config/pmd/test_pmd.xml                          |  2 ++
 .../service/GeneralConfigurationService.java     |  7 ++++---
 .../service/UserListingService.java              |  3 ++-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6ee9629..653f710 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("org.springframework.boot") version "3.0.6"
     id("io.spring.dependency-management") version "1.1.0"
     id("org.sonarqube") version "4.0.0.2929"
-//    pmd
+    pmd
     checkstyle
 }
 
@@ -15,13 +15,13 @@ configurations {
     }
 }
 
-//tasks.pmdMain{
-//    pmd.ruleSetFiles = files("${projectDir}/config/pmd/pmd.xml")
-//}
-//
-//tasks.pmdTest {
-//    pmd.ruleSetFiles = files("${projectDir}/config/pmd/test_pmd.xml")
-//}
+tasks.pmdMain{
+    pmd.ruleSetFiles = files("${projectDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${projectDir}/config/pmd/test_pmd.xml")
+}
 
 
 
diff --git a/config/pmd/pmd.xml b/config/pmd/pmd.xml
index 7dd492d..503991a 100644
--- a/config/pmd/pmd.xml
+++ b/config/pmd/pmd.xml
@@ -10,5 +10,6 @@
         <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
     </rule>
 </ruleset>
diff --git a/config/pmd/test_pmd.xml b/config/pmd/test_pmd.xml
index f510785..ac03639 100644
--- a/config/pmd/test_pmd.xml
+++ b/config/pmd/test_pmd.xml
@@ -10,5 +10,7 @@
         <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
     </rule>
 </ruleset>
diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/GeneralConfigurationService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/GeneralConfigurationService.java
index a85f47f..15bccbb 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/GeneralConfigurationService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/GeneralConfigurationService.java
@@ -35,18 +35,19 @@ public class GeneralConfigurationService {
         var realm = realmService.realm(TenantContext.getTenantId()).toRepresentation();
         var auxiliaryName = realm.getDisplayNameHtml();
 
+        String computedAuxiliaryName = null;
+
         if (!tenantUserManagementProperties.getApplicationName().equals(auxiliaryName)) {
 
             auxiliaryName = StringUtils.replaceOnce(auxiliaryName, tenantUserManagementProperties.getApplicationName(), "");
             auxiliaryName = StringUtils.replaceOnce(auxiliaryName, " (", "");
             auxiliaryName = StringUtils.reverse(StringUtils.replaceOnce(StringUtils.reverse(auxiliaryName), ")", ""));
 
-        } else {
-            auxiliaryName = null;
+            computedAuxiliaryName = auxiliaryName;
         }
 
         return GeneralConfigurationModel.builder()
-                .auxiliaryName(auxiliaryName)
+                .auxiliaryName(computedAuxiliaryName)
                 .displayName(realm.getDisplayNameHtml())
                 .forgotPasswordFunctionEnabled(realm.isResetPasswordAllowed() != null && realm.isResetPasswordAllowed())
                 .build();
diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserListingService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserListingService.java
index ac29af6..770844b 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserListingService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserListingService.java
@@ -3,6 +3,7 @@ package com.knecon.fforesight.tenantusermanagement.service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -39,7 +40,7 @@ public class UserListingService {
 
             Map<String, Set<String>> usersByRole = new HashMap<>();
             if (!allUsers.isEmpty()) {
-                var realmRoles = realm.roles().list().stream().map(r -> r.getName().toUpperCase()).collect(Collectors.toSet());
+                var realmRoles = realm.roles().list().stream().map(r -> r.getName().toUpperCase(Locale.ROOT)).collect(Collectors.toSet());
                 var allRoles = tenantUserManagementProperties.getKcRoleMapping().getAllRoles();
                 for (var role : allRoles) {
                     if (realmRoles.contains(role)) {