Skip to content

Commit 499bc28

Browse files
authored
HL errors no longer throw exception (#118)
1 parent 2a170bc commit 499bc28

19 files changed

+983
-492
lines changed

src/main/java/com/walmartlabs/x12/X12Parser.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.walmartlabs.x12;
1818

1919
import com.walmartlabs.x12.exceptions.X12ParserException;
20+
import com.walmartlabs.x12.util.X12ParsingUtil;
2021

2122
public interface X12Parser<T extends X12Document> {
2223

src/main/java/com/walmartlabs/x12/X12ParsingUtil.java

Lines changed: 0 additions & 264 deletions
This file was deleted.

src/main/java/com/walmartlabs/x12/dex/dx894/DefaultDex894Parser.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
package com.walmartlabs.x12.dex.dx894;
1818

1919
import com.walmartlabs.x12.X12Parser;
20-
import com.walmartlabs.x12.X12ParsingUtil;
2120
import com.walmartlabs.x12.X12Segment;
21+
import com.walmartlabs.x12.exceptions.X12ErrorDetail;
2222
import com.walmartlabs.x12.exceptions.X12ParserException;
2323
import com.walmartlabs.x12.types.InvoiceType;
2424
import com.walmartlabs.x12.types.ProductQualifier;
2525
import com.walmartlabs.x12.types.UnitMeasure;
2626
import com.walmartlabs.x12.util.ConversionUtil;
2727
import com.walmartlabs.x12.util.SourceToSegmentUtil;
28+
import com.walmartlabs.x12.util.X12ParsingUtil;
2829
import org.slf4j.Logger;
2930
import org.slf4j.LoggerFactory;
3031
import org.springframework.util.StringUtils;
@@ -329,7 +330,12 @@ protected void parseApplicationHeader(X12Segment headerSegment, Dex894 dex) {
329330
}
330331

331332
protected void parseVersion(Dex894 dex) {
332-
dex.setVersionNumber(X12ParsingUtil.parseVersion(dex.getVersion()));
333+
Integer version = X12ParsingUtil.parseVersion(dex.getVersion());
334+
if (version == null) {
335+
throw new X12ParserException(new X12ErrorDetail(DefaultDex894Parser.DEX_HEADER_ID, "DXS03", "Invalid version format"));
336+
} else {
337+
dex.setVersionNumber(version);
338+
}
333339
}
334340

335341
/**

src/main/java/com/walmartlabs/x12/standard/StandardX12Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.walmartlabs.x12.SegmentIterator;
2020
import com.walmartlabs.x12.X12Parser;
21-
import com.walmartlabs.x12.X12ParsingUtil;
2221
import com.walmartlabs.x12.X12Segment;
2322
import com.walmartlabs.x12.X12TransactionSet;
2423
import com.walmartlabs.x12.exceptions.X12ParserException;
@@ -27,6 +26,7 @@
2726
import com.walmartlabs.x12.standard.txset.UnhandledTransactionSet;
2827
import com.walmartlabs.x12.util.ConversionUtil;
2928
import com.walmartlabs.x12.util.SourceToSegmentUtil;
29+
import com.walmartlabs.x12.util.X12ParsingUtil;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
3232
import org.springframework.util.StringUtils;

src/main/java/com/walmartlabs/x12/standard/txset/AbstractTransactionSetParserChainable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package com.walmartlabs.x12.standard.txset;
1818

19-
import com.walmartlabs.x12.X12ParsingUtil;
2019
import com.walmartlabs.x12.X12Segment;
2120
import com.walmartlabs.x12.X12TransactionSet;
2221
import com.walmartlabs.x12.exceptions.X12ParserException;
2322
import com.walmartlabs.x12.standard.X12Group;
2423
import com.walmartlabs.x12.util.ConversionUtil;
24+
import com.walmartlabs.x12.util.X12ParsingUtil;
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727

0 commit comments

Comments
 (0)