Include Validation error message, line and column.

Author: meier-rene

src/main/java/massbank_export_api/api/ValidateApiDelegateImpl.java

@@ -1,27 +1,67 @@
 package massbank_export_api.api;
 
 import massbank.RecordParser;
+import massbank_export_api.model.ValidationError;
 import org.petitparser.context.Result;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
+import java.util.Map;
 
 @Primary
 @Service
 public class ValidateApiDelegateImpl implements ValidateApiDelegate {
 
-    final RecordParser recordparser = new RecordParser(new HashSet<>());
+    private final RecordParser recordParser;
+
+    public ValidateApiDelegateImpl() {
+        recordParser = new RecordParser(new HashSet<>());
+    }
 
     @Override
     public ResponseEntity<Void> validatePost(String body) {
-        Result result = recordparser.parse(body);
-        if (result.isSuccess()) return new ResponseEntity<>(HttpStatus.OK);
-        else {
-            return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+        if (body == null || body.trim().isEmpty()) {
+            return ResponseEntity.badRequest().build();
+        }
+
+        Result result = recordParser.parse(body);
+        if (result.isSuccess()) {
+            return ResponseEntity.ok().build();
+        }
+
+        String message = result.getMessage();
+        int pos = result.getPosition();
+
+        String[] tokens = body.split("\\n");
+        int offset = 0;
+        int lineNumber = 1;
+        int col = 0;
+        for (String token : tokens) {
+            offset += token.length() + 1;
+            if (pos < offset) {
+                col = pos - (offset - (token.length() + 1));
+                break;
+            }
+            lineNumber++;
         }
+
+        ValidationError error = new ValidationError();
+        error.setMessage(message);
+        error.setLine(lineNumber);
+        error.setColumn(col);
+
+        ResponseEntity<ValidationError> respWithBody =
+                ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .body(error);
+
+        @SuppressWarnings("unchecked")
+        ResponseEntity<Void> casted = (ResponseEntity<Void>)(ResponseEntity<?>) respWithBody;
+        return casted;
     }
 
 }

src/test/java/massbank_export_api/ExportApiControllerTest.java

@@ -501,10 +501,13 @@ public void testValidation() throws Exception {
             .content(validRecord))
             .andExpect(status().isOk());
 
+        String expectedResponse = "{ \"message\": \"letter or digit expected\", \"line\":1, \"column\":11 }";
         mockMvc.perform(post("/validate")
                 .contentType("text/plain")
                 .content(invalidRecord))
-            .andExpect(status().isUnprocessableEntity());
+            .andExpect(status().isUnprocessableEntity())
+            .andExpect(content().contentType("application/json"))
+            .andExpect(content().json(expectedResponse));
     }
 
 }