Quality fixes

costas80 · costas80 · commit 5e20badcb9db · 2025-06-27T10:35:57.000+02:00
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/DomainConfigCache.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/DomainConfigCache.java
@@ -268,14 +268,14 @@ protected ValidatorChannel toValidatorChannel(Set<ValidatorChannel> supportedCha
      * Utility class to implement a persistent counter object.
      */
     private static class Counter {
-        int counter = 0;
+        int counterValue = 0;
 
         /**
          * @return The next counter value.
          */
         int getAndIncrement() {
-            int valueToReturn = counter;
-            counter += 1;
+            int valueToReturn = counterValue;
+            counterValue += 1;
             return valueToReturn;
         }
     }
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/ValidationSpecs.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/ValidationSpecs.java
@@ -157,7 +157,7 @@ public File getInputFileToUse(boolean forSchematronValidation) throws XMLInvalid
                 String validationType = getValidationType();
                 List<ContextFileConfig> contextFilesToCombine =  domainConfig.getContextFiles(validationType)
                         .stream()
-                        .filter((contextFile) -> contextFile.combinationPlaceholder().isPresent())
+                        .filter(contextFile -> contextFile.combinationPlaceholder().isPresent())
                         .toList();
                 Optional<ContextFileCombinationTemplateConfig> combinationTemplate = domainConfig.getContextFileCombinationTemplate(validationType);
                 if (!contextFilesToCombine.isEmpty() && combinationTemplate.isPresent()) {
@@ -238,8 +238,8 @@ private FileProcessingResult applyInputPreprocessing(File originalFile) throws X
                     var outputStream = Files.newOutputStream(inputToReturn.toPath())
             ) {
                 var result = xPath.evaluate(new StreamSource(inputStream), XPathConstants.NODE);
-                if (result instanceof NodeInfo) {
-                    int resultKind = ((NodeInfo) result).getNodeKind();
+                if (result instanceof NodeInfo nodeInfo) {
+                    int resultKind = nodeInfo.getNodeKind();
                     if (resultKind == Type.ELEMENT || resultKind == Type.DOCUMENT || resultKind == Type.NODE) {
                         Utils.serialize((Source) result, outputStream);
                     } else {
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/util/FileManager.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/util/FileManager.java
@@ -23,6 +23,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.tika.Tika;
+import org.apache.tika.metadata.HttpHeaders;
 import org.apache.tika.metadata.Metadata;
 import org.apache.xerces.impl.xs.XMLSchemaLoader;
 import org.apache.xerces.util.XMLCatalogResolver;
@@ -167,7 +168,7 @@ public String checkContentType(File content) throws IOException {
         String mimeType;
         try (InputStream in = Files.newInputStream(content.toPath())){
             var metadata = new Metadata();
-            metadata.set(Metadata.CONTENT_TYPE, "application/xml");
+            metadata.set(HttpHeaders.CONTENT_TYPE, "application/xml");
             mimeType = tika.detect(in, metadata);
         }
         return mimeType;
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/util/Utils.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/util/Utils.java
@@ -40,6 +40,11 @@
  */
 public class Utils {
 
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private Utils() {}
+
     /**
      * Validate XML content using an XML Schema securely.
      * <p/>
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/SchematronReportHandler.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/SchematronReportHandler.java
@@ -212,10 +212,10 @@ private String diagnosticContentAsString(Object content) {
         String messageText;
         if (content == null) {
             messageText = "";
-        } else if (content instanceof String) {
-            messageText = (String)content;
-        } else if (content instanceof Text) {
-            messageText = diagnosticContentAsString(((Text) content).getContent());
+        } else if (content instanceof String stringContent) {
+            messageText = stringContent;
+        } else if (content instanceof Text textContent) {
+            messageText = diagnosticContentAsString(textContent.getContent());
         } else if (content instanceof Iterable) {
             StringBuilder messageBuilder = new StringBuilder();
             for (var item: (Iterable<?>)content) {
@@ -320,7 +320,7 @@ private LocationInfo getLocationInfo(String xpathExpression) {
     private String toPathForPresentation(String xpathExpression) {
         if (xpathExpression != null) {
             return xpathExpression
-                    .replaceAll("\\*:", "")
+                    .replace("*:", "")
                     .replaceAll("\\[\\s*namespace-uri\\(\\)\\s*=\\s*(?:'[^\\[\\]]+'|\"[^\\[\\]]+\")\\s*]", "");
         } else {
             return null;
diff --git a/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/XSDFileResolver.java b/xmlvalidator-common/src/main/java/eu/europa/ec/itb/xml/validation/XSDFileResolver.java
@@ -191,6 +191,7 @@ public InputStream getByteStream() {
          */
         @Override
         public void setByteStream(InputStream byteStream) {
+            // Do nothing.
         }
 
         /**
@@ -310,6 +311,7 @@ public boolean getCertifiedText() {
          */
         @Override
         public void setCertifiedText(boolean certifiedText) {
+            // Do nothing.
         }
     }
 
diff --git a/xmlvalidator-common/src/test/java/eu/europa/ec/itb/xml/DomainConfigTest.java b/xmlvalidator-common/src/test/java/eu/europa/ec/itb/xml/DomainConfigTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class DomainConfigTest {
diff --git a/xmlvalidator-email/src/main/java/eu/europa/ec/itb/xml/email/MailHandler.java b/xmlvalidator-email/src/main/java/eu/europa/ec/itb/xml/email/MailHandler.java
@@ -112,7 +112,7 @@ private JavaMailSender createJavaMailSender(DomainConfig domainConfig) {
 
     /**
      * Check for new emails.
-     *
+     * <p/>
      * This method can be triggered manually but is otherwise fired at fixed intervals.
      */
     @Scheduled(fixedDelayString = "${validator.mailPollingRate}")
@@ -168,7 +168,7 @@ public void receiveEmail() {
                                                         TAR report = validator.validateAll();
                                                         reports.add(new FileReport(part.getFileName(), report));
                                                     } catch (Exception e) {
-                                                        messageAdditionalText.append("Failed to validate file [%s]: %s\n".formatted(part.getFileName(), e.getMessage()));
+                                                        messageAdditionalText.append("Failed to validate file [%s]: %s%n".formatted(part.getFileName(), e.getMessage()));
                                                         logger.warn("Failed to validate file", e);
                                                     }
                                                 } else {
@@ -188,11 +188,11 @@ public void receiveEmail() {
                                     }
                                 } catch (ValidatorException e) {
                                     // Send error response to sender.
-                                    messageAdditionalText.append("Failed to process message: %s\n".formatted(e.getMessageForDisplay(new LocalisationHelper(Locale.ENGLISH))));
+                                    messageAdditionalText.append("Failed to process message: %s%n".formatted(e.getMessageForDisplay(new LocalisationHelper(Locale.ENGLISH))));
                                     e.printStackTrace(new PrintWriter(new StringBuilderWriter(messageAdditionalText)));
                                 } catch (Exception e) {
                                     // Send error response to sender.
-                                    messageAdditionalText.append("Failed to process message: %s\n".formatted(e.getMessage()));
+                                    messageAdditionalText.append("Failed to process message: %s%n".formatted(e.getMessage()));
                                     e.printStackTrace(new PrintWriter(new StringBuilderWriter(messageAdditionalText)));
                                 } finally {
                                     logger.info("Sending email response");
@@ -249,7 +249,6 @@ public void receiveEmail() {
     public void sendEmail(Message inputMessage, Collection<FileReport> reports, String messageAdditionalText, DomainConfig domainConfig) throws MessagingException {
         JavaMailSender mailSender = mailSenders.get(domainConfig.getDomain());
         MimeMessage message = mailSender.createMimeMessage();
-        List<String> idsToDelete = new ArrayList<>();
         try {
             MimeMessageHelper helper = new MimeMessageHelper(message, true);
             String to = inputMessage.getFrom()[0].toString();
@@ -269,12 +268,11 @@ public void sendEmail(Message inputMessage, Collection<FileReport> reports, Stri
             }
             helper.setText(sb.toString());
             mailSender.send(message);
-            logger.info("Email sent to ["+to+"] for ["+inputMessage.getSubject()+"]");
+            logger.info("Email sent to [{}] for [{}]", to, inputMessage.getSubject());
         } catch (MessagingException e) {
             logger.error("Failed to send email message", e);
             throw e;
         }
-        idsToDelete.parallelStream().forEach(id -> fileController.deleteReport(domainConfig.getDomainName(), id));
     }
 
     /**
diff --git a/xmlvalidator-war/src/test/java/eu/europa/ec/itb/xml/webhook/StatisticReportingAspectTest.java b/xmlvalidator-war/src/test/java/eu/europa/ec/itb/xml/webhook/StatisticReportingAspectTest.java
@@ -1,6 +1,5 @@
 package eu.europa.ec.itb.xml.webhook;
 
-import eu.europa.ec.itb.validation.commons.config.ApplicationConfig;
 import eu.europa.ec.itb.validation.commons.web.dto.Translations;
 import eu.europa.ec.itb.validation.commons.web.dto.UploadResult;
 import eu.europa.ec.itb.xml.upload.UploadController;
diff --git a/xmlvalidator-web/src/main/java/eu/europa/ec/itb/xml/upload/UploadController.java b/xmlvalidator-web/src/main/java/eu/europa/ec/itb/xml/upload/UploadController.java
@@ -56,7 +56,7 @@
 import java.net.http.HttpClient;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.function.Supplier;
+import java.util.function.BooleanSupplier;
 
 import static eu.europa.ec.itb.validation.commons.web.Constants.*;
 
@@ -163,9 +163,9 @@ private Map<String, ContextFileLabels[]> getContextFileLabels(LocalisationHelper
      * @param configuredKeyFn The function to get the configured key from the context file config object.
      * @return The label text.
      */
-    private String contextFileKeyToUse(String validationType, LocalisationHelper localisationHelper, String defaultKeyIfMissing, ContextFileConfig config, Supplier<Boolean> configuredKeyFn) {
+    private String contextFileKeyToUse(String validationType, LocalisationHelper localisationHelper, String defaultKeyIfMissing, ContextFileConfig config, BooleanSupplier configuredKeyFn) {
         String keyToUse = null;
-        if (configuredKeyFn.get()) {
+        if (configuredKeyFn.getAsBoolean()) {
             String key;
             if (config.defaultConfig()) {
                 key = "validator.defaultContextFile.%s.label".formatted(config.index());
diff --git a/xmlvalidator-ws/src/main/java/eu/europa/ec/itb/xml/rest/model/ContextFileInfo.java b/xmlvalidator-ws/src/main/java/eu/europa/ec/itb/xml/rest/model/ContextFileInfo.java
@@ -26,7 +26,7 @@
 @Schema(description = "A user-provided context file to use in the validation.")
 public class ContextFileInfo {
 
-    @Schema(required = true, description = "The file's content.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "The file's content.")
     private String content;
     @Schema(description = "The way in which to interpret the value for content. If not provided, the method will be determined from the content value itself.", allowableValues = FileContent.EMBEDDING_STRING+","+FileContent.EMBEDDING_URL+","+FileContent.EMBEDDING_BASE_64)
     private String embeddingMethod;
diff --git a/xmlvalidator-ws/src/test/java/eu/europa/ec/itb/xml/ws/ValidationServiceImplTest.java b/xmlvalidator-ws/src/test/java/eu/europa/ec/itb/xml/ws/ValidationServiceImplTest.java
@@ -2,7 +2,6 @@
 
 import com.gitb.core.TypedParameter;
 import com.gitb.core.UsageEnumeration;
-import com.gitb.core.ValidationModule;
 import com.gitb.vs.Void;
 import eu.europa.ec.itb.validation.commons.artifact.ExternalArtifactSupport;
 import eu.europa.ec.itb.validation.commons.artifact.TypedValidationArtifactInfo;

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ public InputStream getByteStream() {`
`191`	`191`	`*/`
`192`	`192`	`@Override`
`193`	`193`	`public void setByteStream(InputStream byteStream) {`
	`194`	`+ // Do nothing.`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`/**`
`@@ -310,6 +311,7 @@ public boolean getCertifiedText() {`
`310`	`311`	`*/`
`311`	`312`	`@Override`
`312`	`313`	`public void setCertifiedText(boolean certifiedText) {`
	`314`	`+ // Do nothing.`
`313`	`315`	`}`
`314`	`316`	`}`
`315`	`317`