diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java index 1a11b06bf3..d750bc80c6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java @@ -33,7 +33,11 @@ /** * Extended version of {@link RestfulActionMapper}, see documentation for more details * Restful2ActionMapper + * + * @deprecated since 6.12.0, this legacy mapper predates the Struts REST plugin, which is the maintained + * way to build REST-style applications with Struts. Scheduled for removal in the next major release. */ +@Deprecated public class Restful2ActionMapper extends DefaultActionMapper { private static final Logger LOG = LogManager.getLogger(Restful2ActionMapper.class); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java index 1709834a13..81b259cad6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java @@ -34,7 +34,11 @@ * Simple Restfull Action Mapper to support REST application * See docs for more information * RestfulActionMapper + * + * @deprecated since 6.12.0, this legacy mapper predates the Struts REST plugin, which is the maintained + * way to build REST-style applications with Struts. Scheduled for removal in the next major release. */ +@Deprecated public class RestfulActionMapper implements ActionMapper { protected static final Logger LOG = LogManager.getLogger(RestfulActionMapper.class); diff --git a/core/src/main/resources/struts-beans.xml b/core/src/main/resources/struts-beans.xml index 878692bdf6..1d7bc103c8 100644 --- a/core/src/main/resources/struts-beans.xml +++ b/core/src/main/resources/struts-beans.xml @@ -79,6 +79,8 @@ class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper"/> +