Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #671 from sdutry/issue/WW-5253

Browse Source 
WW-5253 Remove deprecated methods from DefaultUrlHelper
This commit is contained in:
Lukasz Lenart
2023-03-15 08:48:40 +01:00
committed by GitHub
parent b5e7b43988 61dec7e185
commit 07c2e70b90
3 changed files with 0 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
-90
View File
@@ -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<String, Object> 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<String, Object> 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<String, Object> 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);
}
/**
* Decodes the URL using {@link UrlDecoder#decode(String, boolean)} with the encoding specified in the configuration.
*
* @param input the input to decode
* @param isQueryString whether input is a query string. If <code>true</code> other decoding rules apply.
* @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, boolean isQueryString) {
return decoder.decode(input, isQueryString);
}
/**
* @deprecated since 6.1.0, use {@link QueryStringParser} directly, use {@link Inject} to inject a proper instance
*/
@Deprecated
public Map<String, Object> parseQueryString(String queryString, boolean forceValueArray) {
return this.queryStringParser.parse(queryString, forceValueArray);
}
}
core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
-16
View File
@@ -18,10 +18,6 @@
*/
package org.apache.struts2.views.util;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.url.QueryStringBuilder;
import org.apache.struts2.url.QueryStringParser;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@@ -54,16 +50,4 @@ public interface UrlHelper {
String buildUrl(String action, HttpServletRequest request, HttpServletResponse response, Map<String, Object> params, String scheme,
boolean includeContext, boolean encodeResult, boolean forceAddSchemeHostAndPort, boolean escapeAmp);
/**
* @deprecated since Struts 6.1.0, use {@link QueryStringBuilder} instead
*/
@Deprecated
void buildParametersString(Map<String, Object> params, StringBuilder link, String paramSeparator);
/**
* @deprecated since 6.1.0, use {@link QueryStringParser} directly, use {@link Inject} to inject a proper instance
*/
@Deprecated
Map<String, Object> parseQueryString(String queryString, boolean forceValueArray);
}
core/src/test/java/org/apache/struts2/views/util/DefaultUrlHelperTest.java
-3
View File
@@ -24,7 +24,6 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Scope.Strategy;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.url.StrutsQueryStringBuilder;
import org.apache.struts2.url.StrutsUrlDecoder;
import org.apache.struts2.url.StrutsUrlEncoder;
import javax.servlet.http.HttpServletRequest;
@@ -346,8 +345,6 @@ public class DefaultUrlHelperTest extends StrutsInternalTestCase {
urlHelper = new DefaultUrlHelper();
StrutsUrlEncoder encoder = new StrutsUrlEncoder();
urlHelper.setQueryStringBuilder(new StrutsQueryStringBuilder(encoder));
urlHelper.setEncoder(encoder);
urlHelper.setDecoder(new StrutsUrlDecoder());
}
static class StubContainer implements Container {