spring update

README.md

@@ -6,11 +6,11 @@ Build your own S3 Server and keep your data safe!
 ### Installation:
 The Ladon S3 Server is built using Java 8-13 and Maven
 ```bash
-    mvn package && java -jar ladon-s3-server-boot/target/ladon-s3-server-boot-2.1.1.jar
+    mvn package && java -jar ladon-s3-server-boot/target/ladon-s3-server-boot-2.1.2.jar
 ```
 Or run Docker:
 ```bash
-mvn package &&  docker run -i --network=host  mindconsulting/ladon:2.1.1
+mvn package &&  docker run -i --network=host  mindconsulting/ladon:2.1.2
 ```
 ### Customize:
 The core functions of S3 are mapped to a class called S3Repository.
@@ -43,7 +43,7 @@ Supported so far is only access via REST API, no ACL, no policies, no torrent ..
 
 To see what you can build with it have a look at  [Ladon Data Center Edition](https://github.com/mindmill/ladon-data-center-edition) where you can see a full Ladon application. 
 ### License
-Copyright (C) 2019 Mind Consulting
+Copyright (C) 2021 Mind Consulting
 
 Free for private use, easy commercial licensing available [here](https://elopage.com/s/mind/ladon-s3-server/payment?locale=en)
 

ladon-s3-server-boot/README.md

@@ -8,7 +8,7 @@ mvn package && java -jar target/s3-server-{version}.jar
 
 
 ### License
-Copyright (C) 2018 Mind Consulting
+Copyright (C) 2021 Mind Consulting
 
 Free for private use, easy commercial licensing available
 

ladon-s3-server-boot/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>de.mindconsulting</groupId>
     <artifactId>ladon-s3-server-boot</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <packaging>jar</packaging>
 
     <name>s3-server-boot</name>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.8.RELEASE</version>
+        <version>2.5.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

ladon-s3-server-boot/src/test/java/de/mc/ladon/s3server/FSStorageTests.java

@@ -11,11 +11,12 @@
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.*;
 import org.apache.tomcat.util.http.fileupload.util.Streams;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -25,21 +26,22 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 /**
  * Example Integration Test
  *
  * @author Ralf Ulrich
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = S3ServerApplication.class,
         webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class FSStorageTests {
 
     private ExecutorService service;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         service = Executors.newFixedThreadPool(3);
     }

ladon-s3-server-boot/src/test/java/de/mc/ladon/s3server/S3ServerApplicationTests.java

@@ -14,33 +14,31 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.tomcat.util.http.fileupload.util.Streams;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Example Integration Test
  *
  * @author Ralf Ulrich
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = S3ServerApplication.class,
         webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class S3ServerApplicationTests {
 
-    @Before
+    @BeforeEach
     public void setUp() {
         AmazonS3Client client = getClient();
         client.createBucket("test");
@@ -131,7 +129,7 @@ public void testPutObjectNoMd5NoLength() throws IOException {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testPutBigObjectAndVerifyGet() throws IOException {
         final long TEST_LENGTH = 1024 * 1024 * 1024 * 6L; // 6 GB
 
@@ -171,7 +169,7 @@ public int read() throws IOException {
     }
 
     @Test
-    public void testCopyObject() throws IOException {
+    public void testCopyObject() {
         AmazonS3Client client = getClient();
         Bucket b = client.createBucket(UUID.randomUUID().toString());
         ObjectMetadata meta = new ObjectMetadata();
@@ -180,27 +178,31 @@ public void testCopyObject() throws IOException {
 
     }
 
-    @Test(expected = AmazonS3Exception.class)
-    public void testPutObjectWrongMd5() throws IOException {
-        AmazonS3Client client = getClient();
-        Bucket b = client.createBucket(UUID.randomUUID().toString());
-        String md5 = Base64.encodeBase64String(DigestUtils.md5("test1"));
-        ObjectMetadata meta = new ObjectMetadata();
-        meta.setContentMD5(md5);
-        client.putObject(b.getName(), "test.txt", new ByteArrayInputStream("test".getBytes()), meta);
+    @Test
+    public void testPutObjectWrongMd5() {
+        Assertions.assertThrows(AmazonS3Exception.class, () -> {
+            AmazonS3Client client = getClient();
+            Bucket b = client.createBucket(UUID.randomUUID().toString());
+            String md5 = Base64.encodeBase64String(DigestUtils.md5("test1"));
+            ObjectMetadata meta = new ObjectMetadata();
+            meta.setContentMD5(md5);
+            client.putObject(b.getName(), "test.txt", new ByteArrayInputStream("test".getBytes()), meta);
+        });
 
     }
 
-    @Test(expected = AmazonClientException.class)
+    @Test
     public void testPutObjectWrongLengthRightMd5() throws IOException {
-        AmazonS3Client client = getClient();
-        Bucket b = client.createBucket(UUID.randomUUID().toString());
-        String md5 = Base64.encodeBase64String(DigestUtils.md5("test"));
-        ObjectMetadata meta = new ObjectMetadata();
-        meta.setContentMD5(md5);
-        meta.setContentLength(5);
-        client.putObject(b.getName(), "test.txt", new ByteArrayInputStream("test".getBytes()), meta);
-
+        Assertions.assertThrows(AmazonClientException.class, () -> {
+            AmazonS3Client client = getClient();
+            Bucket b = client.createBucket(UUID.randomUUID().toString());
+            String md5 = Base64.encodeBase64String(DigestUtils.md5("test"));
+            ObjectMetadata meta = new ObjectMetadata();
+            meta.setContentMD5(md5);
+            meta.setContentLength(5);
+            client.putObject(b.getName(), "test.txt", new ByteArrayInputStream("test".getBytes()), meta);
+
+        });
     }
 
     @Test
@@ -266,7 +268,7 @@ public void testDelimiter() {
         String bucket = UUID.randomUUID().toString();
         client.createBucket(bucket);
         List<S3ObjectSummary> objectSummaries = client.listObjects(new ListObjectsRequest(bucket, null, null, null, null)).getObjectSummaries();
-       assertEquals(0, objectSummaries.size());
+        assertEquals(0, objectSummaries.size());
 
         ObjectMetadata meta = new ObjectMetadata();
         client.putObject(bucket, "one/one.txt", new ByteArrayInputStream("test".getBytes()), meta);
@@ -278,9 +280,9 @@ public void testDelimiter() {
 
 
         ObjectListing ol = client.listObjects(new ListObjectsRequest(bucket, null, null, "/", null));
-        assertEquals(0,ol.getObjectSummaries().size());
+        assertEquals(0, ol.getObjectSummaries().size());
         System.out.println(ol.getCommonPrefixes());
-        assertEquals(3,ol.getCommonPrefixes().size());
+        assertEquals(3, ol.getCommonPrefixes().size());
 
     }
 

ladon-s3-server-fs/README.md

@@ -12,7 +12,7 @@ s3server.fsrepo.root=${user.home}/.s3server
 ```
 
 # License
-Copyright (C) 2018 Mind Consulting
+Copyright (C) 2021 Mind Consulting
 
 Free for private use, easy commercial licensing available
 

ladon-s3-server-fs/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>de.mindconsulting</groupId>
     <artifactId>ladon-s3-server-fs</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <build>
         <plugins>
             <plugin>

ladon-s3-server-osgi-starter/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>de.mindconsulting</groupId>
     <artifactId>ladon-s3-server-osgi-starter</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <build>
         <plugins>
             <plugin>

ladon-s3-server/README.md

@@ -4,7 +4,7 @@ Core Library containing the S3Servlet and S3Repository Interface
 
 
 ### License
-Copyright (C) 2018 Mind Consulting
+Copyright (C) 2021 Mind Consulting
 
 Free for private use, easy commercial licensing available
 

ladon-s3-server/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>de.mindconsulting</groupId>
     <artifactId>ladon-s3-server</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <build>
         <plugins>
             <plugin>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>de.mindconsulting</groupId>
     <artifactId>s3-server</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <packaging>pom</packaging>
 
     <name>s3-server-boot</name>