Merge pull request #121 from xlate/120_reset_improperly_positioned_se…

…gment_elements Reset improperly positioned segment's elements in validation
xlate · Sep 25, 2020 · 73472ca · 73472ca
2 parents 73f2721 + 18c16d6
commit 73472ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/io/xlate/edi/internal/stream/validation/Validator.java b/src/main/java/io/xlate/edi/internal/stream/validation/Validator.java
@@ -638,6 +638,7 @@ boolean checkPeerSegments(CharSequence tag, UsageNode current, int startDepth, V
                 handler.segmentError(next.getId(), next.getLink(), SEGMENT_NOT_IN_PROPER_SEQUENCE);
 
                 next.incrementUsage();
+                next.resetChildren();
 
                 if (next.exceedsMaximumUsage(SEGMENT_VERSION)) {
                     handler.segmentError(next.getId(), next.getLink(), SEGMENT_EXCEEDS_MAXIMUM_USE);
@@ -928,6 +929,7 @@ public boolean validCompositeOccurrences(Dialect dialect, Location position) {
         this.composite = this.element;
         this.element = null;
         this.composite.incrementUsage();
+        // resetChildren?
 
         if (this.composite.exceedsMaximumUsage(version)) {
             elementErrors.add(new UsageError(this.composite, TOO_MANY_REPETITIONS));
@@ -943,6 +945,7 @@ public boolean validCompositeOccurrences(Dialect dialect, Location position) {
 
         if (implSegmentSelected) {
             this.implComposite.incrementUsage();
+            // resetChildren?
         }
 
         return elementErrors.isEmpty();

diff --git a/src/test/java/io/xlate/edi/internal/stream/SegmentValidationTest.java b/src/test/java/io/xlate/edi/internal/stream/SegmentValidationTest.java
@@ -46,6 +46,7 @@ public boolean accept(EDIStreamReader reader) {
             switch (reader.getEventType()) {
             case START_TRANSACTION:
             case SEGMENT_ERROR:
+            case ELEMENT_OCCURRENCE_ERROR:
                 return true;
             default:
                 return false;