Merge pull request #233 from adorsys/fix_javadoc

Fix javadoc
adorsys · Dec 13, 2023 · 568e5ab · 568e5ab
2 parents ab26791 + 54be98a
commit 568e5ab
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 42 deletions.
diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -113,6 +113,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/.../java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java b/.../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
@@ -106,6 +106,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml
@@ -45,6 +45,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/...impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java b/...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
@@ -126,6 +126,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/...adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java b/...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/...orsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java b/...orsys/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
@@ -73,4 +73,22 @@
  </dependency>
 
  </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
 </project>
diff --git a/...safe/teststorage/WithStorageProvider.java → ...safe/teststorage/WithStorageProvider.java b/...safe/teststorage/WithStorageProvider.java → ...safe/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
@@ -83,7 +83,7 @@
  <maven.compiler.source>17</maven.compiler.source>
  <maven.compiler.target>17</maven.compiler.target>
  <maven.dependency.plugin.version>3.6.0</maven.dependency.plugin.version>
- <lombok.version>1.18.28</lombok.version>
+ <lombok.version>1.18.30</lombok.version>
  <gson.version>2.8.9</gson.version>
  <dagger.version>2.46.1</dagger.version>
  <guava.version>32.1.1-jre</guava.version>
@@ -127,7 +127,7 @@
  <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
  <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
  <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
- <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
  <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
  <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
@@ -380,21 +380,9 @@
  <configuration>
  <argLine>
  ${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-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED,
  </argLine>
  </configuration>
  </plugin>
@@ -546,26 +534,35 @@
  </annotationProcessorPaths>
  </configuration>
  </plugin>
-<!-- <plugin>-->
-<!-- <groupId>org.projectlombok</groupId>-->
-<!-- <artifactId>lombok-maven-plugin</artifactId>-->
-<!-- <version>${lombok-maven-plugin.version}</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <phase>generate-sources</phase>-->
-<!-- <goals>-->
-<!-- <goal>delombok</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <addOutputDirectory>false</addOutputDirectory>-->
-<!-- <sourceDirectory>src/main/java</sourceDirectory>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok-maven-plugin</artifactId>
+ <version>${lombok-maven-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>delombok</goal>
+ </goals>
+ <configuration>
+ <addOutputDirectory>false</addOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
  <configuration>
  <!-- Exclude Dagger2 generated code -->
  <sourceFileExcludes>**/*Dagger*</sourceFileExcludes>