[struts] branch master updated: WW-5243 remove deprecated action prefix cross namespaces
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 8b4f070d7 WW-5243 remove deprecated action prefix cross namespaces
new b5e7b4398 Merge pull request #669 from sdutry/issue/WW-5243
8b4f070d7 is described below
commit 8b4f070d7c60c8fecad2dc09661d5c3a84529fb1
Author: Stefaan Dutry
AuthorDate: Mon Mar 13 23:07:45 2023 +0100
WW-5243 remove deprecated action prefix cross namespaces
---
.../java/org/apache/struts2/StrutsConstants.java | 7 -
.../struts2/config/entities/ConstantConfig.java| 1 -
.../dispatcher/mapper/DefaultActionMapper.java | 15 ++
.../dispatcher/mapper/DefaultActionMapperTest.java | 33 --
4 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index dc5720b71..a5537727c 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -401,13 +401,6 @@ public final class StrutsConstants {
/** Enables action: prefix */
public static final String STRUTS_MAPPER_ACTION_PREFIX_ENABLED =
"struts.mapper.action.prefix.enabled";
-/**
- * Enables access to actions in other namespaces than current with action:
prefix
- * @deprecated it will be removed soon, please refactor your application
- */
-@Deprecated
-public static final String STRUTS_MAPPER_ACTION_PREFIX_CROSSNAMESPACES =
"struts.mapper.action.prefix.crossNamespaces";
-
public static final String DEFAULT_TEMPLATE_TYPE_CONFIG_KEY =
"struts.ui.templateSuffix";
/** Allows override default DispatcherErrorHandler */
diff --git
a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
index 107f35e51..49a6e4127 100644
--- a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
+++ b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
@@ -252,7 +252,6 @@ public class ConstantConfig {
map.put(StrutsConstants.STRUTS_ALLOWED_METHOD_NAMES,
Objects.toString(allowedMethodNames, null));
map.put(StrutsConstants.STRUTS_DEFAULT_METHOD_NAME, defaultMethodName);
map.put(StrutsConstants.STRUTS_MAPPER_ACTION_PREFIX_ENABLED,
Objects.toString(mapperActionPrefixEnabled, null));
-map.put(StrutsConstants.STRUTS_MAPPER_ACTION_PREFIX_CROSSNAMESPACES,
Objects.toString(mapperActionPrefixCrossNamespaces, null));
map.put(StrutsConstants.DEFAULT_TEMPLATE_TYPE_CONFIG_KEY,
uiTemplateSuffix);
map.put(StrutsConstants.STRUTS_DISPATCHER_ERROR_HANDLER,
beanConfToString(dispatcherErrorHandler));
map.put(StrutsConstants.STRUTS_EXCLUDED_CLASSES,
classesToString(excludedClasses));
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index bcdd4c3d1..96dae07c4 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -132,7 +132,6 @@ public class DefaultActionMapper implements ActionMapper {
protected String defaultMethodName = "execute";
private boolean allowActionPrefix = false;
-private boolean allowActionCrossNamespaceAccess = false;
protected List extensions = new ArrayList() {{
add("action");
@@ -162,12 +161,12 @@ public class DefaultActionMapper implements ActionMapper {
}
}
String actionName = cleanupActionName(name);
-if (allowSlashesInActionNames &&
!allowActionCrossNamespaceAccess) {
+if (allowSlashesInActionNames) {
if (actionName.startsWith("/")) {
actionName = actionName.substring(1);
}
}
-if (!allowSlashesInActionNames &&
!allowActionCrossNamespaceAccess) {
+if (!allowSlashesInActionNames) {
if (actionName.lastIndexOf('/') != -1) {
actionName =
actionName.substring(actionName.lastIndexOf('/') + 1);
}
@@ -241,16 +240,6 @@ public class DefaultActionMapper implements ActionMapper {
this.allowActionPrefix = BooleanUtils.toBoolean(allowActionPrefix);
}
-/**
- * @deprecated since 6.1.0 - please refactor your application to avoid
using this functionality
- * @param allowActionCrossNa
[struts] branch master updated: WW-5253 Remove deprecated methods from DefaultUrlHelper
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 61dec7e18 WW-5253 Remove deprecated methods from DefaultUrlHelper
new 07c2e70b9 Merge pull request #671 from sdutry/issue/WW-5253
61dec7e18 is described below
commit 61dec7e1851237699fcb5fecd48b32207dcb27ae
Author: Stefaan Dutry
AuthorDate: Tue Mar 14 23:52:12 2023 +0100
WW-5253 Remove deprecated methods from DefaultUrlHelper
---
.../struts2/views/util/DefaultUrlHelper.java | 90 --
.../org/apache/struts2/views/util/UrlHelper.java | 16
.../struts2/views/util/DefaultUrlHelperTest.java | 3 -
3 files changed, 109 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
index bb072c82b..6cf82c7d9 100644
--- a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
@@ -25,9 +25,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.url.QueryStringBuilder;
-import org.apache.struts2.url.QueryStringParser;
-import org.apache.struts2.url.UrlDecoder;
-import org.apache.struts2.url.UrlEncoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -47,9 +44,6 @@ public class DefaultUrlHelper implements UrlHelper {
private int httpsPort = DEFAULT_HTTPS_PORT;
private QueryStringBuilder queryStringBuilder;
-private QueryStringParser queryStringParser;
-private UrlEncoder encoder;
-private UrlDecoder decoder;
@Inject(StrutsConstants.STRUTS_URL_HTTP_PORT)
public void setHttpPort(String httpPort) {
@@ -61,26 +55,11 @@ public class DefaultUrlHelper implements UrlHelper {
this.httpsPort = Integer.parseInt(httpsPort);
}
-@Inject
-public void setEncoder(UrlEncoder encoder) {
-this.encoder = encoder;
-}
-
-@Inject
-public void setDecoder(UrlDecoder decoder) {
-this.decoder = decoder;
-}
-
@Inject
public void setQueryStringBuilder(QueryStringBuilder builder) {
this.queryStringBuilder = builder;
}
-@Inject
-public void setQueryStringParser(QueryStringParser queryStringParser) {
-this.queryStringParser = queryStringParser;
-}
-
public String buildUrl(String action, HttpServletRequest request,
HttpServletResponse response, Map params) {
return buildUrl(action, request, response, params, null, true, true);
}
@@ -206,77 +185,8 @@ public class DefaultUrlHelper implements UrlHelper {
}
}
-/**
- * Builds parameters assigned to url - a query string
- * @param params a set of params to assign
- * @param link a based url
- * @param paramSeparator separator used
- * @deprecated since Struts 6.1.0, use {@link QueryStringBuilder} instead
- */
-@Deprecated
-public void buildParametersString(Map params,
StringBuilder link, String paramSeparator) {
-queryStringBuilder.build(params, link, paramSeparator);
-}
-
-/**
- * Builds parameters assigned to url - a query string
- * @param params a set of params to assign
- * @param link a based url
- * @param paramSeparator separator used
- * @param encode if true, parameters will be encoded - ignored
- * @deprecated since Struts 6.1.0, use {@link #buildParametersString(Map,
StringBuilder, String)}
- */
-@Deprecated
-public void buildParametersString(Map params,
StringBuilder link, String paramSeparator, boolean encode) {
-buildParametersString(params, link, paramSeparator);
-}
-
protected boolean isValidScheme(String scheme) {
return HTTP_PROTOCOL.equals(scheme) || HTTPS_PROTOCOL.equals(scheme);
}
-/**
- * Encodes the URL using {@link UrlEncoder#encode} with the encoding
specified in the configuration.
- *
- * @param input the input to encode
- * @return the encoded string
- * @deprecated since 6.1.0, use {@link UrlEncoder} directly, use {@link
Inject} to inject a proper instance
- */
-@Deprecated
-public String encode(String input) {
-return encoder.encode(input);
-}
-
-/**
- * Decodes the URL using {@link UrlDecoder#decode(String, boolean)} with
the encoding specified in the configuration.
- *
- * @param input the input to decode
- * @return the encoded string
- * @deprecated since 6.1.0, use {@link UrlDecoder} directly, use {@link
Inject} to inject a proper instance
- */
-@Deprecated
-public String decode(String input) {
-return decoder.decode(input, false);
-
[struts] branch master updated: WW-5251 remove deprecated interfaces related to ServletConfigInterceptor
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 95a6dff1f WW-5251 remove deprecated interfaces related to
ServletConfigInterceptor
new bad445ba3 Merge pull request #670 from sdutry/issue/WW-5251
95a6dff1f is described below
commit 95a6dff1f570cfa6d4c0775567a72a9b630abc6d
Author: Stefaan Dutry
AuthorDate: Tue Mar 14 00:04:32 2023 +0100
WW-5251 remove deprecated interfaces related to ServletConfigInterceptor
---
.../struts2/showcase/chat/ChatLoginAction.java | 13 +-
.../struts2/showcase/chat/ChatLogoutAction.java| 13 +-
.../struts2/showcase/chat/EnterRoomAction.java | 14 +-
.../struts2/showcase/chat/ExitRoomAction.java | 13 +-
.../showcase/chat/SendMessageToRoomAction.java | 12 +-
.../showcase/hangman/GetUpdatedHangmanAction.java | 14 +-
.../showcase/hangman/GuessCharacterAction.java | 14 +-
.../showcase/hangman/StartHangmanAction.java | 13 +-
.../apache/struts2/showcase/xslt/JVMAction.java| 13 +-
.../apache/struts2/dispatcher/HttpParameters.java | 7 -
.../struts2/interceptor/ApplicationAware.java | 45 -
.../struts2/interceptor/HttpParametersAware.java | 49 --
.../apache/struts2/interceptor/ParameterAware.java | 50 --
.../apache/struts2/interceptor/PrincipalAware.java | 38
.../apache/struts2/interceptor/RequestAware.java | 46 -
.../interceptor/ServletConfigInterceptor.java | 85 ++---
.../struts2/interceptor/ServletRequestAware.java | 49 --
.../struts2/interceptor/ServletResponseAware.java | 47 -
.../apache/struts2/interceptor/SessionAware.java | 47 -
.../apache/struts2/util/ServletContextAware.java | 36
.../interceptor/ServletConfigInterceptorTest.java | 192 ++---
.../dispatcher/DirectRenderFromEventAction.java| 10 +-
.../interceptor/PortletAwareInterceptor.java | 50 ++
.../portlet/interceptor/PortletContextAware.java | 34
.../interceptor/PortletPreferencesAware.java | 42 -
.../portlet/interceptor/PortletRequestAware.java | 35
.../portlet/interceptor/PortletResponseAware.java | 35
.../interceptor/PortletAwareInterceptorTest.java | 31 +---
.../interceptor/PortletStateInterceptorTest.java | 6 +-
29 files changed, 118 insertions(+), 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
index a5fc15e73..0dcfd8943 100644
---
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 session;
private String name;
@@ -60,8 +61,8 @@ public class ChatLoginAction extends ActionSupport implements
SessionAware {
}
- // === SessionAware ===
- public void setSession(Map session) {
- this.session = session;
- }
+@Override
+public void withSession(Map 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
index d0c3e6ba6..452ce0d08 100644
---
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 session;
public ChatLogoutAction(ChatService chatService) {
@@ -50,8 +51,8 @@ public class ChatLogoutAction extends ActionSupport
implements SessionAware {
}
- // === SessionAware ===
- public void setSession(Map session) {
- this.session = session;
- }
+@Override
+public void withSess
