diff --git a/modules/authentication/portal-authentication-mock/src/main/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacade.java b/modules/authentication/portal-authentication-mock/src/main/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacade.java index d07d923..61a3805 100644 --- a/modules/authentication/portal-authentication-mock/src/main/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacade.java +++ b/modules/authentication/portal-authentication-mock/src/main/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacade.java @@ -153,7 +153,7 @@ public class MockAuthenticationFacade implements FormBasedAuthenticationFacade { */ @Override public ResultObject login(final HttpServletRequest servletRequest, - final LoginCredentials loginCredentials) { + final LoginCredentials loginCredentials) { requireNonNull(loginCredentials); requireNonNull(servletRequest); if (loginCredentials.isComplete() @@ -192,14 +192,15 @@ private BaseAuthenticatedUserInfoBuilder createDefaultUserInfoBuilder() { @Override public boolean logout(final HttpServletRequest servletRequest) { var oldSession = servletRequest.getSession(); - var userInfo = (AuthenticatedUserInfo) oldSession.getAttribute(USER_INFO_KEY); + AuthenticatedUserInfo userInfo = null; if (null != oldSession) { + userInfo = (AuthenticatedUserInfo) oldSession.getAttribute(USER_INFO_KEY); oldSession.invalidate(); } var newSession = servletRequest.getSession(true); newSession.setAttribute(USER_INFO_KEY, NOT_LOGGED_IN); newSession.setAttribute(USER_INFO_LOGOUT_KEY, USER_INFO_LOGOUT_KEY); - if (userInfo != null && userInfo.isAuthenticated()) { + if (null != userInfo && userInfo.isAuthenticated()) { LOGGER.info(INFO.USER_LOGOUT.format(userInfo.getDisplayName())); } return true; @@ -209,7 +210,7 @@ public boolean logout(final HttpServletRequest servletRequest) { public AuthenticatedUserInfo retrieveCurrentAuthenticationContext(final HttpServletRequest servletRequest) { var userInfo = (AuthenticatedUserInfo) servletRequest.getSession().getAttribute(USER_INFO_KEY); if (null == userInfo) { - if (defaultLoggedIn.get()) { + if (Boolean.TRUE.equals(defaultLoggedIn.get())) { var userName = defaultUserName.get(); userInfo = createDefaultUserInfoBuilder().identifier(userName).qualifiedIdentifier(userName) .displayName(userName).build(); diff --git a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java index 8e14111..a0d2c92 100644 --- a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java +++ b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java @@ -334,6 +334,7 @@ public void validate() throws ConnectionConfigurationException { } } + @SuppressWarnings("java:S2094") // owolff: see class comment public static class ConnectionMetadataBuilder { // Needed for lombok-builder plus javadoc } diff --git a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImpl.java b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImpl.java index e0f25c9..81a337d 100644 --- a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImpl.java +++ b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImpl.java @@ -107,7 +107,7 @@ public class FileWatcherServiceImpl implements FileWatcherService, ApplicationIn */ @Override public void initialize() { - if (enabledProvider.get()) { + if (Boolean.TRUE.equals(enabledProvider.get())) { LOGGER.debug("Initializing FileWatcherService"); if (null == watcherService) { try { diff --git a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/ModuleConsistencyTest.java b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/ModuleConsistencyTest.java index b80d010..ce0c82f 100644 --- a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/ModuleConsistencyTest.java +++ b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/ModuleConsistencyTest.java @@ -36,14 +36,6 @@ void shouldStartUpContainer() { try (final var weld = new Weld().initialize()) { assertNotNull(weld.select(BeanManager.class), "Unable to acquire an instance of javax.enterprise.inject.spi.BeanManager"); - - /* - * final Set> fileConfigSourceInstances = CDI.current().getBeanManager() - * .getBeans(FileConfigurationSource.class, - * PortalConfigurationSource.Literal.INSTANCE); - * assertFalse(fileConfigSourceInstances.isEmpty(), - * "FileConfigurationSource instances not registered in CDI"); - */ } } diff --git a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java index fe358a3..463d96b 100644 --- a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java +++ b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java @@ -39,7 +39,12 @@ import static de.cuioss.portal.configuration.PortalConfigurationKeys.THEME_DEFAULT; import static de.cuioss.portal.configuration.util.ConfigurationHelper.resolveConfigProperty; import static de.cuioss.portal.configuration.util.ConfigurationHelper.resolveConfigPropertyOrThrow; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; @EnablePortalConfigurationLocal @EnableAutoWeld @@ -190,7 +195,7 @@ void shouldUseEnvPropertyFirst() { assertTrue( StreamSupport.stream(ConfigProvider.getConfig().getConfigSources().spliterator(), false) - .anyMatch(clazz -> clazz instanceof TestEnvConfigSource), + .anyMatch(TestEnvConfigSource.class::isInstance), "TestEnvConfigSource class not available in configuration system"); TestEnvConfigSource.getAdditionalProperties().put(ENV_KEY, "ENV"); diff --git a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/initializer/ApplicationInitializerTest.java b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/initializer/ApplicationInitializerTest.java index 3ad2914..492ab11 100644 --- a/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/initializer/ApplicationInitializerTest.java +++ b/modules/core/portal-configuration/src/test/java/de/cuioss/portal/configuration/initializer/ApplicationInitializerTest.java @@ -57,6 +57,7 @@ static class TestInitializer implements ApplicationInitializer { @Override public void initialize() { + // Noop implementation: Test only } } diff --git a/modules/micro-profile/portal-metrics-api/src/test/java/de/cuioss/portal/metrics/PortalTestMetricRegistry.java b/modules/micro-profile/portal-metrics-api/src/test/java/de/cuioss/portal/metrics/PortalTestMetricRegistry.java index 360eeef..8b92aff 100644 --- a/modules/micro-profile/portal-metrics-api/src/test/java/de/cuioss/portal/metrics/PortalTestMetricRegistry.java +++ b/modules/micro-profile/portal-metrics-api/src/test/java/de/cuioss/portal/metrics/PortalTestMetricRegistry.java @@ -45,7 +45,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Supplier; -import java.util.stream.Collectors; /** * Simple Mock variant of {@link MetricRegistry}. Partially implemented. @@ -147,7 +146,7 @@ public Gauge gauge(MetricID metricID, Supplier supplier @Override public Gauge gauge(Metadata metadata, Supplier supplier, Tag... tags) { metricMap.put(new MetricID(metadata.getName()), (Gauge) () -> null); - LOGGER.info("Gauge for metric '%s'", metadata.getName(), CollectionLiterals.mutableList(tags).stream().map(tag -> tag.getTagName() + "=" + tag.getTagValue()).collect(Collectors.toList())); + LOGGER.info("Gauge for metric '%s'", metadata.getName(), CollectionLiterals.mutableList(tags).stream().map(tag -> tag.getTagName() + "=" + tag.getTagValue()).toList()); return null; } diff --git a/modules/test/portal-core-unit-testing/src/main/java/de/cuioss/portal/core/test/tests/configuration/AbstractConfigurationKeyVerifierTest.java b/modules/test/portal-core-unit-testing/src/main/java/de/cuioss/portal/core/test/tests/configuration/AbstractConfigurationKeyVerifierTest.java index 626bfc1..301600f 100644 --- a/modules/test/portal-core-unit-testing/src/main/java/de/cuioss/portal/core/test/tests/configuration/AbstractConfigurationKeyVerifierTest.java +++ b/modules/test/portal-core-unit-testing/src/main/java/de/cuioss/portal/core/test/tests/configuration/AbstractConfigurationKeyVerifierTest.java @@ -51,7 +51,7 @@ * * *

Usage Examples

- * + *

* Basic configuration test: * 

  * public class MyConfigTest extends AbstractConfigurationKeyVerifierTest {
@@ -66,7 +66,7 @@
  *     }
  * }
  *
- * + *

* Custom key filtering: * 

  * public class FilteredConfigTest extends AbstractConfigurationKeyVerifierTest {
@@ -103,9 +103,9 @@
  * 
  *
  * @author Oliver Wolff
- * @since 1.0
  * @see ConfigSource
  * @see ConfigProvider
+ * @since 1.0
  */
 public abstract class AbstractConfigurationKeyVerifierTest {
 
@@ -272,8 +272,6 @@ protected SortedSet extractConfigurationKeys() {
             return strings;
         }
         var foundNames = StreamSupport.stream(ConfigProvider.getConfig().getConfigSources().spliterator(), false).map(ConfigSource::getName).collect(Collectors.toSet());
-        fail("Unable to find any configuration source named '%s', available sources: '%s'".formatted(name, foundNames));
-
-        return null;
+        throw new AssertionError("Unable to find any configuration source named '%s', available sources: '%s'".formatted(name, foundNames));
     }
 }
diff --git a/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/BaseAllAcceptDispatcherTest.java b/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/BaseAllAcceptDispatcherTest.java
index 6738e02..9af2d83 100644
--- a/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/BaseAllAcceptDispatcherTest.java
+++ b/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/BaseAllAcceptDispatcherTest.java
@@ -25,7 +25,7 @@
 class BaseAllAcceptDispatcherTest {
 
     private static final String DEFAULT_PATH = "/hello";
-    static final RecordedRequest DUMMY = CombinedDispatcherTest.createRequestFor(HttpMethodMapper.GET, null, "/");
+    static final RecordedRequest DUMMY = CombinedDispatcherTest.createRequestFor(HttpMethodMapper.GET, "/");
 
     @Test
     void shouldDefaultToPositiveResponse() {
diff --git a/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/CombinedDispatcherTest.java b/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/CombinedDispatcherTest.java
index f3ea0d8..d91f98f 100644
--- a/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/CombinedDispatcherTest.java
+++ b/modules/test/portal-core-unit-testing/src/test/java/de/cuioss/portal/core/test/junit5/mockwebserver/dispatcher/CombinedDispatcherTest.java
@@ -72,7 +72,7 @@ void shouldHandleMissingFilter() {
 
     private void assertDispatchWithCode(CombinedDispatcher dispatcher, int httpCode, String urlPart) {
         for (HttpMethodMapper mapper : HttpMethodMapper.values()) {
-            var request = createRequestFor(mapper, dispatcher, urlPart);
+            var request = createRequestFor(mapper, urlPart);
             assertDoesNotThrow(() -> {
                 var result = dispatcher.dispatch(request);
                 assertTrue(result.getStatus().contains(String.valueOf(httpCode)),
@@ -82,7 +82,7 @@ private void assertDispatchWithCode(CombinedDispatcher dispatcher, int httpCode,
 
     }
 
-    static RecordedRequest createRequestFor(HttpMethodMapper mapper, CombinedDispatcher dispatcher, String urlPart) {
+    static RecordedRequest createRequestFor(HttpMethodMapper mapper, String urlPart) {
         return new RecordedRequest(mapper.name() + " " + urlPart + "someResource  HTTP/1.1",
                 Headers.of("key=value", "key2=value2"), Collections.emptyList(), 0, new Buffer(), 0, new Socket(), null);
     }