diff --git a/core/pom.xml b/core/pom.xml index a41bbd82d..3162abd80 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -89,7 +89,7 @@ true - + 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 d73c477f9..09c068471 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 @@ -18,6 +18,19 @@ */ package org.apache.struts2.dispatcher.multipart; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.commons.fileupload2.core.DiskFileItem; import org.apache.commons.fileupload2.core.DiskFileItemFactory; import org.apache.commons.fileupload2.core.FileItem; @@ -33,17 +46,6 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; import jakarta.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * Multipart form data request adapter for Jakarta Commons Fileupload package. @@ -82,7 +84,7 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest { } else if (e instanceof FileUploadSizeException) { FileUploadSizeException ex = (FileUploadSizeException) e; errorMessage = buildErrorMessage(e, new Object[]{ex.getPermitted(), ex.getActualSize()}); - } else { + } else { errorMessage = buildErrorMessage(e, new Object[]{}); } @@ -369,7 +371,7 @@ public class JakartaMultiPartRequest extends AbstractMultiPartRequest { try { item.delete(); } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } } diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java index 2e52e9eaa..e4201c41c 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java @@ -64,8 +64,6 @@ public class Restful2ActionMapperTest extends StrutsInternalTestCase { public void testGetIndex() throws Exception { req.setRequestURI("/my/namespace/foo/"); req.setServletPath("/my/namespace/foo/"); - // - // req.setMethod("GET"); ActionMapping mapping = mapper.getMapping(req, configManager); diff --git a/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java index 8d20467de..e8e2b24a1 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java @@ -83,9 +83,6 @@ public class BeanTagTest extends AbstractUITagTest { fail(); } - - - // Basic sanity check of clearTagStateForTagPoolingServers() behaviour for Struts Tags after doEndTag(). BeanTag freshTag = new BeanTag(); freshTag.setPerformClearTagStateForTagPoolingServers(true);