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 370776ab7bdc7c510df015005e987ddb9e0512dd
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 17:53:31 2024 +1000
WW-5411 Delete deprecated members from prepare filters
---
.../apache/struts2/dispatcher/InitOperations.java | 16 -------------
.../struts2/dispatcher/PrepareOperations.java | 20 +++-------------
.../filter/StrutsPrepareAndExecuteFilter.java | 27 +++++++---------------
.../dispatcher/filter/StrutsPrepareFilter.java | 21 ++++-------------
4 files changed, 16 insertions(+), 68 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
index f5cf21a91..6f37a6392 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java
@@ -22,9 +22,7 @@ import com.opensymphony.xwork2.ActionContext;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import java.util.regex.Pattern;
/**
* Contains initialization operations
@@ -90,18 +88,4 @@ public class InitOperations {
public void cleanup() {
ActionContext.clear();
}
-
- /**
- * Extract a list of patterns to exclude from request filtering
- *
- * @param dispatcher The dispatcher to check for exclude pattern
configuration
- * @return a List of Patterns for request to exclude if apply, or
<tt>null</tt>
- * @see org.apache.struts2.StrutsConstants#STRUTS_ACTION_EXCLUDE_PATTERN
- * @deprecated since 6.4.0, use {@link
Dispatcher#getActionExcludedPatterns()} instead.
- */
- @Deprecated
- public List<Pattern> buildExcludedPatternsList(Dispatcher dispatcher) {
- return dispatcher.getActionExcludedPatterns();
- }
-
}
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
index 01c04d6aa..e3262221b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
@@ -20,6 +20,9 @@ package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
@@ -27,13 +30,8 @@ import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
-import java.util.List;
-import java.util.regex.Pattern;
/**
* Contains preparation operations for a request before execution
@@ -230,18 +228,6 @@ public class PrepareOperations {
return
dispatcher.getActionExcludedPatterns().stream().anyMatch(pattern ->
pattern.matcher(uri).matches());
}
- /**
- * @deprecated since 6.4.0, use {@link #isUrlExcluded(HttpServletRequest)}
instead.
- */
- @Deprecated
- public boolean isUrlExcluded(HttpServletRequest request, List<Pattern>
excludedPatterns) {
- if (excludedPatterns == null) {
- return false;
- }
- String uri = RequestUtils.getUri(request);
- return excludedPatterns.stream().anyMatch(pattern ->
pattern.matcher(uri).matches());
- }
-
/**
* Set an override of the static devMode value. Do not set this via a
* request parameter or any other unprotected method. Using a signed
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
index 25b459812..c954f1c38 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
@@ -18,6 +18,14 @@
*/
package org.apache.struts2.dispatcher.filter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
@@ -28,17 +36,7 @@ import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.List;
-import java.util.regex.Pattern;
/**
* Handles both the preparation and execution phases of the Struts dispatching
process. This filter is better to use
@@ -51,13 +49,6 @@ public class StrutsPrepareAndExecuteFilter implements
StrutsStatics, Filter {
protected PrepareOperations prepare;
protected ExecuteOperations execute;
- /**
- * @deprecated since 6.4.0, use {@link
Dispatcher#getActionExcludedPatterns} or
- * {@link PrepareOperations#isUrlExcluded(HttpServletRequest)} instead.
- */
- @Deprecated
- protected List<Pattern> excludedPatterns;
-
public void init(FilterConfig filterConfig) throws ServletException {
InitOperations init = createInitOperations();
Dispatcher dispatcher = null;
@@ -69,8 +60,6 @@ public class StrutsPrepareAndExecuteFilter implements
StrutsStatics, Filter {
prepare = createPrepareOperations(dispatcher);
execute = createExecuteOperations(dispatcher);
- this.excludedPatterns = init.buildExcludedPatternsList(dispatcher);
-
postInit(dispatcher, filterConfig);
} finally {
if (dispatcher != null) {
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
index 0969617d7..02b4120d0 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
@@ -18,11 +18,6 @@
*/
package org.apache.struts2.dispatcher.filter;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.InitOperations;
-import org.apache.struts2.dispatcher.PrepareOperations;
-
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
@@ -31,9 +26,12 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.InitOperations;
+import org.apache.struts2.dispatcher.PrepareOperations;
+
import java.io.IOException;
-import java.util.List;
-import java.util.regex.Pattern;
/**
* Prepares the request for execution by a later {@link
org.apache.struts2.dispatcher.filter.StrutsExecuteFilter} filter instance.
@@ -44,13 +42,6 @@ public class StrutsPrepareFilter implements StrutsStatics,
Filter {
protected PrepareOperations prepare;
- /**
- * @deprecated since 6.4.0, use {@link
Dispatcher#getActionExcludedPatterns} or
- * {@link PrepareOperations#isUrlExcluded(HttpServletRequest)} instead.
- */
- @Deprecated
- protected List<Pattern> excludedPatterns;
-
public void init(FilterConfig filterConfig) throws ServletException {
InitOperations init = createInitOperations();
Dispatcher dispatcher = null;
@@ -60,8 +51,6 @@ public class StrutsPrepareFilter implements StrutsStatics,
Filter {
prepare = createPrepareOperations(dispatcher);
- this.excludedPatterns = init.buildExcludedPatternsList(dispatcher);
-
postInit(dispatcher, filterConfig);
} finally {
if (dispatcher != null) {
