From 6280feb4266f5f8906b72d48a292a81939c8d151 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 22 Nov 2016 17:56:56 +0100 Subject: [PATCH] Reduces code duplication --- .../multipart/JakartaMultiPartRequest.java | 2 +- .../JakartaStreamMultiPartRequest.java | 11 +--- .../multipart/JakartaUploadedFile.java | 61 ------------------- .../multipart/StrutsUploadedFile.java | 4 +- .../FileUploadInterceptorTest.java | 4 +- .../multipart/PellMultiPartRequest.java | 2 +- 6 files changed, 7 insertions(+), 77 deletions(-) delete mode 100644 core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java rename plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java => core/src/main/java/org/apache/struts2/dispatcher/multipart/StrutsUploadedFile.java (93%) 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 900733c09..30ec33dc3 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 @@ -240,7 +240,7 @@ public class JakartaMultiPartRequest implements MultiPartRequest { LOG.error("Cannot write uploaded empty file to disk: {}", storeLocation.getAbsolutePath(), e); } } - fileList.add(new JakartaUploadedFile(storeLocation)); + fileList.add(new StrutsUploadedFile(storeLocation)); } return fileList.toArray(new UploadedFile[fileList.size()]); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java index a6e15b874..49ca2bed9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java @@ -135,15 +135,6 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest { return errors; } - /** - * Allows interceptor to fetch non-critical messages that can be passed to the action. - * - * @return list of string messages - */ - public List getMesssages() { - return messages; - } - /* (non-Javadoc) * @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#getFile(java.lang.String) */ @@ -155,7 +146,7 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest { List files = new ArrayList<>(infos.size()); for (FileInfo fileInfo : infos) { - files.add(new JakartaUploadedFile(fileInfo.getFile())); + files.add(new StrutsUploadedFile(fileInfo.getFile())); } return files.toArray(new UploadedFile[files.size()]); diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java deleted file mode 100644 index 3dfdea66a..000000000 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.struts2.dispatcher.multipart; - -import java.io.File; - -public class JakartaUploadedFile implements UploadedFile { - - private File file; - - public JakartaUploadedFile(File file) { - this.file = file; - } - - @Override - public Long length() { - return file.length(); - } - - @Override - public String getName() { - return file.getName(); - } - - @Override - public boolean isFile() { - return file.isFile(); - } - - @Override - public boolean delete() { - return file.delete(); - } - - @Override - public String getAbsolutePath() { - return file.getAbsolutePath(); - } - - @Override - public File getContent() { - return file; - } -} diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/StrutsUploadedFile.java similarity index 93% rename from plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java rename to core/src/main/java/org/apache/struts2/dispatcher/multipart/StrutsUploadedFile.java index b51c987b9..a18578061 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/StrutsUploadedFile.java @@ -21,11 +21,11 @@ package org.apache.struts2.dispatcher.multipart; import java.io.File; -public class PellUploadedFile implements UploadedFile { +public class StrutsUploadedFile implements UploadedFile { private File file; - public PellUploadedFile(File file) { + public StrutsUploadedFile(File file) { this.file = file; } diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index 87251cd84..1cea2d730 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -33,7 +33,7 @@ import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.TestAction; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest; -import org.apache.struts2.dispatcher.multipart.JakartaUploadedFile; +import org.apache.struts2.dispatcher.multipart.StrutsUploadedFile; import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; import org.apache.struts2.dispatcher.multipart.UploadedFile; import org.springframework.mock.web.MockHttpServletRequest; @@ -198,7 +198,7 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { URL url = ClassLoaderUtil.getResource("log4j2.xml", FileUploadInterceptorTest.class); File file = new File(new URI(url.toString())); assertTrue("log4j2.xml should be in src/test folder", file.exists()); - boolean notOk = interceptor.acceptFile(action, new JakartaUploadedFile(file), "filename", "text/html", "inputName", validation); + boolean notOk = interceptor.acceptFile(action, new StrutsUploadedFile(file), "filename", "text/html", "inputName", validation); assertFalse(notOk); assertFalse(validation.getFieldErrors().isEmpty()); diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java index 1acfe4654..40526e0e2 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java @@ -93,7 +93,7 @@ public class PellMultiPartRequest implements MultiPartRequest { } public UploadedFile[] getFile(String fieldName) { - return new UploadedFile[]{ new PellUploadedFile(multi.getFile(fieldName)) }; + return new UploadedFile[]{ new StrutsUploadedFile(multi.getFile(fieldName)) }; } public String[] getFileNames(String fieldName) {