Closes #2459: Fix Code Smells

Taskana · Jan 23, 2024 · a9b7a23 · a9b7a23
1 parent 03683ce
commit a9b7a23
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 32 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -44,6 +44,8 @@ jobs:
         with:
           distribution: adopt
           java-version: ${{ env.JAVA_VERSION }}
+      - name: Print Java version
+        run: java -version
       - name: Cache maven dependencies
         id: cache
         uses: actions/cache@v4
@@ -54,7 +56,9 @@ jobs:
       - name: Change versions to match tag
         run: ci/change_version.sh -m .
       - name: Compile & build
-        run: ./mvnw -B install -DskipTests -Dasciidoctor.skip -Djacoco.skip
+        run: ./mvnw clean -B -e -X install -DskipTests -Dasciidoctor.skip -Djacoco.skip
+      - name: Print Compilation Command
+        run: mvn clean compile -X
       - name: Populate cache
         if: steps.cache.outputs.cache-hit != 'true'
         run: |

diff --git a/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
@@ -13,7 +13,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.sql.DataSource;
 import org.apache.ibatis.jdbc.RuntimeSqlException;
@@ -78,9 +77,7 @@ public void dropDb() {
   private List<String> parseScripts(Stream<String> scripts) {
     try (Connection connection = dataSource.getConnection()) {
       DB db = DB.getDB(connection);
-      return scripts
-          .map(script -> SqlReplacer.getScriptAsSql(db, now, script))
-          .collect(Collectors.toList());
+      return scripts.map(script -> SqlReplacer.getScriptAsSql(db, now, script)).toList();
     } catch (SQLException e) {
       throw new RuntimeSqlException("Connection to database failed.", e);
     }

diff --git a/common/taskana-common-logging/pom.xml b/common/taskana-common-logging/pom.xml
@@ -53,9 +53,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${version.aspectj-maven-plugin}</version>
+        <version>1.13.1</version>
         <configuration>
           <aspectLibraries combine.self="override"/>
         </configuration>

diff --git a/...n-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java b/...n-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.security.auth.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,7 +60,7 @@ public List<String> getGroupIds() {
           .map(Principal::getName)
           .filter(Objects::nonNull)
           .map(this::convertAccessId)
-          .collect(Collectors.toList());
+          .toList();
     }
     LOGGER.trace("No groupIds found in subject!");
     return Collections.emptyList();

diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java
@@ -111,7 +111,7 @@ public <T> T interceptTestFactoryMethod(
         newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult);
       } else if (factoryResult instanceof Stream) {
         Stream<DynamicNode> nodes = (Stream<DynamicNode>) factoryResult;
-        newChildrenForDynamicContainer = nodes.collect(Collectors.toList());
+        newChildrenForDynamicContainer = nodes.toList();
       } else if (factoryResult instanceof Iterable) {
         newChildrenForDynamicContainer = (Iterable<DynamicNode>) factoryResult;
       } else if (factoryResult instanceof Iterator) {
@@ -142,8 +142,11 @@ public <T> T interceptTestFactoryMethod(
       Store store = getMethodLevelStore(extensionContext);
       return (T)
           Stream.of(annotation.value())
-              .peek(a -> store.put(ACCESS_IDS_STORE_KEY, a))
-              .map(wrapTestsInDynamicContainer);
+              .map(
+                  a -> {
+                    store.put(ACCESS_IDS_STORE_KEY, a);
+                    return wrapTestsInDynamicContainer.apply(a);
+                  });
     }
 
     return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
@@ -207,8 +210,11 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
         AnnotationSupport.findRepeatableAnnotations(context.getElement(), WithAccessId.class);
     Store store = getMethodLevelStore(context);
     return accessIds.stream()
-        .peek(a -> store.put(ACCESS_IDS_STORE_KEY, a))
-        .map(JaasExtensionInvocationContext::new);
+        .map(
+            a -> {
+              store.put(ACCESS_IDS_STORE_KEY, a);
+              return new JaasExtensionInvocationContext(a);
+            });
   }
 
   // endregion
@@ -259,7 +265,7 @@ private static List<Principal> getPrincipals(WithAccessId withAccessId) {
       return Stream.concat(
               Stream.of(withAccessId.user()).map(UserPrincipal::new),
               Arrays.stream(withAccessId.groups()).map(GroupPrincipal::new))
-          .collect(Collectors.toList());
+          .toList();
     }
     return Collections.emptyList();
   }

diff --git a/...skana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java b/...skana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
@@ -64,9 +64,9 @@ public boolean run() throws SQLException {
     }
     if (LOGGER.isDebugEnabled()) {
       LOGGER.debug(outWriter.toString());
-    }
-    if (!errorWriter.toString().trim().isEmpty()) {
-      LOGGER.error(errorWriter.toString());
+      if (!errorWriter.toString().trim().isEmpty()) {
+        LOGGER.error(errorWriter.toString());
+      }
     }
     return false;
   }

diff --git a/...a-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java b/...a-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java
@@ -8,7 +8,6 @@
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import pro.taskana.common.api.exceptions.SystemException;
 import pro.taskana.common.internal.util.ReflectionUtil;
 
@@ -43,6 +42,6 @@ protected static List<String> splitStringAndTrimElements(String str, String sepa
     return Arrays.stream(str.split(Pattern.quote(separator)))
         .filter(not(String::isEmpty))
         .map(String::trim)
-        .collect(Collectors.toList());
+        .toList();
   }
 }
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ComparableVersion.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ComparableVersion.java
@@ -199,7 +199,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object o) {
-    return (o instanceof ComparableVersion) && items.equals(((ComparableVersion) o).items);
+    return (o instanceof ComparableVersion comparableVersion)
+        && items.equals(comparableVersion.items);
   }
 
   @Override
@@ -436,6 +437,7 @@ private static class StringItem implements Item {
         Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp");
 
     private static final Properties ALIASES = new Properties();
+
     /**
      * A comparable value for the empty-string qualifier. This one is used to determine if a given
      * qualifier makes the version older than one without a qualifier, or more recent.

diff --git a/mvnw b/mvnw
@@ -32,7 +32,7 @@
 #       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 #   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
 # ----------------------------------------------------------------------------
-
+rm -rf ~/.m2/repository/org/aspectj
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
   if [ -f /usr/local/etc/mavenrc ] ; then
@@ -68,7 +68,6 @@ case "$(uname)" in
     fi
     ;;
 esac
-
 if [ -z "$JAVA_HOME" ] ; then
   if [ -r /etc/gentoo-release ] ; then
     JAVA_HOME=$(java-config --jre-home)

diff --git a/pom.xml b/pom.xml
@@ -120,9 +120,7 @@
     <sonar.sources>src/main/java</sonar.sources>
     <sonar.tests>src/test/java</sonar.tests>
     <sonar.exclusions>
-      org/camunda/bpm/dmn/**/*,
-      **/example/**/*,
-      **/*Example*
+      org/camunda/bpm/dmn/**/*, **/example/**/*, **/*Example*
     </sonar.exclusions>
   </properties>
 
@@ -376,9 +374,9 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${version.aspectj-maven-plugin}</version>
+        <version>1.13.1</version>
         <dependencies>
           <dependency>
             <groupId>org.aspectj</groupId>

diff --git a/routing/dmn-xlsx-converter/pom.xml b/routing/dmn-xlsx-converter/pom.xml
@@ -5,8 +5,8 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>pro.taskana.camunda.bpm.extension.dmn</groupId>
   <artifactId>dmn-xlsx-converter</artifactId>
-  <name>${project.groupId}:${project.artifactId}</name>
   <packaging>jar</packaging>
+  <name>${project.groupId}:${project.artifactId}</name>
 
   <parent>
     <groupId>pro.taskana</groupId>
@@ -70,8 +70,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
+        <version>1.13.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>

diff --git a/web/pom.xml b/web/pom.xml
@@ -45,9 +45,9 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>${version.aspectj-maven-plugin}</version>
+        <version>1.13.1</version>
         <configuration>
           <aspectLibraries combine.self="override"/>
         </configuration>