Fixing sonar findings

cuioss · Aug 23, 2023 · 2b8ddfd · 2b8ddfd
1 parent 6fdf1cf
commit 2b8ddfd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/...ion-oauth/src/main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2ServiceImpl.java b/...ion-oauth/src/main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2ServiceImpl.java
@@ -202,7 +202,7 @@ private static List<String> asStringList(Object value) {
             return Collections.emptyList();
         }
         List<String> result = new ArrayList<>();
-        if (value instanceof Iterable iterable) {
+        if (value instanceof Iterable<?> iterable) {
             iterable.forEach(item -> result.addAll(asStringList(item)));
         } else {
             result.add(value.toString());

diff --git a/...ion-yaml/src/main/java/de/cuioss/portal/configuration/yaml/YamlConfigurationProvider.java b/...ion-yaml/src/main/java/de/cuioss/portal/configuration/yaml/YamlConfigurationProvider.java
@@ -153,7 +153,7 @@ public String getProperty(final String key) {
      *         "yaml", empty Optional otherwise.
      */
     public static Optional<YamlConfigurationProvider> createFromFile(FileLoader source) {
-        if (null == source || isEmpty(source.getFileName().getOriginalName())) {
+        if ((null == source) || isEmpty(source.getFileName().getOriginalName())) {
             log.debug("Nothing to load found");
             return Optional.empty();
         }
@@ -179,7 +179,7 @@ public static Optional<YamlConfigurationProvider> createFromFile(FileLoader sour
      *         "yaml", empty Optional otherwise.
      */
     public static Optional<YamlConfigurationProvider> createFromFile(FileConfigurationSource source) {
-        if (null == source || isEmpty(source.getPath())) {
+        if ((null == source) || isEmpty(source.getPath())) {
             log.debug("Nothing to load found");
             return Optional.empty();
         }
@@ -269,7 +269,7 @@ private static void buildFlattenedMap(final Map<String, Object> result, final Ma
                 @SuppressWarnings("unchecked")
                 final var map = (Map<String, Object>) value;
                 buildFlattenedMap(result, map, key);
-            } else if (value instanceof Collection collection) {
+            } else if (value instanceof Collection<?> collection) {
                 var count = 0;
                 for (final Object object : collection) {
                     buildFlattenedMap(result, Collections.singletonMap("[" + count + "]", object), key);

diff --git a/...rtal-mp-rest-client/src/main/java/de/cuioss/portal/restclient/LogClientRequestFilter.java b/...rtal-mp-rest-client/src/main/java/de/cuioss/portal/restclient/LogClientRequestFilter.java
@@ -62,8 +62,8 @@ public void filter(final ClientRequestContext reqContext) throws IOException {
 
             var body = "";
             if (reqContext.hasEntity()) {
-                if (reqContext.getEntity() instanceof Form) {
-                    body = ((Form) reqContext.getEntity()).asMap().toString();
+                if (reqContext.getEntity() instanceof Form form) {
+                    body = form.asMap().toString();
                 } else {
                     body = reqContext.getEntity().toString();
                 }

diff --git a/...src/main/java/de/cuioss/portal/core/test/mocks/microprofile/PortalTestMetricRegistry.java b/...src/main/java/de/cuioss/portal/core/test/mocks/microprofile/PortalTestMetricRegistry.java
@@ -468,8 +468,8 @@ public SortedSet<MetricID> getMetricIDs() {
     public SortedMap<MetricID, Gauge> getGauges() {
         final SortedMap<MetricID, Gauge> result = new TreeMap<>();
         for (final Map.Entry<MetricID, Metric> entry : metricMap.entrySet()) {
-            if (entry.getValue() instanceof Gauge) {
-                result.put(entry.getKey(), (Gauge) entry.getValue());
+            if (entry.getValue() instanceof Gauge gauge) {
+                result.put(entry.getKey(), gauge);
             }
         }
         return result;
@@ -525,8 +525,8 @@ public SortedMap<MetricID, Meter> getMeters(final MetricFilter filter) {
     public SortedMap<MetricID, Timer> getTimers() {
         final SortedMap<MetricID, Timer> out = new TreeMap<>();
         for (final Map.Entry<MetricID, Metric> entry : metricMap.entrySet()) {
-            if (entry.getValue() instanceof Timer) {
-                out.put(entry.getKey(), (Timer) entry.getValue());
+            if (entry.getValue() instanceof Timer timer) {
+                out.put(entry.getKey(), timer);
             }
         }
         return out;

diff --git a/...in/java/de/cuioss/portal/core/test/tests/configuration/PropertiesDefaultConfigSource.java b/...in/java/de/cuioss/portal/core/test/tests/configuration/PropertiesDefaultConfigSource.java
@@ -42,9 +42,10 @@
  *
  * @author Sven Haag
  */
-final public class PropertiesDefaultConfigSource extends PropertiesConfigSource {
+public final class PropertiesDefaultConfigSource extends PropertiesConfigSource {
 
     public static final String META_INF_LOCATION = "META-INF/microprofile-config.properties";
+    @SuppressWarnings("java:S1075") // owolff: the delimiter is correct for classpath-resources
     public static final String CLASSPATH_LOCATION = FileTypePrefix.CLASSPATH.getPrefix() + "/" + META_INF_LOCATION;
 
     /**