From 39f3c493ac0417ffe4b4545bcfcf0ad52924aee6 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Sat, 30 Mar 2024 20:51:01 +0200
Subject: [PATCH] JAVA-32054 Upgrade spring-mvc-file to Spring Boot 3 (#16218)
---
spring-web-modules/spring-mvc-file/pom.xml | 23 ++-----------------
.../baeldung/file/CustomMultipartFile.java | 4 ++--
.../file/CustomMultipartFileUnitTest.java | 8 +++----
3 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/spring-web-modules/spring-mvc-file/pom.xml b/spring-web-modules/spring-mvc-file/pom.xml
index c6b063c785..b596e5380e 100644
--- a/spring-web-modules/spring-mvc-file/pom.xml
+++ b/spring-web-modules/spring-mvc-file/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../../parent-boot-2
+ ../../parent-boot-3
@@ -25,26 +25,7 @@
spring-boot-starter-test
test
-
- commons-io
- commons-io
- ${commons-io.version}
-
-
- spring-mvc-file
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- com.baeldung.Application
- JAR
-
-
-
-
-
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-file/src/main/java/com/baeldung/file/CustomMultipartFile.java b/spring-web-modules/spring-mvc-file/src/main/java/com/baeldung/file/CustomMultipartFile.java
index c68729588f..3ad1fbbea4 100644
--- a/spring-web-modules/spring-mvc-file/src/main/java/com/baeldung/file/CustomMultipartFile.java
+++ b/spring-web-modules/spring-mvc-file/src/main/java/com/baeldung/file/CustomMultipartFile.java
@@ -41,12 +41,12 @@ public class CustomMultipartFile implements MultipartFile {
}
@Override
- public byte[] getBytes() throws IOException {
+ public byte[] getBytes() {
return input;
}
@Override
- public InputStream getInputStream() throws IOException {
+ public InputStream getInputStream() {
return new ByteArrayInputStream(input);
}
diff --git a/spring-web-modules/spring-mvc-file/src/test/java/com/baeldung/file/CustomMultipartFileUnitTest.java b/spring-web-modules/spring-mvc-file/src/test/java/com/baeldung/file/CustomMultipartFileUnitTest.java
index 1aa07766ca..295fb92c0f 100644
--- a/spring-web-modules/spring-mvc-file/src/test/java/com/baeldung/file/CustomMultipartFileUnitTest.java
+++ b/spring-web-modules/spring-mvc-file/src/test/java/com/baeldung/file/CustomMultipartFileUnitTest.java
@@ -9,7 +9,7 @@ import org.springframework.mock.web.MockMultipartFile;
class CustomMultipartFileUnitTest {
@Test
- void whenProvidingByteArray_thenMultipartFileCreated() throws IOException {
+ void whenProvidingByteArray_thenMultipartFileCreated() {
byte[] inputArray = "Test String".getBytes();
CustomMultipartFile customMultipartFile = new CustomMultipartFile(inputArray);
Assertions.assertFalse(customMultipartFile.isEmpty());
@@ -18,21 +18,21 @@ class CustomMultipartFileUnitTest {
}
@Test
- void whenProvidingEmptyByteArray_thenMockMultipartFileIsEmpty() throws IOException {
+ void whenProvidingEmptyByteArray_thenMockMultipartFileIsEmpty() {
byte[] inputArray = "".getBytes();
MockMultipartFile mockMultipartFile = new MockMultipartFile("tempFileName", inputArray);
Assertions.assertTrue(mockMultipartFile.isEmpty());
}
@Test
- void whenProvidingNullByteArray_thenMockMultipartFileIsEmpty() throws IOException {
+ void whenProvidingNullByteArray_thenMockMultipartFileIsEmpty() {
byte[] inputArray = null;
MockMultipartFile mockMultipartFile = new MockMultipartFile("tempFileName", inputArray);
Assertions.assertTrue(mockMultipartFile.isEmpty());
}
@Test
- void whenProvidingByteArray_thenMultipartFileInputSizeMatches() throws IOException {
+ void whenProvidingByteArray_thenMultipartFileInputSizeMatches() {
byte[] inputArray = "Testing String".getBytes();
CustomMultipartFile customMultipartFile = new CustomMultipartFile(inputArray);
Assertions.assertEquals(inputArray.length, customMultipartFile.getSize());