[refactor] static code analysis fixes

Author: dizzzz

exist-core/src/main/java/org/exist/validation/ValidationReport.java

@@ -29,7 +29,6 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -150,7 +149,7 @@ public List<String> getTextValidationReport() {
             textReport.add("Exception: " + throwed.getMessage());
         }
 
-        textReport.addAll(validationReport.stream().map(ValidationReportItem::toString).collect(Collectors.toList()));
+        textReport.addAll(validationReport.stream().map(ValidationReportItem::toString).toList());
 
         textReport.add("Validated in " + duration + " millisec.");
         return textReport;
@@ -218,7 +217,7 @@ public String getStackTrace() {
             return null;
         }
 
-        final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+        final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get();
         final PrintStream ps = new PrintStream(baos);
         throwed.printStackTrace(ps);
         return baos.toString(UTF_8);

exist-core/src/main/java/org/exist/validation/ValidationReportItem.java

@@ -88,14 +88,12 @@ public void setSystemId(final String systemId) {
 
     public String getTypeText() {
 
-        final String reportType = switch (type) {
+        return switch (type) {
             case WARNING -> "Warning";
             case ERROR -> "Error";
             case FATAL -> "Fatal";
             default -> "Unknown Error type";
         };
-
-        return reportType;
     }
 
     public String toString() {

exist-core/src/main/java/org/exist/validation/Validator.java

@@ -49,7 +49,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 

exist-core/src/main/java/org/exist/validation/XmlLibraryChecker.java

@@ -208,7 +208,7 @@ public static void check() {
     public static boolean hasValidClassVersion(final String type,
                                                final ClassVersion[] validClasses, final StringBuilder message) {
 
-        final String sep = System.getProperty("line.separator");
+        final String sep = System.lineSeparator();
 
         message.append("Looking for a valid ").append(type).append("...").append(sep);
 

exist-core/src/main/java/org/exist/validation/resolver/SearchResourceResolver.java

@@ -55,7 +55,6 @@
 import java.io.StringWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
@@ -82,7 +81,7 @@ public SearchResourceResolver(final BrokerPool brokerPool, final Subject subject
         this.collectionPath = collectionPath;
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Specified collectionPath=" + collectionPath);
+            LOG.debug("Specified collectionPath={}", collectionPath);
         }
     }
 
@@ -95,7 +94,7 @@ public XMLInputSource resolveEntity(final XMLResourceIdentifier xri) throws XNIE
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Resolving XMLResourceIdentifier: " + getXriDetails(xri));
+            LOG.debug("Resolving XMLResourceIdentifier: {}", getXriDetails(xri));
         }
 
 
@@ -105,20 +104,20 @@ public XMLInputSource resolveEntity(final XMLResourceIdentifier xri) throws XNIE
         if (xri.getNamespace() != null) {
             // XML Schema search
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Searching namespace '" + xri.getNamespace() + "' in database from " + collectionPath + "...");
+                LOG.debug("Searching namespace '{}' in database from {}...", xri.getNamespace(), collectionPath);
             }
 
             resourcePath = databaseResources.findXSD(collectionPath, xri.getNamespace(), subject);
 
         } else if (xri.getPublicId() != null) {
             // Catalog search
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Searching publicId '" + xri.getPublicId() + "' in catalogs in database from " + collectionPath + "...");
+                LOG.debug("Searching publicId '{}' in catalogs in database from {}...", xri.getPublicId(), collectionPath);
             }
 
             String catalogPath = databaseResources.findCatalogWithDTD(collectionPath, xri.getPublicId(), subject);
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Found publicId in catalog '" + catalogPath + "'");
+                LOG.debug("Found publicId in catalog '{}'", catalogPath);
             }
 
             if (catalogPath != null) {
@@ -169,15 +168,15 @@ public XMLInputSource resolveEntity(final XMLResourceIdentifier xri) throws XNIE
         resourcePath = ResolverFactory.fixupExistCatalogUri(resourcePath);
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("resourcePath='" + resourcePath + "'");
+            LOG.debug("resourcePath='{}'", resourcePath);
         }
 
         final InputStream is = URI.create(resourcePath).toURL().openStream();
 
         final XMLInputSource xis = new XMLInputSource(xri.getPublicId(), xri.getExpandedSystemId(), xri.getBaseSystemId(), is, UTF_8.name());
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("XMLInputSource: " + getXisDetails(xis));
+            LOG.debug("XMLInputSource: {}", getXisDetails(xis));
         }
 
         return xis;

exist-core/src/main/java/org/exist/validation/resolver/unstable/ExistResolver.java

@@ -111,7 +111,7 @@ public Source resolve(String href, String base) throws TransformerException {
     /* ============== */
     private InputSource resolveInputSource(final BrokerPool bPool, final String path) throws IOException {
 
-        LOG.debug("Resolving {}", path);
+        LOG.debug("Resolving inputSource {}", path);
 
         final InputSource inputsource = new InputSource();
 
@@ -134,7 +134,7 @@ private InputSource resolveInputSource(final BrokerPool bPool, final String path
 
     private StreamSource resolveStreamSource(final BrokerPool bPool, final String path) throws TransformerException {
 
-        LOG.debug("Resolving {}", path);
+        LOG.debug("Resolving streamSource {}", path);
 
         final StreamSource streamsource = new StreamSource();