WW-5343 Address SonarCloud code smells

apache · Nov 26, 2023 · 7929d86 · 7929d86
1 parent 85d2c74
commit 7929d86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 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
@@ -161,6 +161,7 @@ protected void setEnableEvalExpression(String evalExpression) {
      */
     @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 @@ protected void setDevModeExcludedClasses(String commaDelimitedClasses) {
      */
     @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 @@ protected void setDevModeExcludedPackageNamePatterns(String commaDelimitedPackag
      */
     @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 @@ protected void setDevModeExcludedPackageNames(String commaDelimitedPackageNames)
      */
     @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,20 +250,23 @@ protected void setContainer(Container container) {
      */
     @Deprecated
     protected void setAllowStaticFieldAccess(String allowStaticFieldAccess) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     /**
      * @deprecated since 6.4.0, no replacement.
      */
     @Deprecated
     protected void setDisallowProxyMemberAccess(String disallowProxyMemberAccess) {
+        // Must be set directly on SecurityMemberAccess
     }
 
     /**
      * @deprecated since 6.4.0, no replacement.
      */
     @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
@@ -34,6 +34,9 @@
 
 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
@@ -95,7 +95,8 @@ public void configurationCollectionsImmutable() throws Exception {
             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);
             }
         }