From 25abb49276dd57007f245aff73fb1d19e99de98d Mon Sep 17 00:00:00 2001 From: jamesrdi Date: Tue, 19 Dec 2023 11:11:26 +0100 Subject: [PATCH] Closes #2459: Fix Code Smells --- .../sampledata/SampleDataGenerator.java | 5 +---- .../security/CurrentUserContextImpl.java | 3 +-- .../common/test/security/JaasExtension.java | 18 ++++++++++++------ .../configuration/parser/SimpleParser.java | 3 +-- .../internal/util/ComparableVersion.java | 3 ++- .../common/internal/util/ReflectionUtil.java | 4 ++-- .../internal/ClassificationServiceImpl.java | 4 ++-- .../testapi/security/JaasExtension.java | 14 ++++++-------- 8 files changed, 27 insertions(+), 27 deletions(-) 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 index 46edfaa4a..cde3aabf4 100644 --- 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.time.ZonedDateTime; 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 class SampleDataGenerator { private List parseScripts(Stream 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-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java b/common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java index d6954f3d8..154e0249b 100644 --- a/common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java +++ b/common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java @@ -10,7 +10,6 @@ import java.util.Collections; 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 class CurrentUserContextImpl implements CurrentUserContext { .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 index d5cb35f01..09655fefa 100644 --- 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 class JaasExtension implements InvocationInterceptor, TestTemplateInvocat newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult); } else if (factoryResult instanceof Stream) { Stream nodes = (Stream) factoryResult; - newChildrenForDynamicContainer = nodes.collect(Collectors.toList()); + newChildrenForDynamicContainer = nodes.toList(); } else if (factoryResult instanceof Iterable) { newChildrenForDynamicContainer = (Iterable) factoryResult; } else if (factoryResult instanceof Iterator) { @@ -142,8 +142,11 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat 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 class JaasExtension implements InvocationInterceptor, TestTemplateInvocat 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 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat 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/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java index d24a98360..dcdef8bc0 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java @@ -8,7 +8,6 @@ import java.util.List; 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 @@ public class SimpleParser implements PropertyParser { 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 index c07d4c201..1fadbbed6 100644 --- 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 class ComparableVersion implements Comparable { @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 diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java index b8ff5dcc5..641d4aa63 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java @@ -42,8 +42,8 @@ public class ReflectionUtil { } public static Class getRawClass(Type type) { - if (type instanceof ParameterizedType) { - return getRawClass(((ParameterizedType) type).getRawType()); + if (type instanceof ParameterizedType parameterizedType) { + return getRawClass(parameterizedType.getRawType()); } return (Class) type; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java index 6b2ec9ab7..eaa04f186 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java @@ -504,8 +504,8 @@ public class ClassificationServiceImpl implements ClassificationService { } private boolean isH2OrPostgresIntegrityConstraintViolation(PersistenceException e) { - return e.getCause() instanceof SQLException - && ((SQLException) e.getCause()).getSQLState().equals("23503"); + return e.getCause() instanceof SQLException sqlException + && sqlException.getSQLState().equals("23503"); } /** diff --git a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/security/JaasExtension.java b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/security/JaasExtension.java index f50e2dc06..38c8f6722 100644 --- a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/security/JaasExtension.java +++ b/lib/taskana-test-api/src/main/java/pro/taskana/testapi/security/JaasExtension.java @@ -107,8 +107,8 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat Iterable newChildrenForDynamicContainer; // TestFactory must have one of the following return types. See link above for further details - if (factoryResult instanceof DynamicNode) { - newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult); + if (factoryResult instanceof DynamicNode dynamicNode) { + newChildrenForDynamicContainer = Collections.singleton(dynamicNode); } else if (factoryResult instanceof Stream) { Stream nodes = (Stream) factoryResult; newChildrenForDynamicContainer = nodes.collect(Collectors.toList()); @@ -116,8 +116,8 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat newChildrenForDynamicContainer = (Iterable) factoryResult; } else if (factoryResult instanceof Iterator) { newChildrenForDynamicContainer = () -> (Iterator) factoryResult; - } else if (factoryResult instanceof DynamicNode[]) { - newChildrenForDynamicContainer = Arrays.asList((DynamicNode[]) factoryResult); + } else if (factoryResult instanceof DynamicNode[] dynamicNodes) { + newChildrenForDynamicContainer = Arrays.asList(dynamicNodes); } else { throw new SystemException( String.format( @@ -217,8 +217,7 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat Iterable nodes, Map> childrenMap) { nodes.forEach( node -> { - if (node instanceof DynamicContainer) { - DynamicContainer container = (DynamicContainer) node; + if (node instanceof DynamicContainer container) { List children = container.getChildren().collect(Collectors.toList()); childrenMap.put(container.hashCode() + container.getDisplayName(), children); persistDynamicContainerChildren(children, childrenMap); @@ -228,8 +227,7 @@ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocat private static DynamicNode duplicateDynamicNode( DynamicNode node, Map> lookupMap) { - if (node instanceof DynamicContainer) { - DynamicContainer container = (DynamicContainer) node; + if (node instanceof DynamicContainer container) { Stream children = lookupMap.get(node.hashCode() + node.getDisplayName()).stream() .map(x -> duplicateDynamicNode(x, lookupMap));