Merge pull request #670 from sdutry/issue/WW-5251

WW-5251 remove deprecated interfaces related to ServletConfigInterceptor
apache · Mar 15, 2023 · bad445b · bad445b
2 parents 07c2e70 + 95a6dff
commit bad445b
Show file tree

Hide file tree

Showing 29 changed files with 118 additions and 935 deletions.
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
@@ -21,16 +21,17 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class ChatLoginAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
-	private Map session;
+	private Map<String, Object> session;
 
 	private String name;
 
@@ -60,8 +61,8 @@ public String execute() throws Exception {
 	}
 
 
-	// === SessionAware ===
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
@@ -21,17 +21,18 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class ChatLogoutAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
 
-	private Map session;
+	private Map<String, Object> session;
 
 
 	public ChatLogoutAction(ChatService chatService) {
@@ -50,8 +51,8 @@ public String execute() throws Exception {
 	}
 
 
-	// === SessionAware ===
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
@@ -21,16 +21,17 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class EnterRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private ChatService chatService;
-	private Map session;
+	private Map<String, Object> session;
 	private String roomName;
 
 	public String getRoomName() {
@@ -56,10 +57,9 @@ public String execute() throws Exception {
 		return SUCCESS;
 	}
 
-
-	// === SessionAware ===
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
@@ -21,17 +21,18 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class ExitRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
 
 	private String roomName;
 
-	private Map session;
+	private Map<String, Object> session;
 
 	public String getRoomName() {
 		return roomName;
@@ -54,9 +55,9 @@ public String execute() throws Exception {
 		return SUCCESS;
 	}
 
-	// === SessionAware ===
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
@@ -21,10 +21,11 @@
 package org.apache.struts2.showcase.chat;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class SendMessageToRoomAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 1L;
@@ -33,7 +34,7 @@ public class SendMessageToRoomAction extends ActionSupport implements SessionAwa
 
 	private String roomName;
 	private String message;
-	private Map session;
+	private Map<String, Object> session;
 
 
 	public SendMessageToRoomAction(ChatService chatService) {
@@ -67,9 +68,10 @@ public String execute() throws Exception {
 		return SUCCESS;
 	}
 
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 
 
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java
@@ -21,15 +21,16 @@
 package org.apache.struts2.showcase.hangman;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class GetUpdatedHangmanAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 5506025785406043027L;
 
-	private Map session;
+	private Map<String, Object> session;
 	private Hangman hangman;
 
 
@@ -45,15 +46,16 @@ public String execute() throws Exception {
 		return SUCCESS;
 	}
 
-	public void setSession(Map session) {
-		this.session = session;
-	}
-
 	public Hangman getHangman() {
 		return hangman;
 	}
 
 	public void setHangman(Hangman hangman) {
 		this.hangman = hangman;
 	}
+
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java
@@ -21,15 +21,16 @@
 package org.apache.struts2.showcase.hangman;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 public class GuessCharacterAction extends ActionSupport implements SessionAware {
 
 	private static final long serialVersionUID = 9050915577007590674L;
 
-	private Map session;
+	private Map<String, Object> session;
 	private Character character;
 	private Hangman hangman;
 
@@ -44,15 +45,16 @@ public Hangman getHangman() {
 		return hangman;
 	}
 
-	public void setSession(Map session) {
-		this.session = session;
-	}
-
 	public void setCharacter(Character character) {
 		this.character = character;
 	}
 
 	public Character getCharacter() {
 		return this.character;
 	}
+
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
@@ -21,10 +21,11 @@
 package org.apache.struts2.showcase.hangman;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
+import org.apache.struts2.action.SessionAware;
+
 import static org.apache.struts2.showcase.hangman.HangmanConstants.HANGMAN_SESSION_KEY;
 
 public class StartHangmanAction extends ActionSupport implements SessionAware {
@@ -33,7 +34,7 @@ public class StartHangmanAction extends ActionSupport implements SessionAware {
 
 	private HangmanService service;
 	private Hangman hangman;
-	private Map session;
+	private Map<String, Object> session;
 
 
 	public StartHangmanAction(HangmanService service) {
@@ -53,8 +54,8 @@ public Hangman getHangman() {
 	}
 
 
-	// === SessionAware ===
-	public void setSession(Map session) {
-		this.session = session;
-	}
+    @Override
+    public void withSession(Map<String, Object> session) {
+        this.session = session;
+    }
 }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
@@ -21,9 +21,11 @@
 package org.apache.struts2.showcase.xslt;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.ServletRequestAware;
 
 import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.action.ServletRequestAware;
+
 import java.util.Map;
 import java.util.Properties;
 
@@ -53,10 +55,6 @@ public HttpServletRequest getServletRequest() {
 		return servletRequest;
 	}
 
-	public void setServletRequest(HttpServletRequest servletRequest) {
-		this.servletRequest = servletRequest;
-	}
-
 	public Map<String, String> getEnvironment() {
 		return environment;
 	}
@@ -100,4 +98,9 @@ public void setSystemProperties(Properties systemProperties) {
 			this.systemProperties = systemProperties;
 		}
 	}
+
+    @Override
+    public void withServletRequest(HttpServletRequest request) {
+        this.servletRequest = request;
+    }
 }
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -18,15 +18,12 @@
  */
 package org.apache.struts2.dispatcher;
 
-import org.apache.struts2.interceptor.ParameterAware;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -81,10 +78,6 @@ public HttpParameters appendAll(Map<String, Parameter> newParams) {
         return this;
     }
 
-    public void applyParameters(ParameterAware parameterAware) {
-        parameterAware.setParameters(toMap());
-    }
-
     @Override
     public int size() {
         return parameters.size();

diff --git a/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java b/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java