Skip to content

Commit 953c22a

Browse files
amanteauxamanteaux
authored
Merge pull request #22 from Coreoz/evol/to-jakarta
migrate to jakarta and java 17
2 parents e16ea1e + 20dd10f commit 953c22a

File tree

38 files changed

+204
-187
lines changed

38 files changed

+204
-187
lines changed

‎plume-file-core/pom.xml

+6-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.coreoz</groupId>
77
<artifactId>plume-file-parent</artifactId>
8-
<version>3.1.2-SNAPSHOT</version>
8+
<version>4.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>plume-file-core</artifactId>
@@ -53,14 +53,11 @@
5353
<version>1.0.4</version>
5454
</dependency>
5555

56-
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.assertj</groupId>
62-
<artifactId>assertj-core</artifactId>
63-
</dependency>
56+
<dependency>
57+
<groupId>com.coreoz</groupId>
58+
<artifactId>plume-test</artifactId>
59+
<scope>test</scope>
60+
</dependency>
6461
</dependencies>
6562

6663
<dependencyManagement>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import java.util.Optional;
1313
import java.util.UUID;
1414

15-
import javax.inject.Inject;
16-
import javax.inject.Singleton;
15+
import jakarta.inject.Inject;
16+
import jakarta.inject.Singleton;
1717

1818
import com.coreoz.plume.file.services.mimetype.FileMimeTypeDetector;
1919
import com.coreoz.plume.file.services.mimetype.PeekingInputStream;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.coreoz.plume.file.services.configuration;
22

3-
import javax.inject.Inject;
4-
import javax.inject.Singleton;
3+
import jakarta.inject.Inject;
4+
import jakarta.inject.Singleton;
55

66
import com.typesafe.config.Config;
77
import com.typesafe.config.ConfigFactory;
@@ -23,7 +23,7 @@ public FileConfigurationService(Config config) {
2323
public String cleaningHour() {
2424
return config.getString("file.cleaning-hour");
2525
}
26-
26+
2727
public String checksumAlgorithm() {
2828
return config.getString("file.checksum-algorithm");
2929
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.coreoz.wisp.Scheduler;
66
import com.coreoz.wisp.schedule.Schedules;
77

8-
import javax.inject.Inject;
9-
import javax.inject.Singleton;
8+
import jakarta.inject.Inject;
9+
import jakarta.inject.Singleton;
1010

1111
@Singleton
1212
public class FileScheduledTasks {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.coreoz.plume.file.cleaning;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44

55
import static org.assertj.core.api.Assertions.assertThat;
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.coreoz.plume.file.cleaning;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44

55
import static org.assertj.core.api.Assertions.assertThat;
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.coreoz.plume.file.service.data;
22

33
import com.coreoz.plume.file.services.data.MeasuredSizeInputStream;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55

66
import java.io.ByteArrayInputStream;
77
import java.io.IOException;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.coreoz.plume.file.services.mimetype.MimeTypesDetector;
44
import com.coreoz.plume.file.services.mimetype.PeekingInputStream;
5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import java.io.ByteArrayOutputStream;
88
import java.io.IOException;

‎plume-file-metadata-database/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.coreoz</groupId>
77
<artifactId>plume-file-parent</artifactId>
8-
<version>3.1.2-SNAPSHOT</version>
8+
<version>4.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>plume-file-metadata-database</artifactId>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.List;
77
import java.util.Optional;
88

9-
import javax.inject.Inject;
10-
import javax.inject.Singleton;
9+
import jakarta.inject.Inject;
10+
import jakarta.inject.Singleton;
1111

1212
import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl;
1313
import com.coreoz.plume.file.db.beans.FileMetadataQuerydsl;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.List;
55
import java.util.Optional;
66

7-
import javax.inject.Inject;
8-
import javax.inject.Singleton;
7+
import jakarta.inject.Inject;
8+
import jakarta.inject.Singleton;
99

1010
import com.coreoz.plume.file.db.FileMetadataDatabaseDao;
1111
import com.coreoz.plume.file.filetype.FileTypeDatabase;

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

+17-22
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
package com.coreoz.plume.file.db;
22

3-
import java.util.Collections;
4-
import java.util.List;
5-
import java.util.Optional;
6-
7-
import javax.inject.Inject;
8-
9-
import org.junit.Assert;
10-
import org.junit.Test;
11-
import org.junit.runner.RunWith;
12-
13-
import com.carlosbecker.guice.GuiceModules;
14-
import com.carlosbecker.guice.GuiceTestRunner;
153
import com.coreoz.plume.file.filetype.FileTypeDatabase;
164
import com.coreoz.plume.file.services.metadata.FileMetadata;
5+
import com.coreoz.test.GuiceTest;
176
import com.querydsl.core.types.EntityPath;
187
import com.querydsl.core.types.dsl.StringPath;
8+
import jakarta.inject.Inject;
9+
import org.junit.jupiter.api.Assertions;
10+
import org.junit.jupiter.api.Test;
11+
12+
import java.util.Collections;
13+
import java.util.List;
14+
import java.util.Optional;
1915

20-
@RunWith(GuiceTestRunner.class)
21-
@GuiceModules(FileTestModule.class)
16+
@GuiceTest(FileTestModule.class)
2217
public class FileMetadataDatabaseDaoTest {
2318
@Inject
2419
private FileMetadataDatabaseDao fileMetadataDao;
@@ -27,22 +22,22 @@ public class FileMetadataDatabaseDaoTest {
2722
public void fetch_should_return_value_if_present_in_database() {
2823
String uid = "7b3cf3de-f973-11e8-8eb2-f2801f1b9fd1";
2924
Optional<FileMetadata> fileMetadata = fileMetadataDao.fetch(uid);
30-
Assert.assertTrue(fileMetadata.isPresent());
31-
Assert.assertEquals(fileMetadata.get().getUniqueName(), uid);
25+
Assertions.assertTrue(fileMetadata.isPresent());
26+
Assertions.assertEquals(fileMetadata.get().getUniqueName(), uid);
3227
}
3328

3429
@Test
3530
public void add_should_not_fail() {
3631
String uid = "c70f9b94-30e2-4e10-b84d-b964ef972067";
3732
fileMetadataDao.add(uid, "original_name", "TEST", "pdf", "application/pdf");
38-
Assert.assertTrue(true);
33+
Assertions.assertTrue(true);
3934
}
4035

4136
@Test
4237
public void delete_should_not_fail() {
4338
String uid = "846c36cc-f973-11e8-8eb2-f2801f1b9fd1";
4439
long deleted = fileMetadataDao.deleteFilesMetadata(Collections.singletonList(uid));
45-
Assert.assertEquals(1, deleted);
40+
Assertions.assertEquals(1, deleted);
4641
}
4742

4843
@Test
@@ -51,23 +46,23 @@ public void update_file_size_should_update_file_size() {
5146
fileMetadataDao.updateFileSizeAndChecksum(uid, 1L, "sha256");
5247

5348
FileMetadata metadata = fileMetadataDao.fetch(uid).orElse(null);
54-
Assert.assertNotNull(metadata);
55-
Assert.assertEquals(1, metadata.getFileSize().intValue());
49+
Assertions.assertNotNull(metadata);
50+
Assertions.assertEquals(1, metadata.getFileSize().intValue());
5651
}
5752

5853
@Test
5954
public void find_unreferenced_files_should_not_be_empty() {
6055
List<String> unreferencedFiles = fileMetadataDao.findUnreferencedFiles(List.of(TestFileType.TEST));
6156

62-
Assert.assertFalse(unreferencedFiles.isEmpty());
57+
Assertions.assertFalse(unreferencedFiles.isEmpty());
6358
}
6459

6560
@Test
6661
public void find_files_having_unused_known_type_should_return_1() {
6762
List<String> unreferencedFiles = fileMetadataDao.findFilesHavingDeletedTypes(List.of(TestFileType.TEST));
6863

6964
// see file V1__file_setup.sql, there is only one file with the type TEST_DELETED
70-
Assert.assertEquals(1, unreferencedFiles.size());
65+
Assertions.assertEquals(1, unreferencedFiles.size());
7166
}
7267

7368
private enum TestFileType implements FileTypeDatabase {

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

+13-16
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
import java.util.List;
88
import java.util.Optional;
99

10-
import org.junit.Assert;
11-
import org.junit.Before;
12-
import org.junit.Test;
13-
import org.junit.runner.RunWith;
10+
import com.coreoz.test.GuiceTest;
11+
import org.junit.jupiter.api.Assertions;
12+
import org.junit.jupiter.api.BeforeEach;
13+
import org.junit.jupiter.api.Test;
1414

15-
import com.carlosbecker.guice.GuiceModules;
16-
import com.carlosbecker.guice.GuiceTestRunner;
1715
import com.coreoz.plume.file.db.FileMetadataDatabaseDao;
1816
import com.coreoz.plume.file.db.beans.FileMetadataQuerydsl;
1917
import com.coreoz.plume.file.filetype.FileTypeDatabase;
@@ -23,46 +21,45 @@
2321
import com.querydsl.core.types.EntityPath;
2422
import com.querydsl.core.types.dsl.StringPath;
2523

26-
@RunWith(GuiceTestRunner.class)
27-
@GuiceModules(FileTestModule.class)
24+
@GuiceTest(FileTestModule.class)
2825
public class FileMetadataDatabaseServiceTest {
2926
private FileMetadataService fileMetadataService;
3027

31-
@Before
28+
@BeforeEach
3229
public void init_metadata_service() {
3330
this.fileMetadataService = new FileMetadataDatabaseService(this.mockDao, new TestTypeProvider());
3431
}
3532

3633
@Test
3734
public void fetch_file_with_known_unique_file_name_must_return_object() {
3835
Optional<? extends FileMetadata> fileMetadata = this.fileMetadataService.fetch("random-uid-to-fetch");
39-
Assert.assertTrue(fileMetadata.isPresent());
40-
Assert.assertEquals("TEST", fileMetadata.get().getFileType());
41-
Assert.assertEquals("application/pdf", fileMetadata.get().getMimeType());
36+
Assertions.assertTrue(fileMetadata.isPresent());
37+
Assertions.assertEquals("TEST", fileMetadata.get().getFileType());
38+
Assertions.assertEquals("application/pdf", fileMetadata.get().getMimeType());
4239
}
4340

4441
@Test
4542
public void fetch_file_with_unknown_unique_file_name_must_return_empty() {
4643
Optional<? extends FileMetadata> fileMetadata = this.fileMetadataService.fetch("unknown-uid-to-fetch");
47-
Assert.assertFalse(fileMetadata.isPresent());
44+
Assertions.assertFalse(fileMetadata.isPresent());
4845
}
4946

5047
@Test
5148
public void upload_file_must_return_valid_id() {
5249
this.fileMetadataService.add("unknown-uid-to-fetch", "original_name", "TEST", "pdf", "application/pdf");
53-
Assert.assertTrue(true);
50+
Assertions.assertTrue(true);
5451
}
5552

5653
@Test
5754
public void unreferenced_files_must_return_valid_list() {
5855
List<String> unreferencedFiles = this.fileMetadataService.findUnreferencedFiles();
59-
Assert.assertEquals(0, unreferencedFiles.size());
56+
Assertions.assertEquals(0, unreferencedFiles.size());
6057
}
6158

6259
@Test
6360
public void unreferenced_files_must_not_fail() {
6461
this.fileMetadataService.deleteAll(Collections.singletonList("random-uid-to-fetch"));
65-
Assert.assertTrue(true);
62+
Assertions.assertTrue(true);
6663
}
6764

6865
private final FileMetadataDatabaseDao mockDao = new FileMetadataDatabaseDao(null) {

‎plume-file-storage-database/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.coreoz</groupId>
77
<artifactId>plume-file-parent</artifactId>
8-
<version>3.1.2-SNAPSHOT</version>
8+
<version>4.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>plume-file-storage-database</artifactId>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import java.util.Optional;
1010
import java.util.function.Function;
1111

12-
import javax.inject.Inject;
13-
import javax.inject.Singleton;
12+
import jakarta.inject.Inject;
13+
import jakarta.inject.Singleton;
1414

1515
import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl;
1616
import com.coreoz.plume.file.db.beans.QFileDataQueryDsl;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.List;
66
import java.util.Optional;
77

8-
import javax.inject.Inject;
9-
import javax.inject.Singleton;
8+
import jakarta.inject.Inject;
9+
import jakarta.inject.Singleton;
1010

1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;

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

+7-11
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,28 @@
66
import java.util.List;
77
import java.util.Optional;
88

9-
import javax.inject.Inject;
9+
import com.coreoz.plume.file.service.FileTestModule;
10+
import com.coreoz.test.GuiceTest;
11+
import jakarta.inject.Inject;
1012

1113
import org.assertj.core.api.Assertions;
12-
import org.junit.Assert;
13-
import org.junit.Test;
14-
import org.junit.runner.RunWith;
14+
import org.junit.jupiter.api.Test;
1515

16-
import com.carlosbecker.guice.GuiceModules;
17-
import com.carlosbecker.guice.GuiceTestRunner;
18-
19-
@RunWith(GuiceTestRunner.class)
20-
@GuiceModules(FileTestModule.class)
16+
@GuiceTest(FileTestModule.class)
2117
public class FileStorageDaoTest {
2218
@Inject
2319
private FileStorageDao fileDao;
2420

2521
@Test
2622
public void fetch_existing_file_should_return_the_file() {
2723
Optional<InputStream> file = fileDao.fetch("846c36cc-f973-11e8-8eb2-f2801f1b9fd1");
28-
Assert.assertTrue(file.isPresent());
24+
Assertions.assertThat(file).isPresent();
2925
}
3026

3127
@Test
3228
public void fetch_unknown_file_should_return_empty() {
3329
Optional<InputStream> file = fileDao.fetch("unknown");
34-
Assert.assertFalse(file.isPresent());
30+
Assertions.assertThat(file).isEmpty();
3531
}
3632

3733
@Test

0 commit comments

Comments
 (0)