Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WW-5251 remove deprecated interfaces related to ServletConfigInterceptor #670

Merged
merged 1 commit into from
Mar 15, 2023
Merged

WW-5251 remove deprecated interfaces related to ServletConfigInterceptor #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
}
13 changes: 7 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}
}
14 changes: 7 additions & 7 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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;
}

}
13 changes: 7 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

}
12 changes: 7 additions & 5 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
}


}
14 changes: 8 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand All @@ -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;
}
}
14 changes: 8 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
}
13 changes: 7 additions & 6 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand All @@ -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;
}
}
13 changes: 8 additions & 5 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -53,10 +55,6 @@ public HttpServletRequest getServletRequest() {
return servletRequest;
}

public void setServletRequest(HttpServletRequest servletRequest) {
this.servletRequest = servletRequest;
}

public Map<String, String> getEnvironment() {
return environment;
}
Expand Down Expand Up @@ -100,4 +98,9 @@ public void setSystemProperties(Properties systemProperties) {
this.systemProperties = systemProperties;
}
}

@Override
public void withServletRequest(HttpServletRequest request) {
this.servletRequest = request;
}
}
7 changes: 0 additions & 7 deletions core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
45 changes: 0 additions & 45 deletions core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java
View file
Open in desktop

This file was deleted.

Loading