diff --git a/core/pom.xml b/core/pom.xml index 1bf48c005..a41bbd82d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -89,8 +89,7 @@ true - - + @@ -181,8 +180,8 @@ - org.apache.struts - struts2-freemarker-jakarta + org.apache.struts + struts2-freemarker-jakarta 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 93e8884b7..d198e909b 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 @@ -44,7 +44,7 @@ public class Restful2ActionMapper extends DefaultActionMapper { private UrlDecoder decoder; public Restful2ActionMapper() { - setSlashesInActionNames("true"); + setSlashesInActionNames("true"); } @Inject @@ -58,9 +58,9 @@ public class Restful2ActionMapper extends DefaultActionMapper { * @see org.apache.struts2.dispatcher.mapper.ActionMapper#getMapping(jakarta.servlet.http.HttpServletRequest) */ public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager configManager) { - if (!isSlashesInActionNames()) { - throw new IllegalStateException("This action mapper requires the setting 'slashesInActionNames' to be set to 'true'"); - } + if (!isSlashesInActionNames()) { + throw new IllegalStateException("This action mapper requires the setting 'slashesInActionNames' to be set to 'true'"); + } ActionMapping mapping = super.getMapping(request, configManager); if (mapping == null) { @@ -113,7 +113,7 @@ public class Restful2ActionMapper extends DefaultActionMapper { } if (idParameterName != null && lastSlashPos > -1) { - actionName = actionName.substring(0, lastSlashPos); + actionName = actionName.substring(0, lastSlashPos); } } @@ -156,7 +156,7 @@ public class Restful2ActionMapper extends DefaultActionMapper { mapping.getParams().putAll(parameters); } } catch (Exception e) { - LOG.warn("Unable to determine parameters from the url", e); + LOG.warn("Unable to determine parameters from the url", e); } mapping.setName(actionName.substring(actionSlashPos+1)); } @@ -189,12 +189,12 @@ public class Restful2ActionMapper extends DefaultActionMapper { } } - public String getIdParameterName() { - return idParameterName; - } + public String getIdParameterName() { + return idParameterName; + } - @Inject(required=false,value=StrutsConstants.STRUTS_ID_PARAMETER_NAME) - public void setIdParameterName(String idParameterName) { - this.idParameterName = idParameterName; - } + @Inject(required = false, value = StrutsConstants.STRUTS_ID_PARAMETER_NAME) + public void setIdParameterName(String idParameterName) { + this.idParameterName = idParameterName; + } } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java index bdd84811e..d73c477f9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java @@ -99,8 +99,8 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest { } protected void processUpload(HttpServletRequest request, String saveDir) throws IOException { - - if (JakartaServletFileUpload.isMultipartContent(request)) { + + if (JakartaServletFileUpload.isMultipartContent(request)) { for (FileItem item : parseRequest(request, saveDir)) { LOG.debug("Found file item: [{}]", sanitizeNewlines(item.getFieldName())); if (item.isFormField()) { diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java index 4b22b1dd5..ab4fdaf84 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java @@ -350,21 +350,21 @@ public class CookieInterceptorTest extends StrutsInternalTestCase { new Cookie(pollution4, "pollution4"); fail("It shouldn't be possible to create cookie: " + pollution4); } catch (IllegalArgumentException e) { - assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution4 + "\" is a reserved token")); + assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution4 + "\" is a reserved token")); } try { new Cookie(pollution5, "pollution5"); fail("It shouldn't be possible to create cookie: " + pollution5); } catch (IllegalArgumentException e) { - assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution5 + "\" is a reserved token")); + assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution5 + "\" is a reserved token")); } try { new Cookie(pollution6, "pollution6"); fail("It shouldn't be possible to create cookie: " + pollution6); } catch (IllegalArgumentException e) { - assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution6 + "\" is a reserved token")); + assertTrue(e.getMessage(), e.getMessage().startsWith("Cookie name \"" + pollution6 + "\" is a reserved token")); } request.setCookies( diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java index 9998c6e39..ad3f68745 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java @@ -1136,10 +1136,10 @@ public class IteratorTagTest extends AbstractUITagTest { class TestMockBodyContent extends MockBodyContent { public TestMockBodyContent(String content, Writer targetWriter) { - super(content, response, targetWriter); - } + super(content, response, targetWriter); + } - public String getString() { + public String getString() { return ".-."; } } diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java index cbabbaa63..864821271 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java @@ -124,13 +124,13 @@ public class StrutsMockHttpServletRequest extends MockHttpServletRequest { public RequestDispatcher getRequestDispatcher(String string) { this.requestDispatherString = string; if(this.requestDispatcher == null) { - this.requestDispatcher = new MockRequestDispatcher(string); + this.requestDispatcher = new MockRequestDispatcher(string); } return this.requestDispatcher; } public void setRequestDispatcher(RequestDispatcher rd) { - this.requestDispatcher = rd; + this.requestDispatcher = rd; } /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java index fd286d9d9..7f0f5047b 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java @@ -42,7 +42,7 @@ public class StrutsMockPageContext extends MockPageContext { public StrutsMockPageContext() { } public StrutsMockPageContext(ServletContext context, HttpServletRequest request, HttpServletResponse response) { - super(context, request, response); + super(context, request, response); } @@ -73,15 +73,15 @@ public class StrutsMockPageContext extends MockPageContext { } @Override - public JspWriter getOut() { - if (this.smpcOut == null) { - this.smpcOut = new StrutsMockJspWriter(new StringWriter()); - } - return this.smpcOut; - } + public JspWriter getOut() { + if (this.smpcOut == null) { + this.smpcOut = new StrutsMockJspWriter(new StringWriter()); + } + return this.smpcOut; + } public void setJspWriter(JspWriter w) { - this.smpcOut = w; + this.smpcOut = w; } public Object findAttribute(String s) { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java index e2a2e26f8..98ddff1fd 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java @@ -304,38 +304,38 @@ public class StrutsMockServletContext implements ServletContext { return null; } - @Override - public Dynamic addJspFile(String servletName, String jspFile) { - return null; - } + @Override + public Dynamic addJspFile(String servletName, String jspFile) { + return null; + } - @Override - public int getSessionTimeout() { - return 0; - } + @Override + public int getSessionTimeout() { + return 0; + } - @Override - public void setSessionTimeout(int sessionTimeout) { - // no-op - } + @Override + public void setSessionTimeout(int sessionTimeout) { + // no-op + } - @Override - public String getRequestCharacterEncoding() { - return null; - } + @Override + public String getRequestCharacterEncoding() { + return null; + } - @Override - public void setRequestCharacterEncoding(String encoding) { - // no-op - } + @Override + public void setRequestCharacterEncoding(String encoding) { + // no-op + } - @Override - public String getResponseCharacterEncoding() { - return null; - } + @Override + public String getResponseCharacterEncoding() { + return null; + } - @Override - public void setResponseCharacterEncoding(String encoding) { - // no-op - } + @Override + public void setResponseCharacterEncoding(String encoding) { + // no-op + } } diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index bf930ae43..2da43088f 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -40,8 +40,8 @@ jakarta.validation - jakarta.validation-api - 3.0.2 + jakarta.validation-api + 3.0.2 @@ -53,7 +53,7 @@ org.glassfish - jakarta.el + jakarta.el test diff --git a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java index 260c6f1cb..295367c1f 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java @@ -294,39 +294,38 @@ public class StrutsMockServletContext implements ServletContext { this.contextPath = contextPath; } - @Override - public Dynamic addJspFile(String servletName, String jspFile) { - return null; - } + @Override + public Dynamic addJspFile(String servletName, String jspFile) { + return null; + } - @Override - public int getSessionTimeout() { - return 0; - } + @Override + public int getSessionTimeout() { + return 0; + } - @Override - public void setSessionTimeout(int sessionTimeout) { - - - } + @Override + public void setSessionTimeout(int sessionTimeout) { - @Override - public String getRequestCharacterEncoding() { - return null; - } + } - @Override - public void setRequestCharacterEncoding(String encoding) { - - } + @Override + public String getRequestCharacterEncoding() { + return null; + } - @Override - public String getResponseCharacterEncoding() { - return null; - } + @Override + public void setRequestCharacterEncoding(String encoding) { - @Override - public void setResponseCharacterEncoding(String encoding) { - - } + } + + @Override + public String getResponseCharacterEncoding() { + return null; + } + + @Override + public void setResponseCharacterEncoding(String encoding) { + + } } \ No newline at end of file diff --git a/plugins/pom.xml b/plugins/pom.xml index b61fe5757..f254ce6e5 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -84,12 +84,12 @@ jakarta.servlet.jsp - jakarta.servlet.jsp-api + jakarta.servlet.jsp-api provided jakarta.servlet - jakarta.servlet-api + jakarta.servlet-api provided