[bugfix] minor bugfixes during review

Author: marmoure

src/main/java/com/evolvedbinary/bblValidator/service/CsvValidationService.java

@@ -8,8 +8,10 @@
 import uk.gov.nationalarchives.csv.validator.api.java.*;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static uk.gov.nationalarchives.csv.validator.api.CsvValidator$.MODULE$;
@@ -19,39 +21,31 @@
 public class CsvValidationService {
 
     private static final Logger LOG = LoggerFactory.getLogger(CsvValidationService.class);
-    private static final int DEFAULT_MAX_CHARS_PER_CELL = 8096;
 
     @Inject
     private SchemaService schemaService;
 
     public ValidationResult validateCsvFile(Path csvFilePath, String schemaId) {
+        String schemaFilePath = String.valueOf(schemaService.getSchemaFilePath(schemaId));
+        Charset csvEncoding = StandardCharsets.UTF_8;
+        boolean validateUtf8Encoding = true;
+        Charset csvSchemaEncoding = StandardCharsets.UTF_8;
+        boolean failFast = false;
+        List<Substitution> pathSubstitutions = Collections.emptyList();
+        boolean enforceCaseSensitivePathChecks = false;
+        boolean trace = false;
+        boolean skipFileChecks = false;
+
+        CsvValidatorJavaBridge.ValidationRequest validationRequest = new CsvValidatorJavaBridge.ValidationRequest(
+                csvFilePath.toString(), csvEncoding, validateUtf8Encoding, schemaFilePath,
+                csvSchemaEncoding, true, failFast, pathSubstitutions,
+                enforceCaseSensitivePathChecks, trace, null, skipFileChecks, -1);
+
         long startTime = System.currentTimeMillis();
-        try {
-            String schemaFilePath = String.valueOf(schemaService.getSchemaFilePath(schemaId));                        
-            Charset csvEncoding = MODULE$.DEFAULT_ENCODING();
-            boolean validateUtf8Encoding = csvEncoding.name().equals("UTF-8");
-            Charset csvSchemaEncoding = MODULE$.DEFAULT_ENCODING();
-            boolean failFast = false;
-            List<Substitution> pathSubstitutions = new ArrayList<>();
-            boolean enforceCaseSensitivePathChecks = false;
-            boolean trace = false;
-            boolean skipFileChecks = false;
-
-            CsvValidatorJavaBridge.ValidationRequest validationRequest = new CsvValidatorJavaBridge.ValidationRequest(
-                    csvFilePath.toString(), csvEncoding, validateUtf8Encoding, schemaFilePath, 
-                    csvSchemaEncoding, true, failFast, pathSubstitutions, 
-                    enforceCaseSensitivePathChecks, trace, null, skipFileChecks, DEFAULT_MAX_CHARS_PER_CELL);
-            
-            CsvValidatorJavaBridge.ValidationResult result = CsvValidatorJavaBridge.validate(validationRequest);
-            List<FailMessage> errors = result.errors();
-            long executionTime = System.currentTimeMillis() - startTime;
-            return processValidationMessages(errors, executionTime);
-
-        } catch (Exception e) {
-            long executionTime = System.currentTimeMillis() - startTime;
-            LOG.error("Error validating CSV file: {}", csvFilePath, e);
-            return ValidationResult.error("Validation failed: " + e.getMessage(), executionTime);
-        }
+        CsvValidatorJavaBridge.ValidationResult result = CsvValidatorJavaBridge.validate(validationRequest);
+        List<FailMessage> errors = result.errors();
+        long executionTime = System.currentTimeMillis() - startTime;
+        return processValidationMessages(errors, executionTime);
     }
 
 

src/main/java/com/evolvedbinary/bblValidator/service/SchemaService.java

@@ -64,12 +64,14 @@ public void loadSchemas() {
      * Otherwise, it's resolved relative to the current working directory (startup location).
      */
     private Path resolveSchemaPath() {
-        if (schemaDirectory.startsWith("/")) {
+        Path schemaPath =  Paths.get(schemaDirectory);
+        if (schemaPath.isAbsolute()) {
             // Absolute path
-            return Paths.get(schemaDirectory);
+            return schemaPath;
         } else {
-            // Relative to current working directory
-            return Paths.get(System.getProperty("user.dir"), schemaDirectory);
+            // Relative to current working
+            Path applicationDir = Paths.get(System.getProperty("user.dir"));
+            return schemaPath.relativize(applicationDir);
         }
     }
 
@@ -109,27 +111,15 @@ private void loadSchemaMetadata(Path metadataPath) throws IOException {
     }
 
     public List<SchemaInfo> listSchemas() {
-        return new ArrayList<>(schemas);
+        return schemas;
     }
 
-    public String getSchema(String schemaId) throws Exception {
-        String content = schemaContents.get(schemaId);
-
-        if (content == null) {
-            throw new Exception("Schema not found: " + schemaId);
-        }
-
-        return content;
+    public String getSchema(String schemaId) {
+        return schemaContents.get(schemaId);
     }
 
-    public Path getSchemaFilePath(String schemaId) throws Exception {
-        Path filePath = schemaFilePaths.get(schemaId);
-
-        if (filePath == null) {
-            throw new Exception("Schema file path not found: " + schemaId);
-        }
-
-        return filePath;
+    public Path getSchemaFilePath(String schemaId) {
+        return schemaFilePaths.get(schemaId);
     }
 }