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 1b8e7ac824d4955adc368319799777e661f9d805
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 17:54:54 2024 +1000
WW-5411 Delete misc deprecated methods from 6.2.0
---
.../config/providers/XmlConfigurationProvider.java | 8 --------
.../providers/XmlDocConfigurationProvider.java | 23 +++-------------------
.../config/StrutsXmlConfigurationProvider.java | 10 +---------
.../org/apache/struts2/dispatcher/Dispatcher.java | 16 ++++-----------
4 files changed, 8 insertions(+), 49 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 4591a1b59..088cf24dd 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -82,14 +82,6 @@ public abstract class XmlConfigurationProvider extends
XmlDocConfigurationProvid
this.configFileName = filename;
}
- /**
- * @deprecated since 6.2.0, use {@link #XmlConfigurationProvider(String)}
- */
- @Deprecated
- public XmlConfigurationProvider(String filename, @Deprecated boolean
notUsed) {
- this(filename);
- }
-
@Override
public void init(Configuration configuration) {
super.init(configuration);
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
index 6de202460..46fc72142 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
@@ -465,7 +465,7 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
Location location = DomHelper.getLocationObject(actionElement);
if (!className.isEmpty()) {
- verifyAction(className, name, location);
+ verifyAction(className, location);
}
Map<String, ResultConfig> results;
@@ -496,7 +496,7 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
String methodName = trimToNull(actionElement.getAttribute("method"));
List<InterceptorMapping> interceptorList =
buildInterceptorList(actionElement, packageContext);
- List<ExceptionMappingConfig> exceptionMappings =
buildExceptionMappings(actionElement, packageContext);
+ List<ExceptionMappingConfig> exceptionMappings =
buildExceptionMappings(actionElement);
Set<String> allowedMethods = buildAllowedMethods(actionElement,
packageContext);
return new ActionConfig.Builder(packageContext.getName(), actionName,
className)
@@ -511,15 +511,6 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
.build();
}
- /**
- * @deprecated since 6.2.0, use {@link #verifyAction(String, Location)}
- */
- @Deprecated
- protected boolean verifyAction(String className, String name, Location
loc) {
- verifyAction(className, loc);
- return true;
- }
-
protected void verifyAction(String className, Location loc) {
if (className.contains("{")) {
LOG.debug("Action class [{}] contains a wildcard replacement
value, so it can't be verified", className);
@@ -785,14 +776,6 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
return sb.toString();
}
- /**
- * @deprecated since 6.2.0, use {@link #buildExceptionMappings(Element)}
- */
- @Deprecated
- protected List<ExceptionMappingConfig> buildExceptionMappings(Element
element, PackageConfig.Builder packageContext) {
- return buildExceptionMappings(element);
- }
-
/**
* Build a list of exception mapping objects from below a given XML
element.
*
@@ -930,7 +913,7 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
if (globalExceptionMappingList.getLength() > 0) {
Element globalExceptionMappingElement = (Element)
globalExceptionMappingList.item(0);
- List<ExceptionMappingConfig> exceptionMappings =
buildExceptionMappings(globalExceptionMappingElement, packageContext);
+ List<ExceptionMappingConfig> exceptionMappings =
buildExceptionMappings(globalExceptionMappingElement);
packageContext.addGlobalExceptionMappingConfigs(exceptionMappings);
}
}
diff --git
a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
index 51dded4cf..3ea6dbabb 100644
---
a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
+++
b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
@@ -25,10 +25,10 @@ import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.inject.Context;
import com.opensymphony.xwork2.inject.Factory;
import com.opensymphony.xwork2.util.location.LocatableProperties;
+import jakarta.servlet.ServletContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import jakarta.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -105,14 +105,6 @@ public class StrutsXmlConfigurationProvider extends
XmlConfigurationProvider {
}
}
- /**
- * @deprecated since 6.2.0, use {@link
#StrutsXmlConfigurationProvider(String, ServletContext)}
- */
- @Deprecated
- public StrutsXmlConfigurationProvider(String filename, @Deprecated boolean
errorIfMissing, ServletContext ctx) {
- this(filename, ctx);
- }
-
/* (non-Javadoc)
* @see
com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#register(com.opensymphony.xwork2.inject.ContainerBuilder,
java.util.Properties)
*/
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 6d21ef693..55b397817 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -48,6 +48,10 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.location.Location;
import com.opensymphony.xwork2.util.location.LocationUtils;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -72,10 +76,6 @@ import org.apache.struts2.ognl.ThreadAllowlist;
import org.apache.struts2.util.ObjectFactoryDestroyable;
import org.apache.struts2.util.fs.JBossFileManager;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
@@ -551,14 +551,6 @@ public class Dispatcher {
return new StrutsXmlConfigurationProvider(filename, ctx);
}
- /**
- * @deprecated since 6.2.0, use {@link
#createStrutsXmlConfigurationProvider(String, ServletContext)}
- */
- @Deprecated
- protected XmlConfigurationProvider
createStrutsXmlConfigurationProvider(String filename, boolean errorIfMissing,
ServletContext ctx) {
- return createStrutsXmlConfigurationProvider(filename, ctx);
- }
-
private void init_JavaConfigurations() {
String configClasses = initParams.get("javaConfigClasses");
if (configClasses != null) {
