From 741c1f306a39c3a5beee6b15491140fa8a7d3a35 Mon Sep 17 00:00:00 2001 From: Maxim Grischenko Date: Tue, 14 Nov 2023 15:12:12 +0100 Subject: [PATCH 1/3] fix javadoc --- datasafe-business/pom.xml | 1 + .../CMSEncryptionServiceImpl.java | 2 +- .../CustomlyBuiltDatasafeServices.java | 2 +- .../pom.xml | 1 + .../datasafe-simple-adapter-impl/pom.xml | 1 + .../impl/SimpleDatasafeAdapterTest.java | 5 -- .../datasafe-simple-adapter-spring/pom.xml | 1 + .../simple/adapter/spring/InjectionTest.java | 1 - ...ithoutPathEncryptionForFilesystemTest.java | 2 - datasafe-test-storages/pom.xml | 18 ++++++ .../teststorage/WithStorageProvider.java | 1 - pom.xml | 57 +++++++++---------- 12 files changed, 51 insertions(+), 41 deletions(-) rename datasafe-test-storages/src/{main => test}/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java (99%) diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml index 0b560880e..4c814b1ec 100644 --- a/datasafe-business/pom.xml +++ b/datasafe-business/pom.xml @@ -113,6 +113,7 @@ de.adorsys datasafe-test-storages ${project.version} + test-jar test diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java index 4d8dc886d..abca2737d 100644 --- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java +++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java @@ -36,7 +36,7 @@ /** * Cryptographic message syntax document encoder/decoder - see * - * @see CMS + * @see CMS * wiki */ @Slf4j diff --git a/datasafe-examples/datasafe-examples-customize-dagger/src/main/java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java b/datasafe-examples/datasafe-examples-customize-dagger/src/main/java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java index 898b265c7..215083b39 100644 --- a/datasafe-examples/datasafe-examples-customize-dagger/src/main/java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java +++ b/datasafe-examples/datasafe-examples-customize-dagger/src/main/java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java @@ -23,7 +23,7 @@ /** * This is Datasafe services customized implementation. - * Note, that despite is has {@code @Singleton} annotation, it is not real singleton, the only shared thing + * Note, that despite it has {@code @Singleton} annotation, it is not real singleton, the only shared thing * across all services instantiated using build() is bindings with {@code Singleton} in its Module. */ @Singleton diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml index e65650ee9..c272f303f 100644 --- a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml +++ b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml @@ -110,6 +110,7 @@ de.adorsys datasafe-test-storages ${project.version} + test-jar test diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index b75b2a192..d9cf19796 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -45,6 +45,7 @@ de.adorsys datasafe-test-storages ${project.version} + test-jar test diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java index a7ce59715..2fb8aa818 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java @@ -1,7 +1,6 @@ package de.adorsys.datasafe.simple.adapter.impl; import com.amazonaws.services.s3.model.AmazonS3Exception; -import com.sun.management.UnixOperatingSystemMXBean; import de.adorsys.datasafe.encrypiton.api.types.UserID; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; import de.adorsys.datasafe.encrypiton.api.types.encryption.MutableEncryptionConfig; @@ -24,17 +23,13 @@ import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import net.bytebuddy.implementation.bytecode.Throw; import org.bouncycastle.util.io.Streams; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import java.io.ByteArrayInputStream; import java.io.OutputStream; -import java.lang.management.ManagementFactory; -import java.lang.management.OperatingSystemMXBean; import java.nio.file.NoSuchFileException; import java.security.UnrecoverableKeyException; import java.util.ArrayList; diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index e7e6b562b..4e1543476 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -126,6 +126,7 @@ de.adorsys datasafe-test-storages ${project.version} + test-jar test diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java index e230609f1..e10f39431 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java @@ -21,7 +21,6 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.Nullable; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.SpringBootTest; diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java index 969653f13..52b6636ea 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java @@ -11,9 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringBootConfiguration; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.ContextConfiguration; import java.util.stream.Stream; diff --git a/datasafe-test-storages/pom.xml b/datasafe-test-storages/pom.xml index e0364c713..e1fa0d67b 100644 --- a/datasafe-test-storages/pom.xml +++ b/datasafe-test-storages/pom.xml @@ -73,4 +73,22 @@ + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + test-jar + + test-compile + + + + + diff --git a/datasafe-test-storages/src/main/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java b/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java similarity index 99% rename from datasafe-test-storages/src/main/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java rename to datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java index 2b5684e13..ba03f52c4 100644 --- a/datasafe-test-storages/src/main/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java +++ b/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java @@ -18,7 +18,6 @@ import de.adorsys.datasafe.types.api.resource.Uri; import de.adorsys.datasafe.types.api.shared.BaseMockitoTest; import de.adorsys.datasafe.types.api.utils.ExecutorServiceUtil; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.SneakyThrows; import lombok.ToString; diff --git a/pom.xml b/pom.xml index eb2583f13..080eae256 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 17 17 3.6.0 - 1.18.28 + 1.18.30 2.8.9 2.46.1 32.1.1-jre @@ -371,21 +371,10 @@ ${surefireArgLine}, - --add-opens java.base/java.lang=ALL-UNNAMED, - --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED, --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED, - - --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED, --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED + --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED @@ -537,23 +526,31 @@ - - - - - - - - - - - - - - - - - + + org.projectlombok + lombok-maven-plugin + ${lombok-maven-plugin.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + generate-sources + + delombok + + + false + src/main/java + + + + org.apache.maven.plugins maven-javadoc-plugin From 8bde9ebc4e3bd0eadc8e56c03013606c62a0c94f Mon Sep 17 00:00:00 2001 From: Maxim Grischenko Date: Tue, 14 Nov 2023 16:23:38 +0100 Subject: [PATCH 2/3] add javadoc version --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 080eae256..2df872154 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,7 @@ 0.0.9 2.1.1 2.3.1 + 3.6.2 @@ -554,6 +555,7 @@ org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin.version} **/*Dagger* From 495d803837986201d4e7b05af0faca84fde06f00 Mon Sep 17 00:00:00 2001 From: Maxim Grischenko Date: Tue, 14 Nov 2023 17:45:17 +0100 Subject: [PATCH 3/3] remove unneeded --add-opens --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2df872154..721a668ac 100644 --- a/pom.xml +++ b/pom.xml @@ -374,8 +374,7 @@ ${surefireArgLine}, --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED, --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED, - --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED,