diff --git a/plume-file-core/pom.xml b/plume-file-core/pom.xml index fbd0049..ce26c91 100644 --- a/plume-file-core/pom.xml +++ b/plume-file-core/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-core @@ -53,14 +53,11 @@ 1.0.4 - - junit - junit - - - org.assertj - assertj-core - + + com.coreoz + plume-test + test + diff --git a/plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java b/plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java index 368556f..aa6ae92 100644 --- a/plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java +++ b/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; diff --git a/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java b/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java index 2b37b96..3afc9d4 100644 --- a/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java +++ b/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"); } diff --git a/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java b/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java index 8a625a8..1686ee2 100644 --- a/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java +++ b/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 { diff --git a/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileExtensionCleaningTest.java b/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileExtensionCleaningTest.java index 0e47c60..bf53387 100644 --- a/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileExtensionCleaningTest.java +++ b/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; diff --git a/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileNameCleaningTest.java b/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileNameCleaningTest.java index 854c75c..e552584 100644 --- a/plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileNameCleaningTest.java +++ b/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; diff --git a/plume-file-core/src/test/java/com/coreoz/plume/file/service/data/MeasuredSizeInputStreamTest.java b/plume-file-core/src/test/java/com/coreoz/plume/file/service/data/MeasuredSizeInputStreamTest.java index ae0ecf5..8e9b3b9 100644 --- a/plume-file-core/src/test/java/com/coreoz/plume/file/service/data/MeasuredSizeInputStreamTest.java +++ b/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; diff --git a/plume-file-core/src/test/java/com/coreoz/plume/file/service/mimetype/MimeTypesDetectorTest.java b/plume-file-core/src/test/java/com/coreoz/plume/file/service/mimetype/MimeTypesDetectorTest.java index d2549e4..8ff6e9e 100644 --- a/plume-file-core/src/test/java/com/coreoz/plume/file/service/mimetype/MimeTypesDetectorTest.java +++ b/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; diff --git a/plume-file-metadata-database/pom.xml b/plume-file-metadata-database/pom.xml index abb1a16..051d1f4 100644 --- a/plume-file-metadata-database/pom.xml +++ b/plume-file-metadata-database/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-metadata-database diff --git a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java b/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java index 4aa8488..8152cb3 100644 --- a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java +++ b/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; diff --git a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java b/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java index 9d0cc65..0bd3838 100644 --- a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java +++ b/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; diff --git a/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java b/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java index e74753b..4e92035 100644 --- a/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java +++ b/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 = 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,15 +46,15 @@ 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 unreferencedFiles = fileMetadataDao.findUnreferencedFiles(List.of(TestFileType.TEST)); - Assert.assertFalse(unreferencedFiles.isEmpty()); + Assertions.assertFalse(unreferencedFiles.isEmpty()); } @Test @@ -67,7 +62,7 @@ public void find_files_having_unused_known_type_should_return_1() { List 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 { diff --git a/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/service/FileMetadataDatabaseServiceTest.java b/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/service/FileMetadataDatabaseServiceTest.java index 257bef6..cc3ce67 100644 --- a/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/service/FileMetadataDatabaseServiceTest.java +++ b/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,12 +21,11 @@ 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()); } @@ -36,33 +33,33 @@ public void init_metadata_service() { @Test public void fetch_file_with_known_unique_file_name_must_return_object() { Optional 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 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 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) { diff --git a/plume-file-storage-database/pom.xml b/plume-file-storage-database/pom.xml index ccec392..8edd233 100644 --- a/plume-file-storage-database/pom.xml +++ b/plume-file-storage-database/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-storage-database diff --git a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java b/plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java index abb4a7c..fff0d74 100644 --- a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java +++ b/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; diff --git a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java b/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java index 0aa92dd..140280a 100644 --- a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java +++ b/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; diff --git a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java index eefb5db..1b41ac1 100644 --- a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java +++ b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java @@ -6,18 +6,14 @@ 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; @@ -25,13 +21,13 @@ public class FileStorageDaoTest { @Test public void fetch_existing_file_should_return_the_file() { Optional 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 file = fileDao.fetch("unknown"); - Assert.assertFalse(file.isPresent()); + Assertions.assertThat(file).isEmpty(); } @Test diff --git a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileStorageDatabaseServiceTest.java b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileStorageDatabaseServiceTest.java index 42ff9b1..c5b217a 100644 --- a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileStorageDatabaseServiceTest.java +++ b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileStorageDatabaseServiceTest.java @@ -6,21 +6,18 @@ 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.FileStorageDao; -@RunWith(GuiceTestRunner.class) -@GuiceModules(FileTestModule.class) +@GuiceTest(FileTestModule.class) public class FileStorageDatabaseServiceTest { private FileStorageDatabaseService fileStorageDatabase; - @Before + @BeforeEach public void init_metadata_service() { this.fileStorageDatabase = new FileStorageDatabaseService(this.mockDao); } @@ -28,20 +25,20 @@ public void init_metadata_service() { @Test public void fetch_file_with_known_unique_file_name_must_return_byte_array() throws IOException { Optional fileMetadata = this.fileStorageDatabase.fetch("random-uid-to-fetch"); - Assert.assertTrue(fileMetadata.isPresent()); - Assert.assertEquals(-1, fileMetadata.get().read()); + Assertions.assertTrue(fileMetadata.isPresent()); + Assertions.assertEquals(-1, fileMetadata.get().read()); } @Test public void fetch_file_with_unknown_unique_file_name_must_return_empty() { Optional bytes = this.fileStorageDatabase.fetch("unknown-uid-to-fetch"); - Assert.assertFalse(bytes.isPresent()); + Assertions.assertFalse(bytes.isPresent()); } @Test public void upload_file_should_not_fail() throws IOException { this.fileStorageDatabase.add("random-uid-to-add", new ByteArrayInputStream(new byte[1])); - Assert.assertTrue(true); + Assertions.assertTrue(true); } private final FileStorageDao mockDao = new FileStorageDao(null) { diff --git a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileTestModule.java b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileTestModule.java index a097d71..3f72124 100644 --- a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileTestModule.java +++ b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/service/FileTestModule.java @@ -1,13 +1,17 @@ package com.coreoz.plume.file.service; import com.coreoz.plume.conf.guice.GuiceConfModule; +import com.coreoz.plume.db.guice.DataSourceModule; +import com.coreoz.plume.db.guice.GuiceDbTestModule; import com.google.inject.AbstractModule; public class FileTestModule extends AbstractModule { @Override protected void configure() { - install(new GuiceConfModule()); + install(new GuiceConfModule()); + install(new DataSourceModule()); + install(new GuiceDbTestModule()); } } diff --git a/plume-file-storage-system/pom.xml b/plume-file-storage-system/pom.xml index 85bf5f5..bcc96f3 100644 --- a/plume-file-storage-system/pom.xml +++ b/plume-file-storage-system/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-storage-system diff --git a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java index 9e13eb3..bf7c98f 100644 --- a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java +++ b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java @@ -3,7 +3,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import javax.inject.Inject; +import jakarta.inject.Inject; public class FileStorageConfigurationService { private final Config config; diff --git a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java index b7005e8..7ed8da9 100644 --- a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java +++ b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java @@ -9,8 +9,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; diff --git a/plume-file-storage-system/src/test/java/com/coreoz/plume/file/service/FileStorageSystemServiceTest.java b/plume-file-storage-system/src/test/java/com/coreoz/plume/file/service/FileStorageSystemServiceTest.java index e7274c9..66d7650 100644 --- a/plume-file-storage-system/src/test/java/com/coreoz/plume/file/service/FileStorageSystemServiceTest.java +++ b/plume-file-storage-system/src/test/java/com/coreoz/plume/file/service/FileStorageSystemServiceTest.java @@ -1,6 +1,6 @@ package com.coreoz.plume.file.service; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/plume-file-web-download-jersey/pom.xml b/plume-file-web-download-jersey/pom.xml index 29310d0..98fc1be 100644 --- a/plume-file-web-download-jersey/pom.xml +++ b/plume-file-web-download-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-web-download-jersey @@ -43,7 +43,7 @@ io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta @@ -57,6 +57,12 @@ guice true + + + com.coreoz + plume-test + test + diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java index b8723c6..59f38e7 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java @@ -9,8 +9,8 @@ import com.google.common.io.ByteStreams; import lombok.SneakyThrows; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.IOException; import java.io.UncheckedIOException; import java.util.Optional; diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java index 3bcde5b..769f76a 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java @@ -5,8 +5,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Optional; diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java index d10483f..860c34f 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java @@ -5,8 +5,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.InputStream; import java.util.Optional; diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java index e0e6be3..3f9e485 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java @@ -3,8 +3,8 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.time.Duration; @Singleton diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java index eee0472..1c2fd3b 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java @@ -3,8 +3,8 @@ import com.coreoz.plume.file.service.configuration.FileDownloadConfigurationService; import com.coreoz.plume.file.services.url.FileUrlService; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class FileDownloadUrlService implements FileUrlService { diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java index 5139870..823ce6c 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java +++ b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java @@ -10,18 +10,18 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; import java.util.Objects; import java.util.Optional; diff --git a/plume-file-web-download-jersey/src/test/java/com/coreoz/plume/file/service/FileDownloadServiceTest.java b/plume-file-web-download-jersey/src/test/java/com/coreoz/plume/file/service/FileDownloadServiceTest.java deleted file mode 100644 index bd2a286..0000000 --- a/plume-file-web-download-jersey/src/test/java/com/coreoz/plume/file/service/FileDownloadServiceTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.coreoz.plume.file.service; - -import org.junit.Assert; -import org.junit.Test; - -public class FileDownloadServiceTest { - @Test - public void test() { - // TODO - Assert.assertFalse(false); - } -} diff --git a/plume-file-web-upload-jersey/pom.xml b/plume-file-web-upload-jersey/pom.xml index d70b873..3c0699d 100644 --- a/plume-file-web-upload-jersey/pom.xml +++ b/plume-file-web-upload-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-web-upload-jersey @@ -49,7 +49,7 @@ io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta @@ -64,16 +64,16 @@ true - - com.carlosbecker - guice-junit-test-runner - - - guice - com.google.inject - - - + + com.coreoz + plume-test + test + + + ch.qos.logback + logback-classic + test + diff --git a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java index 2e54455..f2a2403 100644 --- a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java +++ b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java @@ -4,8 +4,8 @@ import com.coreoz.plume.file.services.filetype.FileType; import com.coreoz.plume.file.validator.FileUploadData; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class FileUploadWebJerseyService { diff --git a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java index 6dc0c88..0d4b35e 100644 --- a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java +++ b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java @@ -2,7 +2,7 @@ import org.apache.commons.fileupload.RequestContext; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestContext; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadValidatorTest.java b/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadValidatorTest.java index 3ffa3e0..c306a11 100644 --- a/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadValidatorTest.java +++ b/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadValidatorTest.java @@ -5,11 +5,13 @@ import com.coreoz.plume.file.validator.FileUploadValidator; import com.coreoz.plume.jersey.errors.WsException; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.InputStream; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class FileUploadValidatorTest { private FileUploadValidator makeValidator(String fileName, long size) { @@ -54,9 +56,12 @@ public void fileExtension__accepted_extension_should_not_fail() { makeValidator("test.xml", 0).fileExtensions(Set.of("xml")); } - @Test(expected = WsException.class) + @Test public void fileExtension__not_accepted_extension_should_fail() { - makeValidator("test.xml", 0).fileExtensions(Set.of("xlsx")); + assertThrows( + WsException.class, + () -> makeValidator("test.xml", 0).fileExtensions(Set.of("xlsx")) + ); } @Test @@ -64,14 +69,21 @@ public void fileExtensionMaxLength__limit_length_should_pass() { makeValidator("test.abcdefgh", 0).fileExtensionMaxLength(8); } - @Test(expected = WsException.class) + @Test public void fileExtensionMaxLength__over_limit_length_should_fail() { - makeValidator("test.abcdefgh", 0).fileExtensionMaxLength(7); + assertThrows( + WsException.class, + () -> makeValidator("test.abcdefgh", 0).fileExtensionMaxLength(7) + ); } - @Test(expected = WsException.class) + @Test public void fileImage__should_fail_for_xml() { - makeValidator("test.xml", 0).fileImage(); + assertThrows( + WsException.class, + () -> makeValidator("test.xml", 0).fileImage() + ); + } @Test @@ -89,9 +101,12 @@ public void mimeTypes__csv_for_csv_should_pass() { makeValidator("test.csv", 0).mimeTypes(Set.of("text/csv")); } - @Test(expected = WsException.class) + @Test public void mimeTypes__xml_for_json_should_fail() { - makeValidator("test.xml", 0).mimeTypes(Set.of("application/json")); + assertThrows( + WsException.class, + () -> makeValidator("test.xml", 0).mimeTypes(Set.of("application/json")) + ); } @Test @@ -99,9 +114,12 @@ public void fileSize__limit_size_should_pass() { makeValidator(null, 10).fileMaxSize(10); } - @Test(expected = WsException.class) + @Test public void fileSize__over_limit_size_should_fail() { - makeValidator(null, 10).fileMaxSize(9); + assertThrows( + WsException.class, + () -> makeValidator(null, 10).fileMaxSize(9) + ); } @Test @@ -109,9 +127,13 @@ public void fileNameMaxLength__limit_length_should_pass() { makeValidator("abcdefgh", 0).fileNameMaxLength(8); } - @Test(expected = WsException.class) + @Test public void fileNameMaxLength__over_length_size_should_fail() { - makeValidator("abcdefgh", 0).fileNameMaxLength(7); + ; + assertThrows( + WsException.class, + () -> makeValidator("abcdefgh", 0).fileNameMaxLength(7) + ); } @Test diff --git a/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java b/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java index 87a9534..0da17ee 100644 --- a/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java +++ b/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java @@ -1,7 +1,5 @@ package com.coreoz.plume.file; -import com.carlosbecker.guice.GuiceModules; -import com.carlosbecker.guice.GuiceTestRunner; import com.coreoz.plume.file.services.FileService; import com.coreoz.plume.file.services.configuration.FileConfigurationService; import com.coreoz.plume.file.services.filetype.FileType; @@ -11,26 +9,25 @@ import com.coreoz.plume.file.services.storage.FileStorageService; import com.coreoz.plume.file.validator.FileUploadData; import com.coreoz.plume.file.validator.FileUploadValidator; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import com.coreoz.test.GuiceTest; +import jakarta.inject.Inject; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import javax.inject.Inject; import java.io.InputStream; import java.security.NoSuchAlgorithmException; import java.util.List; import java.util.Optional; -@RunWith(GuiceTestRunner.class) -@GuiceModules(FileUploadTestModule.class) +@GuiceTest(FileUploadTestModule.class) public class FileUploadWebJerseyServiceTest { @Inject FileConfigurationService fileConfigurationService; FileUploadWebJerseyService fileUploadWebJerseyService; MimeTypesDetector mimeTypesDetector; - @Before + @BeforeEach public void before_test() throws NoSuchAlgorithmException { FileMetadataService fileMetadataService = new FileMetadataServiceTest(); FileStorageService fileStorageService = new FileStorageServiceTest(); @@ -53,7 +50,7 @@ public void add_file_with_all_metadata_should_not_fail() { makeUploadData("File Name", 12) ); - Assert.assertNotNull(uid); + Assertions.assertThat(uid).isNotNull(); } private static class FileMetadataServiceTest implements FileMetadataService { diff --git a/plume-file-web-upload-jersey/src/test/resources/logback.xml b/plume-file-web-upload-jersey/src/test/resources/logback.xml new file mode 100644 index 0000000..7255f7c --- /dev/null +++ b/plume-file-web-upload-jersey/src/test/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + %d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c2a8584..6d766ba 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT pom Plume File Parent @@ -69,12 +69,10 @@ UTF-8 - 11 - 11 - 8 - -Xdoclint:none + 17 + 17 - 4.2.3 + 5.0.0-beta1 @@ -94,7 +92,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.1 attach-sources @@ -107,7 +105,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.11.1 attach-javadocs @@ -116,15 +114,21 @@ - - java - ${javadoc.java-version} - + + all,-missing + + + implNote + a + Implementation Note: + + + org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -145,7 +149,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.1.1 true false