Merge pull request #981 from apache/WW-5411-delete-deprecated-1

WW-5411 Delete deprecated method/classes
apache · Jul 8, 2024 · 70b5d7c · 70b5d7c
2 parents b65005c + a3cc042
commit 70b5d7c
Show file tree

Hide file tree

Showing 39 changed files with 149 additions and 993 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -82,14 +82,6 @@ public XmlConfigurationProvider(String filename) {
         this.configFileName = filename;
     }
 
-    /**
-     * @deprecated since 6.2.0, use {@link #XmlConfigurationProvider(String)}
-     */
-    @Deprecated
-    public XmlConfigurationProvider(String filename, @Deprecated boolean notUsed) {
-        this(filename);
-    }
-
     @Override
     public void init(Configuration configuration) {
         super.init(configuration);

diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
@@ -465,7 +465,7 @@ protected void addAction(Element actionElement, PackageConfig.Builder packageCon
         Location location = DomHelper.getLocationObject(actionElement);
 
         if (!className.isEmpty()) {
-            verifyAction(className, name, location);
+            verifyAction(className, location);
         }
 
         Map<String, ResultConfig> results;
@@ -496,7 +496,7 @@ protected ActionConfig buildActionConfig(Element actionElement,
         String methodName = trimToNull(actionElement.getAttribute("method"));
 
         List<InterceptorMapping> interceptorList = buildInterceptorList(actionElement, packageContext);
-        List<ExceptionMappingConfig> exceptionMappings = buildExceptionMappings(actionElement, packageContext);
+        List<ExceptionMappingConfig> exceptionMappings = buildExceptionMappings(actionElement);
         Set<String> allowedMethods = buildAllowedMethods(actionElement, packageContext);
 
         return new ActionConfig.Builder(packageContext.getName(), actionName, className)
@@ -511,15 +511,6 @@ protected ActionConfig buildActionConfig(Element actionElement,
                 .build();
     }
 
-    /**
-     * @deprecated since 6.2.0, use {@link #verifyAction(String, Location)}
-     */
-    @Deprecated
-    protected boolean verifyAction(String className, String name, Location loc) {
-        verifyAction(className, loc);
-        return true;
-    }
-
     protected void verifyAction(String className, Location loc) {
         if (className.contains("{")) {
             LOG.debug("Action class [{}] contains a wildcard replacement value, so it can't be verified", className);
@@ -785,14 +776,6 @@ protected static String guessResultType(String type) {
         return sb.toString();
     }
 
-    /**
-     * @deprecated since 6.2.0, use {@link #buildExceptionMappings(Element)}
-     */
-    @Deprecated
-    protected List<ExceptionMappingConfig> buildExceptionMappings(Element element, PackageConfig.Builder packageContext) {
-        return buildExceptionMappings(element);
-    }
-
     /**
      * Build a list of exception mapping objects from below a given XML element.
      *
@@ -930,7 +913,7 @@ protected void loadGlobalExceptionMappings(PackageConfig.Builder packageContext,
 
         if (globalExceptionMappingList.getLength() > 0) {
             Element globalExceptionMappingElement = (Element) globalExceptionMappingList.item(0);
-            List<ExceptionMappingConfig> exceptionMappings = buildExceptionMappings(globalExceptionMappingElement, packageContext);
+            List<ExceptionMappingConfig> exceptionMappings = buildExceptionMappings(globalExceptionMappingElement);
             packageContext.addGlobalExceptionMappingConfigs(exceptionMappings);
         }
     }

diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java
@@ -30,13 +30,6 @@
 public class DefaultOgnlBeanInfoCacheFactory<Key, Value> extends DefaultOgnlCacheFactory<Key, Value>
     implements BeanInfoCacheFactory<Key, Value> {
 
-    /**
-     * @deprecated since 6.4.0, use {@link #DefaultOgnlBeanInfoCacheFactory(String, String)}
-     */
-    @Deprecated
-    public DefaultOgnlBeanInfoCacheFactory() {
-    }
-
     @Inject
     public DefaultOgnlBeanInfoCacheFactory(@Inject(value = StrutsConstants.STRUTS_OGNL_BEANINFO_CACHE_MAXSIZE) String cacheMaxSize,
                                            @Inject(value = StrutsConstants.STRUTS_OGNL_BEANINFO_CACHE_TYPE) String defaultCacheType) {

diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java
@@ -15,8 +15,6 @@
  */
 package com.opensymphony.xwork2.ognl;
 
-import org.apache.commons.lang3.BooleanUtils;
-
 /**
  * <p>Default OGNL Cache factory implementation.</p>
  *
@@ -30,18 +28,10 @@ public class DefaultOgnlCacheFactory<Key, Value> implements OgnlCacheFactory<Key
     private static final int DEFAULT_INIT_CAPACITY = 16;
     private static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
-    private CacheType defaultCacheType;
-    private int cacheMaxSize;
+    private final CacheType defaultCacheType;
+    private final int cacheMaxSize;
     private final int initialCapacity;
 
-    /**
-     * @deprecated since 6.4.0, use {@link #DefaultOgnlCacheFactory(int, CacheType)}
-     */
-    @Deprecated
-    public DefaultOgnlCacheFactory() {
-        this(10000, CacheType.BASIC);
-    }
-
     public DefaultOgnlCacheFactory(int cacheMaxSize, CacheType defaultCacheType) {
         this(cacheMaxSize, defaultCacheType, DEFAULT_INIT_CAPACITY);
     }
@@ -62,45 +52,20 @@ public OgnlCache<Key, Value> buildOgnlCache(int evictionLimit,
                                                 int initialCapacity,
                                                 float loadFactor,
                                                 CacheType cacheType) {
-        switch (cacheType) {
-            case BASIC:
-                return new OgnlDefaultCache<>(evictionLimit, initialCapacity, loadFactor);
-            case LRU:
-                return new OgnlLRUCache<>(evictionLimit, initialCapacity, loadFactor);
-            case WTLFU:
-                return new OgnlCaffeineCache<>(evictionLimit, initialCapacity);
-            default:
-                throw new IllegalArgumentException("Unknown cache type: " + cacheType);
-        }
+        return switch (cacheType) {
+            case BASIC -> new OgnlDefaultCache<>(evictionLimit, initialCapacity, loadFactor);
+            case LRU -> new OgnlLRUCache<>(evictionLimit, initialCapacity, loadFactor);
+            case WTLFU -> new OgnlCaffeineCache<>(evictionLimit, initialCapacity);
+        };
     }
 
     @Override
     public int getCacheMaxSize() {
         return cacheMaxSize;
     }
 
-    /**
-     * @deprecated since 6.4.0
-     */
-    @Deprecated
-    protected void setCacheMaxSize(String maxSize) {
-        cacheMaxSize = Integer.parseInt(maxSize);
-    }
-
     @Override
     public CacheType getDefaultCacheType() {
         return defaultCacheType;
     }
-
-    /**
-     * No effect when {@code useLRUMode} is {@code false}
-     *
-     * @deprecated since 6.4.0
-     */
-    @Deprecated
-    protected void setUseLRUCache(String useLRUMode) {
-        if (BooleanUtils.toBoolean(useLRUMode)) {
-            defaultCacheType = CacheType.LRU;
-        }
-    }
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java
@@ -30,13 +30,6 @@
 public class DefaultOgnlExpressionCacheFactory<Key, Value> extends DefaultOgnlCacheFactory<Key, Value>
         implements ExpressionCacheFactory<Key, Value> {
 
-    /**
-     * @deprecated since 6.4.0, use {@link #DefaultOgnlExpressionCacheFactory(String, String)}
-     */
-    @Deprecated
-    public DefaultOgnlExpressionCacheFactory() {
-    }
-
     @Inject
     public DefaultOgnlExpressionCacheFactory(@Inject(value = StrutsConstants.STRUTS_OGNL_EXPRESSION_CACHE_MAXSIZE) String cacheMaxSize,
                                              @Inject(value = StrutsConstants.STRUTS_OGNL_EXPRESSION_CACHE_TYPE) String defaultCacheType) {

diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java
@@ -25,22 +25,6 @@
 public interface OgnlCacheFactory<Key, Value> {
     OgnlCache<Key, Value> buildOgnlCache();
 
-    /**
-     * Note that if {@code lruCache} is {@code false}, the cache type could still be LRU if the default cache type is
-     * configured as such.
-     * @deprecated since 6.4.0, use {@link #buildOgnlCache(int, int, float, CacheType)}
-     */
-    @Deprecated
-    default OgnlCache<Key, Value> buildOgnlCache(int evictionLimit,
-                                                 int initialCapacity,
-                                                 float loadFactor,
-                                                 boolean lruCache) {
-        return buildOgnlCache(evictionLimit,
-                initialCapacity,
-                loadFactor,
-                lruCache ? CacheType.LRU : getDefaultCacheType());
-    }
-
     /**
      * @param evictionLimit   maximum capacity of the cache where applicable for cache type chosen
      * @param initialCapacity initial capacity of the cache where applicable for cache type chosen
@@ -52,14 +36,6 @@ default OgnlCache<Key, Value> buildOgnlCache(int evictionLimit,
 
     int getCacheMaxSize();
 
-    /**
-     * @deprecated since 6.4.0
-     */
-    @Deprecated
-    default boolean getUseLRUCache() {
-        return CacheType.LRU.equals(getDefaultCacheType());
-    }
-
     CacheType getDefaultCacheType();
 
     enum CacheType {