vBump

wso2 · Sep 6, 2023 · 51920d6 · 51920d6
1 parent ac224ba
commit 51920d6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/...rc/main/java/org/wso2/carbon/identity/api/server/configs/common/ConfigsServiceHolder.java b/...rc/main/java/org/wso2/carbon/identity/api/server/configs/common/ConfigsServiceHolder.java
@@ -116,6 +116,6 @@ public RemoteLoggingConfigService getRemoteLoggingConfigService() {
      */
     public void setRemoteLoggingConfigService(RemoteLoggingConfigService remoteLoggingConfigService) {
 
-        ConfigsServiceHolder.getInstance().remoteLoggingConfigService = remoteLoggingConfigService;
+        this.remoteLoggingConfigService = remoteLoggingConfigService;
     }
 }
diff --git a/...va/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java b/...va/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java
@@ -88,6 +88,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -485,7 +486,7 @@ public void resetRemoteServerConfig(String logType) {
 
         RemoteServerLoggerData remoteServerLoggerData = new RemoteServerLoggerData();
 
-        switch (logType.toUpperCase()) {
+        switch (logType.toUpperCase(Locale.ENGLISH)) {
             case Constants.AUDIT:
                 remoteServerLoggerData.setAuditLogType(true);
                 break;

diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml
@@ -121,4 +121,16 @@
             <Bug pattern="URF_UNREAD_FIELD"/>
         </Match>
     </FindBugsFilter>
+
+    <!--
+        The following exclusions added because the find bug issue is false positive.
+        while using "toUpperCase", ENGLISH locale is already specified to avoid  non-ASCII characters.
+    -->
+    <FindBugsFilter>
+        <Match>
+            <Class name="org.wso2.carbon.identity.api.server.configs.v1.core.ServerConfigManagementService" />
+            <Method name="resetRemoteServerConfig" />
+            <Bug pattern="IMPROPER_UNICODE" />
+        </Match>
+    </FindBugsFilter>
 </FindBugsFilter>
diff --git a/pom.xml b/pom.xml
@@ -719,7 +719,7 @@
         <carbon.multitenancy.version>4.9.10</carbon.multitenancy.version>
         <org.wso2.carbon.identity.remotefetch.version>0.7.12</org.wso2.carbon.identity.remotefetch.version>
         <org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.4.21</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
-        <org.wso2.carbon.logging.service.version>4.10.5</org.wso2.carbon.logging.service.version>
+        <org.wso2.carbon.logging.service.version>4.10.6</org.wso2.carbon.logging.service.version>
         <org.wso2.carbon.event.publisher.version>5.2.15</org.wso2.carbon.event.publisher.version>
         <identity.branding.preference.management.version>1.0.4</identity.branding.preference.management.version>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>