Push writer output through lexer and proxy handler for validation

Fixes xlate#283 Fixes xlate#286 Signed-off-by: Michael Edgar <[email protected]>
MikeEdgar · May 18, 2023 · 4052443 · 4052443
1 parent 7970e6a
commit 4052443
Show file tree

Hide file tree

Showing 17 changed files with 1,029 additions and 618 deletions.
diff --git a/pom.xml b/pom.xml
@@ -352,7 +352,7 @@
         <jdk>(,11)</jdk>
       </activation>
       <properties>
-          <version.jakarta.json.api>2.0.1</version.jakarta.json.api>
+          <version.jakarta.json.api>2.0.2</version.jakarta.json.api>
           <version.parsson>1.0.2</version.parsson>
           <version.jakarta.xml.bind.api>3.0.1</version.jakarta.xml.bind.api>
           <version.jaxb-runtime>3.0.2</version.jaxb-runtime>

diff --git a/src/main/java/io/xlate/edi/internal/stream/StaEDIOutputFactory.java b/src/main/java/io/xlate/edi/internal/stream/StaEDIOutputFactory.java
@@ -41,6 +41,7 @@ public StaEDIOutputFactory() {
         supportedProperties.add(PRETTY_PRINT);
         supportedProperties.add(TRUNCATE_EMPTY_ELEMENTS);
         supportedProperties.add(FORMAT_ELEMENTS);
+        supportedProperties.add(EDI_VALIDATE_CONTROL_STRUCTURE);
 
         properties.put(PRETTY_PRINT, Boolean.FALSE);
     }

diff --git a/src/main/java/io/xlate/edi/internal/stream/StaEDIStreamWriter.java b/src/main/java/io/xlate/edi/internal/stream/StaEDIStreamWriter.java
diff --git a/src/main/java/io/xlate/edi/internal/stream/tokenization/EDIException.java b/src/main/java/io/xlate/edi/internal/stream/tokenization/EDIException.java
@@ -15,12 +15,12 @@
  ******************************************************************************/
 package io.xlate.edi.internal.stream.tokenization;
 
-import io.xlate.edi.stream.EDIStreamException;
-import io.xlate.edi.stream.Location;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import io.xlate.edi.stream.EDIStreamException;
+import io.xlate.edi.stream.Location;
+
 public class EDIException extends EDIStreamException {
 
     private static final long serialVersionUID = -2724168743697298348L;
@@ -41,7 +41,7 @@ public class EDIException extends EDIStreamException {
         exceptionMessages.put(INVALID_STATE,
                               "EDIE003 - Invalid processing state");
         exceptionMessages.put(INVALID_CHARACTER,
-                              "EDIE004 - Invalid input character");
+                              "EDIE004 - Invalid character");
         exceptionMessages.put(INCOMPLETE_STREAM,
                               "EDIE005 - Unexpected end of stream");
     }
@@ -55,7 +55,7 @@ public EDIException(String message) {
     }
 
     EDIException(Integer id, String message, Location location) {
-        super(exceptionMessages.get(id) + "; " + message, location);
+        super(buildMessage(exceptionMessages.get(id), location) + "; " + message, location);
     }
 
     public EDIException(Integer id, String message) {