Quality fixes

Author: costas80

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/FileManager.java

@@ -21,6 +21,7 @@
 import eu.europa.ec.itb.validation.commons.config.DomainConfig;
 import org.apache.commons.io.FileUtils;
 import org.apache.tika.Tika;
+import org.apache.tika.metadata.HttpHeaders;
 import org.apache.tika.metadata.Metadata;
 import org.springframework.stereotype.Component;
 
@@ -57,7 +58,7 @@ public String getFileExtension(String contentType) {
     public boolean checkFileType(InputStream stream) throws IOException {
         Tika tika = new Tika();
         var metadata = new Metadata();
-        metadata.set(Metadata.CONTENT_TYPE, "application/json");
+        metadata.set(HttpHeaders.CONTENT_TYPE, "application/json");
         String type = tika.detect(stream, metadata);
         return config.getAcceptedMimeTypes().contains(type);
     }

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/JSONValidator.java

@@ -355,9 +355,9 @@ private JsonNodeReader getJsonReader() {
 
     private Function<ValidationMessage, String> getLocationMapper() {
         if (specs.isLocationAsPointer()) {
-            return (msg) -> msg.getInstanceLocation().toString();
+            return msg -> msg.getInstanceLocation().toString();
         } else {
-            return (msg) -> {
+            return msg -> {
                 var nodeLocation = JsonNodes.tokenLocationOf(msg.getInstanceNode());
                 int lineNumber = 0;
                 if (nodeLocation != null && nodeLocation.getLineNr() > 0) {
@@ -377,7 +377,7 @@ private Function<ValidationMessage, String> getLocationMapper() {
     private List<Message> validateAgainstSchema(File schemaFile) {
         var schemaInfo = readSchema(schemaFile.toPath());
         var locationMapper = getLocationMapper();
-        return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map((message) -> new Message(StringUtils.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).collect(Collectors.toList());
+        return schemaInfo.getLeft().validate(getContentNode(schemaInfo.getRight())).stream().map(message -> new Message(StringUtils.removeStart(message.getMessage(), "[] "), locationMapper.apply(message))).toList();
     }
 
     /**

jsonvalidator-common/src/main/java/eu/europa/ec/itb/json/validation/ValidationSpecs.java

@@ -42,10 +42,10 @@
  */
 public class ValidationSpecs {
 
-    private final static ObjectReader YAML_READER;
-    private final static ObjectWriter YAML_WRITER;
-    private final static ObjectReader JSON_READER;
-    private final static ObjectWriter JSON_WRITER;
+    private static final ObjectReader YAML_READER;
+    private static final ObjectWriter YAML_WRITER;
+    private static final ObjectReader JSON_READER;
+    private static final ObjectWriter JSON_WRITER;
 
     private File input;
     private File inputToUse;

jsonvalidator-jar/src/main/java/eu/europa/ec/itb/json/standalone/ValidationRunner.java

@@ -246,7 +246,7 @@ private void printUsage(boolean requireType) {
             parametersMessage
                     .append("\n").append(PAD).append(PAD).append("- SCHEMA_FILE_OR_URI_X is the full file path or URI to a schema for the validation.")
                     .append("\n").append(PAD).append(PAD).append("- SCHEMA_COMBINATION defines how the provided schemas will be combined, one of [")
-                        .append(String.join("|", new String[] {ValidationArtifactCombinationApproach.ALL.getName(), ValidationArtifactCombinationApproach.ANY.getName(), ValidationArtifactCombinationApproach.ONE_OF.getName()}))
+                        .append(String.join("|", ValidationArtifactCombinationApproach.ALL.getName(), ValidationArtifactCombinationApproach.ANY.getName(), ValidationArtifactCombinationApproach.ONE_OF.getName()))
                         .append("] (default is ").append(DEFAULT_COMBINATION_APPROACH.getName()).append(").");
         }
         usageMessage.append("\n").append(PAD).append("Where:");