(struts) 04/09: WW-5411 Delete deprecated methods from OgnlUtil

[kusal]

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch WW-5411-delete-deprecated-1
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 12ca9340164403de4f380177888447e38f04fecf
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 17:52:42 2024 +1000

    WW-5411 Delete deprecated methods from OgnlUtil
---
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java     | 102 ---------------------
 1 file changed, 102 deletions(-)

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 7bbe6e675..3bc6f2720 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -45,14 +45,8 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Pattern;
 
-import static com.opensymphony.xwork2.util.ConfigParseUtil.toClassesSet;
-import static com.opensymphony.xwork2.util.ConfigParseUtil.toNewPatternsSet;
-import static com.opensymphony.xwork2.util.ConfigParseUtil.toPackageNamesSet;
-import static java.util.Collections.emptySet;
 import static java.util.Objects.requireNonNull;
 import static org.apache.struts2.ognl.OgnlGuard.EXPR_BLOCKED;
 
@@ -156,106 +150,26 @@ public class OgnlUtil {
         this.devModeExcludedClasses = commaDelimitedClasses;
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    protected void setExcludedPackageNamePatterns(String 
commaDelimitedPackagePatterns) {
-        // Must be set directly on SecurityMemberAccess
-    }
-
     @Inject(value = 
StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAME_PATTERNS, required = 
false)
     protected void setDevModeExcludedPackageNamePatterns(String 
commaDelimitedPackagePatterns) {
         this.devModeExcludedPackageNamePatterns = 
commaDelimitedPackagePatterns;
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    protected void setExcludedPackageNames(String commaDelimitedPackageNames) {
-        // Must be set directly on SecurityMemberAccess
-    }
-
     @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAMES, 
required = false)
     protected void setDevModeExcludedPackageNames(String 
commaDelimitedPackageNames) {
         this.devModeExcludedPackageNames = commaDelimitedPackageNames;
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public void setExcludedPackageExemptClasses(String commaDelimitedClasses) {
-        // Must be set directly on SecurityMemberAccess
-    }
-
     @Inject(value = 
StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_EXEMPT_CLASSES, required = 
false)
     public void setDevModeExcludedPackageExemptClasses(String 
commaDelimitedClasses) {
         this.devModeExcludedPackageExemptClasses = commaDelimitedClasses;
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public Set<String> getExcludedClasses() {
-        return toClassesSet(container.getInstance(String.class, 
StrutsConstants.STRUTS_EXCLUDED_CLASSES));
-    }
-
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public Set<Pattern> getExcludedPackageNamePatterns() {
-        return toNewPatternsSet(emptySet(), 
container.getInstance(String.class, 
StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS));
-    }
-
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public Set<String> getExcludedPackageNames() {
-        return toPackageNamesSet(container.getInstance(String.class, 
StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAMES));
-    }
-
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public Set<String> getExcludedPackageExemptClasses() {
-        return toClassesSet(container.getInstance(String.class, 
StrutsConstants.STRUTS_EXCLUDED_PACKAGE_EXEMPT_CLASSES));
-    }
-
     @Inject
     protected void setContainer(Container container) {
         this.container = container;
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @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
-    }
-
     /**
      * @param maxLength Injects the Struts OGNL expression maximum length.
      */
@@ -275,22 +189,6 @@ public class OgnlUtil {
         }
     }
 
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public boolean isDisallowProxyMemberAccess() {
-        return BooleanUtils.toBoolean(container.getInstance(String.class, 
StrutsConstants.STRUTS_DISALLOW_PROXY_MEMBER_ACCESS));
-    }
-
-    /**
-     * @deprecated since 6.4.0, no replacement.
-     */
-    @Deprecated
-    public boolean isDisallowDefaultPackageAccess() {
-        return BooleanUtils.toBoolean(container.getInstance(String.class, 
StrutsConstants.STRUTS_DISALLOW_DEFAULT_PACKAGE_ACCESS));
-    }
-
     /**
      * Convenience mechanism to clear the OGNL Runtime Cache via OgnlUtil.  
May be utilized
      * by applications that generate many unique OGNL expressions over time.