migrate to jakarta and java 17

plume-file-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-file-parent</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-file-core</artifactId>
@@ -53,14 +53,11 @@
 			<version>1.0.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.coreoz</groupId>
+            <artifactId>plume-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<dependencyManagement>

plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java

@@ -12,8 +12,8 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.file.services.mimetype.FileMimeTypeDetector;
 import com.coreoz.plume.file.services.mimetype.PeekingInputStream;

plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java

@@ -1,7 +1,7 @@
 package com.coreoz.plume.file.services.configuration;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -23,7 +23,7 @@ public FileConfigurationService(Config config) {
 	public String cleaningHour() {
 		return config.getString("file.cleaning-hour");
 	}
-	
+
 	public String checksumAlgorithm() {
 		return config.getString("file.checksum-algorithm");
 	}

plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java

@@ -5,8 +5,8 @@
 import com.coreoz.wisp.Scheduler;
 import com.coreoz.wisp.schedule.Schedules;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class FileScheduledTasks {

plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileExtensionCleaningTest.java

@@ -1,6 +1,6 @@
 package com.coreoz.plume.file.cleaning;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileNameCleaningTest.java

@@ -1,6 +1,6 @@
 package com.coreoz.plume.file.cleaning;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

plume-file-core/src/test/java/com/coreoz/plume/file/service/data/MeasuredSizeInputStreamTest.java

@@ -1,7 +1,7 @@
 package com.coreoz.plume.file.service.data;
 
 import com.coreoz.plume.file.services.data.MeasuredSizeInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

plume-file-core/src/test/java/com/coreoz/plume/file/service/mimetype/MimeTypesDetectorTest.java

@@ -2,7 +2,7 @@
 
 import com.coreoz.plume.file.services.mimetype.MimeTypesDetector;
 import com.coreoz.plume.file.services.mimetype.PeekingInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

plume-file-metadata-database/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-file-parent</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-file-metadata-database</artifactId>

plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java

@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl;
 import com.coreoz.plume.file.db.beans.FileMetadataQuerydsl;

plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java

@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.file.db.FileMetadataDatabaseDao;
 import com.coreoz.plume.file.filetype.FileTypeDatabase;

plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java

@@ -1,24 +1,19 @@
 package com.coreoz.plume.file.db;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.carlosbecker.guice.GuiceModules;
-import com.carlosbecker.guice.GuiceTestRunner;
 import com.coreoz.plume.file.filetype.FileTypeDatabase;
 import com.coreoz.plume.file.services.metadata.FileMetadata;
+import com.coreoz.test.GuiceTest;
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.dsl.StringPath;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
-@RunWith(GuiceTestRunner.class)
-@GuiceModules(FileTestModule.class)
+@GuiceTest(FileTestModule.class)
 public class FileMetadataDatabaseDaoTest {
     @Inject
     private FileMetadataDatabaseDao fileMetadataDao;
@@ -27,22 +22,22 @@ public class FileMetadataDatabaseDaoTest {
     public void fetch_should_return_value_if_present_in_database() {
         String uid = "7b3cf3de-f973-11e8-8eb2-f2801f1b9fd1";
         Optional<FileMetadata> fileMetadata = fileMetadataDao.fetch(uid);
-        Assert.assertTrue(fileMetadata.isPresent());
-        Assert.assertEquals(fileMetadata.get().getUniqueName(), uid);
+        Assertions.assertTrue(fileMetadata.isPresent());
+        Assertions.assertEquals(fileMetadata.get().getUniqueName(), uid);
     }
 
     @Test
     public void add_should_not_fail() {
         String uid = "c70f9b94-30e2-4e10-b84d-b964ef972067";
         fileMetadataDao.add(uid, "original_name", "TEST", "pdf", "application/pdf");
-        Assert.assertTrue(true);
+        Assertions.assertTrue(true);
     }
 
     @Test
     public void delete_should_not_fail() {
         String uid = "846c36cc-f973-11e8-8eb2-f2801f1b9fd1";
         long deleted = fileMetadataDao.deleteFilesMetadata(Collections.singletonList(uid));
-        Assert.assertEquals(1, deleted);
+        Assertions.assertEquals(1, deleted);
     }
 
     @Test
@@ -51,23 +46,23 @@ public void update_file_size_should_update_file_size() {
         fileMetadataDao.updateFileSizeAndChecksum(uid, 1L, "sha256");
 
         FileMetadata metadata = fileMetadataDao.fetch(uid).orElse(null);
-        Assert.assertNotNull(metadata);
-        Assert.assertEquals(1, metadata.getFileSize().intValue());
+        Assertions.assertNotNull(metadata);
+        Assertions.assertEquals(1, metadata.getFileSize().intValue());
     }
 
     @Test
     public void find_unreferenced_files_should_not_be_empty() {
         List<String> unreferencedFiles = fileMetadataDao.findUnreferencedFiles(List.of(TestFileType.TEST));
 
-        Assert.assertFalse(unreferencedFiles.isEmpty());
+        Assertions.assertFalse(unreferencedFiles.isEmpty());
     }
 
     @Test
     public void find_files_having_unused_known_type_should_return_1() {
         List<String> unreferencedFiles = fileMetadataDao.findFilesHavingDeletedTypes(List.of(TestFileType.TEST));
 
         // see file V1__file_setup.sql, there is only one file with the type TEST_DELETED
-        Assert.assertEquals(1, unreferencedFiles.size());
+        Assertions.assertEquals(1, unreferencedFiles.size());
     }
 
     private enum TestFileType implements FileTypeDatabase {

plume-file-metadata-database/src/test/java/com/coreoz/plume/file/service/FileMetadataDatabaseServiceTest.java

@@ -7,13 +7,11 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.coreoz.test.GuiceTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import com.carlosbecker.guice.GuiceModules;
-import com.carlosbecker.guice.GuiceTestRunner;
 import com.coreoz.plume.file.db.FileMetadataDatabaseDao;
 import com.coreoz.plume.file.db.beans.FileMetadataQuerydsl;
 import com.coreoz.plume.file.filetype.FileTypeDatabase;
@@ -23,46 +21,45 @@
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.dsl.StringPath;
 
-@RunWith(GuiceTestRunner.class)
-@GuiceModules(FileTestModule.class)
+@GuiceTest(FileTestModule.class)
 public class FileMetadataDatabaseServiceTest {
     private FileMetadataService fileMetadataService;
 
-    @Before
+    @BeforeEach
     public void init_metadata_service() {
         this.fileMetadataService = new FileMetadataDatabaseService(this.mockDao, new TestTypeProvider());
     }
 
     @Test
     public void fetch_file_with_known_unique_file_name_must_return_object() {
         Optional<? extends FileMetadata> fileMetadata = this.fileMetadataService.fetch("random-uid-to-fetch");
-        Assert.assertTrue(fileMetadata.isPresent());
-        Assert.assertEquals("TEST", fileMetadata.get().getFileType());
-        Assert.assertEquals("application/pdf", fileMetadata.get().getMimeType());
+        Assertions.assertTrue(fileMetadata.isPresent());
+        Assertions.assertEquals("TEST", fileMetadata.get().getFileType());
+        Assertions.assertEquals("application/pdf", fileMetadata.get().getMimeType());
     }
 
     @Test
     public void fetch_file_with_unknown_unique_file_name_must_return_empty() {
         Optional<? extends FileMetadata> fileMetadata = this.fileMetadataService.fetch("unknown-uid-to-fetch");
-        Assert.assertFalse(fileMetadata.isPresent());
+        Assertions.assertFalse(fileMetadata.isPresent());
     }
 
     @Test
     public void upload_file_must_return_valid_id() {
         this.fileMetadataService.add("unknown-uid-to-fetch", "original_name", "TEST", "pdf", "application/pdf");
-        Assert.assertTrue(true);
+        Assertions.assertTrue(true);
     }
 
     @Test
     public void unreferenced_files_must_return_valid_list() {
         List<String> unreferencedFiles = this.fileMetadataService.findUnreferencedFiles();
-        Assert.assertEquals(0, unreferencedFiles.size());
+        Assertions.assertEquals(0, unreferencedFiles.size());
     }
 
     @Test
     public void unreferenced_files_must_not_fail() {
         this.fileMetadataService.deleteAll(Collections.singletonList("random-uid-to-fetch"));
-        Assert.assertTrue(true);
+        Assertions.assertTrue(true);
     }
 
     private final FileMetadataDatabaseDao mockDao = new FileMetadataDatabaseDao(null) {

plume-file-storage-database/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-file-parent</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-file-storage-database</artifactId>

plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java

@@ -9,8 +9,8 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl;
 import com.coreoz.plume.file.db.beans.QFileDataQueryDsl;

plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java

@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java

@@ -6,32 +6,28 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import com.coreoz.plume.file.service.FileTestModule;
+import com.coreoz.test.GuiceTest;
+import jakarta.inject.Inject;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
-import com.carlosbecker.guice.GuiceModules;
-import com.carlosbecker.guice.GuiceTestRunner;
-
-@RunWith(GuiceTestRunner.class)
-@GuiceModules(FileTestModule.class)
+@GuiceTest(FileTestModule.class)
 public class FileStorageDaoTest {
     @Inject
     private FileStorageDao fileDao;
 
     @Test
     public void fetch_existing_file_should_return_the_file() {
         Optional<InputStream> file = fileDao.fetch("846c36cc-f973-11e8-8eb2-f2801f1b9fd1");
-        Assert.assertTrue(file.isPresent());
+        Assertions.assertThat(file).isPresent();
     }
 
     @Test
     public void fetch_unknown_file_should_return_empty() {
         Optional<InputStream> file = fileDao.fetch("unknown");
-        Assert.assertFalse(file.isPresent());
+        Assertions.assertThat(file).isEmpty();
     }
 
     @Test