From 7929d8634c58b60709db1133e8a6d42a30c2827f Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sun, 26 Nov 2023 17:02:34 +1100
Subject: [PATCH] WW-5343 Address SonarCloud code smells

---
 .../main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java   | 7 +++++++
 .../java/com/opensymphony/xwork2/util/ConfigParseUtil.java | 3 +++
 .../opensymphony/xwork2/ognl/SecurityMemberAccessTest.java | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index de81c2685..a9e3045cc 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -161,6 +161,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setExcludedClasses(String commaDelimitedClasses) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_CLASSES, required = false)
@@ -173,6 +174,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setExcludedPackageNamePatterns(String commaDelimitedPackagePatterns) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAME_PATTERNS, required = false)
@@ -185,6 +187,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setExcludedPackageNames(String commaDelimitedPackageNames) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAMES, required = false)
@@ -197,6 +200,7 @@ public class OgnlUtil {
      */
     @Deprecated
     public void setExcludedPackageExemptClasses(String commaDelimitedClasses) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_EXEMPT_CLASSES, required = false)
@@ -246,6 +250,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setAllowStaticFieldAccess(String allowStaticFieldAccess) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     /**
@@ -253,6 +258,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setDisallowProxyMemberAccess(String disallowProxyMemberAccess) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     /**
@@ -260,6 +266,7 @@ public class OgnlUtil {
      */
     @Deprecated
     protected void setDisallowDefaultPackageAccess(String disallowDefaultPackageAccess) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     /**
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java b/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java
index 53475b7a8..8debd07db 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java
@@ -34,6 +34,9 @@ import static org.apache.commons.lang3.StringUtils.strip;
 
 public class ConfigParseUtil {
 
+    private ConfigParseUtil() {
+    }
+
     public static Set<String> toClassesSet(String newDelimitedClasses) throws ConfigurationException {
         Set<String> classNames = commaDelimitedStringToSet(newDelimitedClasses);
         validateClasses(classNames, OgnlUtil.class.getClassLoader());
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 7d3f04fc7..3549ed27f 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -95,7 +95,8 @@ public class SecurityMemberAccessTest {
             Collection<String> fieldVal = reflectField(field);
             assertThrows(UnsupportedOperationException.class, () -> fieldVal.add("foo"));
             if (!fieldVal.isEmpty()) {
-                assertThrows(UnsupportedOperationException.class, () -> fieldVal.remove(fieldVal.iterator().next()));
+                String firstVal = fieldVal.iterator().next();
+                assertThrows(UnsupportedOperationException.class, () -> fieldVal.remove(firstVal));
                 assertThrows(UnsupportedOperationException.class, fieldVal::clear);
             }
         }