From b55bd91883de478dc7c9568b238cf344d7b76521 Mon Sep 17 00:00:00 2001 From: pernyf Date: Thu, 26 Feb 2026 21:37:46 +0100 Subject: [PATCH 1/4] Pre-release fixes and API improvements for 2.0 - Fix IoUtil.getWriter() file corruption bug (WRITE without TRUNCATE_EXISTING) - Fix #ADRESS writing literal "null" for null subfields (now writes "") - Normalize getVALUTA() to return null when unset, matching other getters - Fix null-safety in SieDocumentComparer for VALUTA comparison - Rename SieVoucherMissmatchException to SieVoucherMismatchException - Encapsulate all public fields on SieDocumentReader with getters/setters - Wrap JAXBException in SieException in SIE 5 reader/writer public API - Remove dead commented-out code in IoUtil, Encoding, and SiePeriodValue - Remove redundant file.delete() in SieDocumentWriter.write() - Update README, DEVELOPER.md, and tests for API changes Co-Authored-By: Claude Opus 4.6 --- README.md | 6 +- docs/DEVELOPER.md | 2 +- src/main/java/alipsa/sieparser/Encoding.java | 6 - src/main/java/alipsa/sieparser/IoUtil.java | 27 +-- .../java/alipsa/sieparser/SieDataItem.java | 4 +- .../java/alipsa/sieparser/SieDocument.java | 8 +- .../alipsa/sieparser/SieDocumentComparer.java | 2 +- .../alipsa/sieparser/SieDocumentReader.java | 161 +++++++++++++++--- .../alipsa/sieparser/SieDocumentWriter.java | 14 +- .../java/alipsa/sieparser/SiePeriodValue.java | 13 -- ....java => SieVoucherMismatchException.java} | 6 +- .../sieparser/sie5/Sie5DocumentReader.java | 49 ++++-- .../sieparser/sie5/Sie5DocumentWriter.java | 49 ++++-- .../sieparser/SieDocumentReaderTest.java | 10 +- .../alipsa/sieparser/TestSieDocument.java | 2 +- 15 files changed, 233 insertions(+), 126 deletions(-) rename src/main/java/alipsa/sieparser/{SieVoucherMissmatchException.java => SieVoucherMismatchException.java} (86%) diff --git a/README.md b/README.md index 598b516..8dc7e78 100644 --- a/README.md +++ b/README.md @@ -79,11 +79,11 @@ For large files, use callbacks to process records without storing them all in me ```java SieDocumentReader reader = new SieDocumentReader(); -reader.streamValues = true; -reader.callbacks.setVER(voucher -> { +reader.setStreamValues(true); +reader.getCallbacks().setVER(voucher -> { // Process each voucher as it is parsed }); -reader.callbacks.setIB(periodValue -> { +reader.getCallbacks().setIB(periodValue -> { // Process each opening balance entry }); reader.readDocument("large-file.SE"); diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index 5eb32be..cfe0377 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -168,7 +168,7 @@ RuntimeException ├── SieDateException ├── SieMissingMandatoryDateException ├── SieMissingObjectException - ├── SieVoucherMissmatchException + ├── SieVoucherMismatchException └── MissingFieldException ``` diff --git a/src/main/java/alipsa/sieparser/Encoding.java b/src/main/java/alipsa/sieparser/Encoding.java index c964a96..b03a375 100644 --- a/src/main/java/alipsa/sieparser/Encoding.java +++ b/src/main/java/alipsa/sieparser/Encoding.java @@ -68,10 +68,4 @@ public static Collection getBytes(String value) { } return byteList; } - - /* - public byte[] getByteArray(String value) { - return value.getBytes(getCharset()); - } - */ } diff --git a/src/main/java/alipsa/sieparser/IoUtil.java b/src/main/java/alipsa/sieparser/IoUtil.java index 6e2a5cb..b3c2c36 100644 --- a/src/main/java/alipsa/sieparser/IoUtil.java +++ b/src/main/java/alipsa/sieparser/IoUtil.java @@ -24,11 +24,7 @@ of this software and associated documentation files (the "Software"), to deal package alipsa.sieparser; import java.io.*; -import java.nio.charset.CharsetDecoder; -import java.nio.charset.CharsetEncoder; -import java.nio.charset.CodingErrorAction; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; @@ -47,14 +43,7 @@ private IoUtil() {} * @throws IOException if the file cannot be opened */ public static BufferedReader getReader(String fileName) throws IOException { - /* - CharsetDecoder decoder = Encoding.getCharset().newDecoder(); - decoder.onMalformedInput(CodingErrorAction.REPORT); - InputStreamReader isReader = new InputStreamReader(new FileInputStream(fileName), decoder); - return new BufferedReader( isReader ); - */ return Files.newBufferedReader(Paths.get(fileName), Encoding.getCharset()); - } /** @@ -66,19 +55,7 @@ public static BufferedReader getReader(String fileName) throws IOException { * @throws IOException if the file cannot be opened or created */ public static BufferedWriter getWriter(String fileName) throws IOException { - /* - CharsetEncoder encoder = Encoding.getCharset().newEncoder(); - encoder.onUnmappableCharacter(CodingErrorAction.REPORT); - OutputStreamWriter osWriter = new OutputStreamWriter(new FileOutputStream(fileName), encoder); - return new BufferedWriter( osWriter ); - */ - Path filePath = Paths.get(fileName); - StandardOpenOption option; - if (Files.exists(filePath)) { - option = StandardOpenOption.WRITE; - } else { - option = StandardOpenOption.CREATE_NEW; - } - return Files.newBufferedWriter(Paths.get(fileName),Encoding.getCharset(), option); + return Files.newBufferedWriter(Paths.get(fileName), Encoding.getCharset(), + StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); } } diff --git a/src/main/java/alipsa/sieparser/SieDataItem.java b/src/main/java/alipsa/sieparser/SieDataItem.java index 82aa090..cf61665 100644 --- a/src/main/java/alipsa/sieparser/SieDataItem.java +++ b/src/main/java/alipsa/sieparser/SieDataItem.java @@ -265,7 +265,7 @@ public LocalDate getDate(int field) { if (foo.isEmpty()) return null; if (foo.length() != 8) { - getDocumentReader().callbacks.callbackException(new SieDateException(foo + " is not a valid date")); + getDocumentReader().getCallbacks().callbackException(new SieDateException(foo + " is not a valid date")); return null; } int y = Integer.parseInt(foo.substring(0, 4)); @@ -292,7 +292,7 @@ public List getObjects() { } } if (data == null) { - getDocumentReader().callbacks.callbackException(new SieMissingObjectException(getRawData())); + getDocumentReader().getCallbacks().callbackException(new SieMissingObjectException(getRawData())); return null; } diff --git a/src/main/java/alipsa/sieparser/SieDocument.java b/src/main/java/alipsa/sieparser/SieDocument.java index d7c29b9..1d973c0 100644 --- a/src/main/java/alipsa/sieparser/SieDocument.java +++ b/src/main/java/alipsa/sieparser/SieDocument.java @@ -471,13 +471,11 @@ public void setUB(List value) { } /** - * Returns the currency code (#VALUTA), or an empty string if not set. - * @return the currency code + * Returns the currency code (#VALUTA), or {@code null} if not set. + * Per the SIE specification, if this post is absent the reader should assume SEK. + * @return the currency code, or {@code null} if not set */ public String getVALUTA() { - if (valuta == null) { - return ""; - } return valuta; } diff --git a/src/main/java/alipsa/sieparser/SieDocumentComparer.java b/src/main/java/alipsa/sieparser/SieDocumentComparer.java index a411513..6f63b5d 100644 --- a/src/main/java/alipsa/sieparser/SieDocumentComparer.java +++ b/src/main/java/alipsa/sieparser/SieDocumentComparer.java @@ -120,7 +120,7 @@ private void compareNonListItems() { if (docA.getTAXAR() != docB.getTAXAR()) errors.add("TAXAR differs First, Second: '" + docA.getTAXAR() + "' , '" + docB.getTAXAR() + "'"); - if (!docA.getVALUTA().equals(docB.getVALUTA())) + if (!StringUtil.equals(docA.getVALUTA(), docB.getVALUTA())) errors.add("VALUTA differs First, Second: '" + docA.getVALUTA() + "' , '" + docB.getVALUTA() + "'"); } diff --git a/src/main/java/alipsa/sieparser/SieDocumentReader.java b/src/main/java/alipsa/sieparser/SieDocumentReader.java index 01ab924..859a506 100644 --- a/src/main/java/alipsa/sieparser/SieDocumentReader.java +++ b/src/main/java/alipsa/sieparser/SieDocumentReader.java @@ -41,34 +41,149 @@ of this software and associated documentation files (the "Software"), to deal */ public class SieDocumentReader { - /** Callbacks invoked during document reading for streaming processing. */ - public SieCallbacks callbacks = new SieCallbacks(); - /** When {@code true}, #BTRANS rows are ignored during parsing. */ - public boolean ignoreBTRANS = false; - /** When {@code true}, a missing #OMFATTN is not treated as a validation error. */ - public boolean ignoreMissingOMFATTNING = false; - /** When {@code true}, #RTRANS rows are ignored during parsing. */ - public boolean ignoreRTRANS = false; - /** When {@code true}, vouchers whose rows do not sum to zero are accepted. */ - public boolean allowUnbalancedVoucher = false; - /** When {@code true}, the #KSUMMA checksum is not verified. */ - public boolean ignoreKSUMMA = false; - /** When {@code true}, #UNDERDIM definitions are allowed. */ - public boolean allowUnderDimensions = false; - /** When {@code true}, references to undefined dimensions are accepted. */ - public boolean ignoreMissingDIM = false; + private SieCallbacks callbacks = new SieCallbacks(); + private boolean ignoreBTRANS = false; + private boolean ignoreMissingOMFATTNING = false; + private boolean ignoreRTRANS = false; + private boolean allowUnbalancedVoucher = false; + private boolean ignoreKSUMMA = false; + private boolean allowUnderDimensions = false; + private boolean ignoreMissingDIM = false; private EnumSet acceptSIETypes = null; private SieDocument sieDocument; private List validationExceptions; - /** When {@code true}, period values are only streamed via callbacks and not stored in the document. */ - public boolean streamValues = false; - /** The CRC32 calculator used for checksum verification. */ - public SieCRC32 CRC = new SieCRC32(); - /** When {@code true}, parsing errors are thrown as exceptions instead of being silently collected. */ - public boolean throwErrors = true; + private boolean streamValues = false; + private SieCRC32 CRC = new SieCRC32(); + private boolean throwErrors = true; private String fileName; private int parsingLineNumber = 0; + /** + * Returns the callbacks invoked during document reading. + * @return the callbacks + */ + public SieCallbacks getCallbacks() { return callbacks; } + + /** + * Sets the callbacks invoked during document reading. + * @param callbacks the callbacks to use + */ + public void setCallbacks(SieCallbacks callbacks) { this.callbacks = callbacks; } + + /** + * Returns whether #BTRANS rows are ignored during parsing. + * @return true if #BTRANS rows are ignored + */ + public boolean isIgnoreBTRANS() { return ignoreBTRANS; } + + /** + * Sets whether #BTRANS rows are ignored during parsing. + * @param ignoreBTRANS true to ignore #BTRANS rows + */ + public void setIgnoreBTRANS(boolean ignoreBTRANS) { this.ignoreBTRANS = ignoreBTRANS; } + + /** + * Returns whether a missing #OMFATTN is accepted. + * @return true if a missing #OMFATTN is accepted + */ + public boolean isIgnoreMissingOMFATTNING() { return ignoreMissingOMFATTNING; } + + /** + * Sets whether a missing #OMFATTN is accepted. + * @param ignoreMissingOMFATTNING true to accept a missing #OMFATTN + */ + public void setIgnoreMissingOMFATTNING(boolean ignoreMissingOMFATTNING) { this.ignoreMissingOMFATTNING = ignoreMissingOMFATTNING; } + + /** + * Returns whether #RTRANS rows are ignored during parsing. + * @return true if #RTRANS rows are ignored + */ + public boolean isIgnoreRTRANS() { return ignoreRTRANS; } + + /** + * Sets whether #RTRANS rows are ignored during parsing. + * @param ignoreRTRANS true to ignore #RTRANS rows + */ + public void setIgnoreRTRANS(boolean ignoreRTRANS) { this.ignoreRTRANS = ignoreRTRANS; } + + /** + * Returns whether unbalanced vouchers are accepted. + * @return true if unbalanced vouchers are accepted + */ + public boolean isAllowUnbalancedVoucher() { return allowUnbalancedVoucher; } + + /** + * Sets whether unbalanced vouchers are accepted. + * @param allowUnbalancedVoucher true to accept unbalanced vouchers + */ + public void setAllowUnbalancedVoucher(boolean allowUnbalancedVoucher) { this.allowUnbalancedVoucher = allowUnbalancedVoucher; } + + /** + * Returns whether the #KSUMMA checksum is ignored. + * @return true if the checksum is ignored + */ + public boolean isIgnoreKSUMMA() { return ignoreKSUMMA; } + + /** + * Sets whether the #KSUMMA checksum is ignored. + * @param ignoreKSUMMA true to ignore the checksum + */ + public void setIgnoreKSUMMA(boolean ignoreKSUMMA) { this.ignoreKSUMMA = ignoreKSUMMA; } + + /** + * Returns whether #UNDERDIM definitions are allowed. + * @return true if #UNDERDIM is allowed + */ + public boolean isAllowUnderDimensions() { return allowUnderDimensions; } + + /** + * Sets whether #UNDERDIM definitions are allowed. + * @param allowUnderDimensions true to allow #UNDERDIM + */ + public void setAllowUnderDimensions(boolean allowUnderDimensions) { this.allowUnderDimensions = allowUnderDimensions; } + + /** + * Returns whether references to undefined dimensions are accepted. + * @return true if undefined dimension references are accepted + */ + public boolean isIgnoreMissingDIM() { return ignoreMissingDIM; } + + /** + * Sets whether references to undefined dimensions are accepted. + * @param ignoreMissingDIM true to accept undefined dimension references + */ + public void setIgnoreMissingDIM(boolean ignoreMissingDIM) { this.ignoreMissingDIM = ignoreMissingDIM; } + + /** + * Returns whether period values are only streamed via callbacks and not stored in the document. + * @return true if values are streamed only + */ + public boolean isStreamValues() { return streamValues; } + + /** + * Sets whether period values are only streamed via callbacks and not stored in the document. + * @param streamValues true to stream values only + */ + public void setStreamValues(boolean streamValues) { this.streamValues = streamValues; } + + /** + * Returns the CRC32 calculator used for checksum verification. + * @return the CRC32 calculator + */ + public SieCRC32 getCRC() { return CRC; } + + /** + * Returns whether parsing errors are thrown as exceptions instead of being silently collected. + * @return true if errors are thrown + */ + public boolean isThrowErrors() { return throwErrors; } + + /** + * Sets whether parsing errors are thrown as exceptions instead of being silently collected. + * @param throwErrors true to throw errors as exceptions + */ + public void setThrowErrors(boolean throwErrors) { this.throwErrors = throwErrors; } + /** * Returns the SIE type version from a file without fully parsing it. * @param fileName the path to the SIE file @@ -602,7 +717,7 @@ private void closeVoucher(SieVoucher v) { check = check.add(r.getAmount()); } if (check.compareTo(BigDecimal.ZERO) != 0) - callbacks.callbackException(new SieVoucherMissmatchException( + callbacks.callbackException(new SieVoucherMismatchException( v.getSeries() + "." + v.getNumber() + " Sum is not zero.")); } diff --git a/src/main/java/alipsa/sieparser/SieDocumentWriter.java b/src/main/java/alipsa/sieparser/SieDocumentWriter.java index 8693ae5..e39da94 100644 --- a/src/main/java/alipsa/sieparser/SieDocumentWriter.java +++ b/src/main/java/alipsa/sieparser/SieDocumentWriter.java @@ -68,9 +68,6 @@ public SieDocumentWriter(SieDocument sie, WriteOptions options) { * @throws IOException if an I/O error occurs */ public void write(String fileName) throws IOException { - File file = new File(fileName); - if (file.exists()) file.delete(); - try (BufferedWriter bw = IoUtil.getWriter(fileName)) { writer = bw; writeContent(); @@ -329,12 +326,17 @@ private void writeKPTYP() throws IOException { } private void writeADRESS() throws IOException { - if (!(sieDoc.getFNAMN().getContact() == null && sieDoc.getFNAMN().getStreet() == null && sieDoc.getFNAMN().getZipCity() == null && sieDoc.getFNAMN().getPhone() == null)) { - writeLine(SIE.ADRESS + " \"" + sieDoc.getFNAMN().getContact() + "\" \"" + sieDoc.getFNAMN().getStreet() + - "\" \"" + sieDoc.getFNAMN().getZipCity() + "\" \"" + sieDoc.getFNAMN().getPhone() + "\""); + SieCompany fnamn = sieDoc.getFNAMN(); + if (!(fnamn.getContact() == null && fnamn.getStreet() == null && fnamn.getZipCity() == null && fnamn.getPhone() == null)) { + writeLine(SIE.ADRESS + " \"" + nullToEmpty(fnamn.getContact()) + "\" \"" + nullToEmpty(fnamn.getStreet()) + + "\" \"" + nullToEmpty(fnamn.getZipCity()) + "\" \"" + nullToEmpty(fnamn.getPhone()) + "\""); } } + private static String nullToEmpty(String s) { + return s == null ? "" : s; + } + private String getFNAMN() { return SIE.FNAMN + " \"" + sieDoc.getFNAMN().getName() + "\""; } diff --git a/src/main/java/alipsa/sieparser/SiePeriodValue.java b/src/main/java/alipsa/sieparser/SiePeriodValue.java index 80d105b..6f45ad5 100644 --- a/src/main/java/alipsa/sieparser/SiePeriodValue.java +++ b/src/main/java/alipsa/sieparser/SiePeriodValue.java @@ -170,17 +170,4 @@ public String getToken() { public void setToken(String token) { this.token = token; } - - /* - public SieVoucherRow toVoucherRow() throws Exception { - SieVoucherRow vr = new SieVoucherRow(); - return vr; - } - - public SieVoucherRow toInvertedVoucherRow() throws Exception { - SieVoucherRow vr = toVoucherRow(); - vr.setAmount(vr.getAmount() * -1); - return vr; - } - */ } diff --git a/src/main/java/alipsa/sieparser/SieVoucherMissmatchException.java b/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java similarity index 86% rename from src/main/java/alipsa/sieparser/SieVoucherMissmatchException.java rename to src/main/java/alipsa/sieparser/SieVoucherMismatchException.java index a15bb46..3ece3eb 100644 --- a/src/main/java/alipsa/sieparser/SieVoucherMissmatchException.java +++ b/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java @@ -29,13 +29,13 @@ of this software and associated documentation files (the "Software"), to deal /** * Thrown when the transaction rows of a voucher do not sum to zero. */ -public class SieVoucherMissmatchException extends SieException { +public class SieVoucherMismatchException extends SieException { /** - * Creates a new SieVoucherMissmatchException with the given description. + * Creates a new SieVoucherMismatchException with the given description. * * @param description a message identifying the mismatched voucher */ - public SieVoucherMissmatchException(String description) { + public SieVoucherMismatchException(String description) { super(description); } diff --git a/src/main/java/alipsa/sieparser/sie5/Sie5DocumentReader.java b/src/main/java/alipsa/sieparser/sie5/Sie5DocumentReader.java index 05d484a..31c5d87 100644 --- a/src/main/java/alipsa/sieparser/sie5/Sie5DocumentReader.java +++ b/src/main/java/alipsa/sieparser/sie5/Sie5DocumentReader.java @@ -1,5 +1,6 @@ package alipsa.sieparser.sie5; +import alipsa.sieparser.SieException; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Unmarshaller; @@ -40,11 +41,15 @@ public Sie5DocumentReader() {} * * @param fileName the path to the SIE 5 XML file * @return the parsed {@link Sie5Document} - * @throws JAXBException if the XML cannot be parsed or does not conform to the expected structure + * @throws SieException if the XML cannot be parsed or does not conform to the expected structure */ - public Sie5Document readDocument(String fileName) throws JAXBException { - Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); - return (Sie5Document) unmarshaller.unmarshal(new File(fileName)); + public Sie5Document readDocument(String fileName) { + try { + Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); + return (Sie5Document) unmarshaller.unmarshal(new File(fileName)); + } catch (JAXBException e) { + throw new SieException("Failed to read SIE 5 document: " + fileName, e); + } } /** @@ -52,11 +57,15 @@ public Sie5Document readDocument(String fileName) throws JAXBException { * * @param stream the input stream containing SIE 5 XML data * @return the parsed {@link Sie5Document} - * @throws JAXBException if the XML cannot be parsed or does not conform to the expected structure + * @throws SieException if the XML cannot be parsed or does not conform to the expected structure */ - public Sie5Document readDocument(InputStream stream) throws JAXBException { - Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); - return (Sie5Document) unmarshaller.unmarshal(stream); + public Sie5Document readDocument(InputStream stream) { + try { + Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); + return (Sie5Document) unmarshaller.unmarshal(stream); + } catch (JAXBException e) { + throw new SieException("Failed to read SIE 5 document from stream", e); + } } /** @@ -64,11 +73,15 @@ public Sie5Document readDocument(InputStream stream) throws JAXBException { * * @param fileName the path to the SIE 5 entry XML file * @return the parsed {@link Sie5Entry} - * @throws JAXBException if the XML cannot be parsed or does not conform to the expected structure + * @throws SieException if the XML cannot be parsed or does not conform to the expected structure */ - public Sie5Entry readEntry(String fileName) throws JAXBException { - Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); - return (Sie5Entry) unmarshaller.unmarshal(new File(fileName)); + public Sie5Entry readEntry(String fileName) { + try { + Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); + return (Sie5Entry) unmarshaller.unmarshal(new File(fileName)); + } catch (JAXBException e) { + throw new SieException("Failed to read SIE 5 entry: " + fileName, e); + } } /** @@ -79,10 +92,14 @@ public Sie5Entry readEntry(String fileName) throws JAXBException { * * @param stream the input stream containing SIE 5 entry XML data * @return the parsed {@link Sie5Entry} - * @throws JAXBException if the XML cannot be parsed or does not conform to the expected structure + * @throws SieException if the XML cannot be parsed or does not conform to the expected structure */ - public Sie5Entry readEntry(InputStream stream) throws JAXBException { - Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); - return unmarshaller.unmarshal(new StreamSource(stream), Sie5Entry.class).getValue(); + public Sie5Entry readEntry(InputStream stream) { + try { + Unmarshaller unmarshaller = CONTEXT.createUnmarshaller(); + return unmarshaller.unmarshal(new StreamSource(stream), Sie5Entry.class).getValue(); + } catch (JAXBException e) { + throw new SieException("Failed to read SIE 5 entry from stream", e); + } } } diff --git a/src/main/java/alipsa/sieparser/sie5/Sie5DocumentWriter.java b/src/main/java/alipsa/sieparser/sie5/Sie5DocumentWriter.java index d68fb43..95f3879 100644 --- a/src/main/java/alipsa/sieparser/sie5/Sie5DocumentWriter.java +++ b/src/main/java/alipsa/sieparser/sie5/Sie5DocumentWriter.java @@ -1,5 +1,6 @@ package alipsa.sieparser.sie5; +import alipsa.sieparser.SieException; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; @@ -38,11 +39,15 @@ public Sie5DocumentWriter() {} * * @param doc the document to write * @param fileName the path of the output file - * @throws JAXBException if the document cannot be marshalled + * @throws SieException if the document cannot be marshalled */ - public void write(Sie5Document doc, String fileName) throws JAXBException { - Marshaller marshaller = createMarshaller(); - marshaller.marshal(doc, new File(fileName)); + public void write(Sie5Document doc, String fileName) { + try { + Marshaller marshaller = createMarshaller(); + marshaller.marshal(doc, new File(fileName)); + } catch (JAXBException e) { + throw new SieException("Failed to write SIE 5 document: " + fileName, e); + } } /** @@ -50,11 +55,15 @@ public void write(Sie5Document doc, String fileName) throws JAXBException { * * @param doc the document to write * @param stream the output stream to write to - * @throws JAXBException if the document cannot be marshalled + * @throws SieException if the document cannot be marshalled */ - public void write(Sie5Document doc, OutputStream stream) throws JAXBException { - Marshaller marshaller = createMarshaller(); - marshaller.marshal(doc, stream); + public void write(Sie5Document doc, OutputStream stream) { + try { + Marshaller marshaller = createMarshaller(); + marshaller.marshal(doc, stream); + } catch (JAXBException e) { + throw new SieException("Failed to write SIE 5 document to stream", e); + } } /** @@ -62,11 +71,15 @@ public void write(Sie5Document doc, OutputStream stream) throws JAXBException { * * @param entry the entry document to write * @param fileName the path of the output file - * @throws JAXBException if the document cannot be marshalled + * @throws SieException if the document cannot be marshalled */ - public void writeEntry(Sie5Entry entry, String fileName) throws JAXBException { - Marshaller marshaller = createMarshaller(); - marshaller.marshal(entry, new File(fileName)); + public void writeEntry(Sie5Entry entry, String fileName) { + try { + Marshaller marshaller = createMarshaller(); + marshaller.marshal(entry, new File(fileName)); + } catch (JAXBException e) { + throw new SieException("Failed to write SIE 5 entry: " + fileName, e); + } } /** @@ -74,11 +87,15 @@ public void writeEntry(Sie5Entry entry, String fileName) throws JAXBException { * * @param entry the entry document to write * @param stream the output stream to write to - * @throws JAXBException if the document cannot be marshalled + * @throws SieException if the document cannot be marshalled */ - public void writeEntry(Sie5Entry entry, OutputStream stream) throws JAXBException { - Marshaller marshaller = createMarshaller(); - marshaller.marshal(entry, stream); + public void writeEntry(Sie5Entry entry, OutputStream stream) { + try { + Marshaller marshaller = createMarshaller(); + marshaller.marshal(entry, stream); + } catch (JAXBException e) { + throw new SieException("Failed to write SIE 5 entry to stream", e); + } } private Marshaller createMarshaller() throws JAXBException { diff --git a/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java b/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java index 144918b..8c6a202 100644 --- a/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java +++ b/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java @@ -27,7 +27,7 @@ public void readType2() throws IOException { URL url = Thread.currentThread().getContextClassLoader().getResource("samples/1_BL0001_typ2.SE"); assertNotNull(url); SieDocumentReader reader = new SieDocumentReader(); - reader.ignoreMissingOMFATTNING = true; + reader.setIgnoreMissingOMFATTNING(true); SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); assertEquals(2, doc.getSIETYP()); } @@ -45,7 +45,7 @@ public void readType4() throws IOException { @Test public void allowUnbalancedVoucher() throws IOException { SieDocumentReader reader = new SieDocumentReader(); - reader.allowUnbalancedVoucher = true; + reader.setAllowUnbalancedVoucher(true); assertDoesNotThrow(() -> { // Should not throw even if vouchers are unbalanced // (the flag prevents the balance check) @@ -60,7 +60,7 @@ public void acceptSieTypesFilter() throws IOException { // Only accept type 2 - should reject type 4 file SieDocumentReader reader = new SieDocumentReader(); reader.setAcceptSIETypes(EnumSet.of(SieType.TYPE_2)); - reader.throwErrors = true; + reader.setThrowErrors(true); assertThrows(RuntimeException.class, () -> { reader.readDocument(new File(url.getFile()).getAbsolutePath()); @@ -85,7 +85,7 @@ public void ignoreKSUMMA() throws IOException { assertNotNull(url); SieDocumentReader reader = new SieDocumentReader(); - reader.ignoreKSUMMA = true; + reader.setIgnoreKSUMMA(true); SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); assertNotNull(doc); } @@ -106,7 +106,7 @@ public void ignoreBTRANS() throws IOException { assertNotNull(url); SieDocumentReader reader = new SieDocumentReader(); - reader.ignoreBTRANS = true; + reader.setIgnoreBTRANS(true); SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); assertNotNull(doc); diff --git a/src/test/java/alipsa/sieparser/TestSieDocument.java b/src/test/java/alipsa/sieparser/TestSieDocument.java index 02ef44a..73cd881 100644 --- a/src/test/java/alipsa/sieparser/TestSieDocument.java +++ b/src/test/java/alipsa/sieparser/TestSieDocument.java @@ -162,7 +162,7 @@ private SieDocument readDocument(String fileName, boolean ignoreOMFATTN) { assertTrue(file.exists(), "SIE file not found at " + file.getAbsolutePath()); SieDocumentReader reader = new SieDocumentReader(); if (ignoreOMFATTN) { - reader.ignoreMissingOMFATTNING = true; + reader.setIgnoreMissingOMFATTNING(true); } doc = reader.readDocument(file.getAbsolutePath()); if (reader.getValidationExceptions().size() > 0) { From df90521d05da0b5c36727cad23e0b6cfed627055 Mon Sep 17 00:00:00 2001 From: pernyf Date: Thu, 26 Feb 2026 21:46:57 +0100 Subject: [PATCH 2/4] Medium-priority fixes: robust date parsing, exception cause chains, and new tests - Wrap date parsing in SieDataItem.getDate() with try-catch for DateTimeException - Make Encoding.defaultCharset final and remove unused logger field - Add cause constructors to all 8 exception classes for proper exception chaining - Add 7 new tests covering ignoreRTRANS, streamValues, constructor params, invalid file detection, throwErrors collection, and invalid date handling Co-Authored-By: Claude Opus 4.6 --- src/main/java/alipsa/sieparser/Encoding.java | 7 +- .../sieparser/MissingFieldException.java | 10 ++ .../java/alipsa/sieparser/SieDataItem.java | 13 ++- .../alipsa/sieparser/SieDateException.java | 9 ++ .../SieInvalidChecksumException.java | 9 ++ .../sieparser/SieInvalidFeatureException.java | 9 ++ .../sieparser/SieInvalidFileException.java | 9 ++ .../SieMissingMandatoryDateException.java | 9 ++ .../sieparser/SieMissingObjectException.java | 9 ++ .../SieVoucherMismatchException.java | 9 ++ .../sieparser/SieDocumentReaderTest.java | 107 ++++++++++++++++++ 11 files changed, 190 insertions(+), 10 deletions(-) diff --git a/src/main/java/alipsa/sieparser/Encoding.java b/src/main/java/alipsa/sieparser/Encoding.java index b03a375..6999004 100644 --- a/src/main/java/alipsa/sieparser/Encoding.java +++ b/src/main/java/alipsa/sieparser/Encoding.java @@ -25,9 +25,6 @@ of this software and associated documentation files (the "Software"), to deal package alipsa.sieparser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; @@ -41,9 +38,7 @@ public class Encoding { private Encoding() {} - Logger logger = LoggerFactory.getLogger(Encoding.class); - - private static Charset defaultCharset=Charset.forName("IBM437"); + private static final Charset defaultCharset = Charset.forName("IBM437"); /** * Returns the charset used for SIE file encoding (IBM437). diff --git a/src/main/java/alipsa/sieparser/MissingFieldException.java b/src/main/java/alipsa/sieparser/MissingFieldException.java index 235b126..ec20c0b 100644 --- a/src/main/java/alipsa/sieparser/MissingFieldException.java +++ b/src/main/java/alipsa/sieparser/MissingFieldException.java @@ -38,4 +38,14 @@ public class MissingFieldException extends SieException { public MissingFieldException(String s) { super(s); } + + /** + * Creates a new MissingFieldException with the given message and cause. + * + * @param s the detail message describing which field is missing + * @param cause the underlying cause + */ + public MissingFieldException(String s, Throwable cause) { + super(s, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieDataItem.java b/src/main/java/alipsa/sieparser/SieDataItem.java index cf61665..49f83e9 100644 --- a/src/main/java/alipsa/sieparser/SieDataItem.java +++ b/src/main/java/alipsa/sieparser/SieDataItem.java @@ -268,10 +268,15 @@ public LocalDate getDate(int field) { getDocumentReader().getCallbacks().callbackException(new SieDateException(foo + " is not a valid date")); return null; } - int y = Integer.parseInt(foo.substring(0, 4)); - int m = Integer.parseInt(foo.substring(4, 6)); - int d = Integer.parseInt(foo.substring(6, 8)); - return LocalDate.of(y, m, d); + try { + int y = Integer.parseInt(foo.substring(0, 4)); + int m = Integer.parseInt(foo.substring(4, 6)); + int d = Integer.parseInt(foo.substring(6, 8)); + return LocalDate.of(y, m, d); + } catch (NumberFormatException | java.time.DateTimeException e) { + getDocumentReader().getCallbacks().callbackException(new SieDateException(foo + " is not a valid date")); + return null; + } } /** diff --git a/src/main/java/alipsa/sieparser/SieDateException.java b/src/main/java/alipsa/sieparser/SieDateException.java index 3b6ecb3..0926b0e 100644 --- a/src/main/java/alipsa/sieparser/SieDateException.java +++ b/src/main/java/alipsa/sieparser/SieDateException.java @@ -40,4 +40,13 @@ public SieDateException(String description) { super(description); } + /** + * Creates a new SieDateException with the given description and cause. + * + * @param description a message describing the invalid date + * @param cause the underlying cause + */ + public SieDateException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieInvalidChecksumException.java b/src/main/java/alipsa/sieparser/SieInvalidChecksumException.java index 419e98e..59ab719 100644 --- a/src/main/java/alipsa/sieparser/SieInvalidChecksumException.java +++ b/src/main/java/alipsa/sieparser/SieInvalidChecksumException.java @@ -39,4 +39,13 @@ public SieInvalidChecksumException(String description) { super(description); } + /** + * Creates a new SieInvalidChecksumException with the given description and cause. + * + * @param description a message describing the checksum mismatch + * @param cause the underlying cause + */ + public SieInvalidChecksumException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieInvalidFeatureException.java b/src/main/java/alipsa/sieparser/SieInvalidFeatureException.java index c744f98..0010e5a 100644 --- a/src/main/java/alipsa/sieparser/SieInvalidFeatureException.java +++ b/src/main/java/alipsa/sieparser/SieInvalidFeatureException.java @@ -40,4 +40,13 @@ public SieInvalidFeatureException(String description) { super(description); } + /** + * Creates a new SieInvalidFeatureException with the given description and cause. + * + * @param description a message describing the invalid feature usage + * @param cause the underlying cause + */ + public SieInvalidFeatureException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieInvalidFileException.java b/src/main/java/alipsa/sieparser/SieInvalidFileException.java index 1af5766..8f07d4b 100644 --- a/src/main/java/alipsa/sieparser/SieInvalidFileException.java +++ b/src/main/java/alipsa/sieparser/SieInvalidFileException.java @@ -40,4 +40,13 @@ public SieInvalidFileException(String description) { super(description); } + /** + * Creates a new SieInvalidFileException with the given description and cause. + * + * @param description a message identifying the invalid file + * @param cause the underlying cause + */ + public SieInvalidFileException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieMissingMandatoryDateException.java b/src/main/java/alipsa/sieparser/SieMissingMandatoryDateException.java index 23537f1..48d6a2b 100644 --- a/src/main/java/alipsa/sieparser/SieMissingMandatoryDateException.java +++ b/src/main/java/alipsa/sieparser/SieMissingMandatoryDateException.java @@ -39,4 +39,13 @@ public SieMissingMandatoryDateException(String description) { super(description); } + /** + * Creates a new SieMissingMandatoryDateException with the given description and cause. + * + * @param description a message describing which date is missing + * @param cause the underlying cause + */ + public SieMissingMandatoryDateException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieMissingObjectException.java b/src/main/java/alipsa/sieparser/SieMissingObjectException.java index 9e77172..23e7c30 100644 --- a/src/main/java/alipsa/sieparser/SieMissingObjectException.java +++ b/src/main/java/alipsa/sieparser/SieMissingObjectException.java @@ -39,4 +39,13 @@ public SieMissingObjectException(String description) { super(description); } + /** + * Creates a new SieMissingObjectException with the given description and cause. + * + * @param description a message describing the missing object + * @param cause the underlying cause + */ + public SieMissingObjectException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java b/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java index 3ece3eb..454c068 100644 --- a/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java +++ b/src/main/java/alipsa/sieparser/SieVoucherMismatchException.java @@ -39,4 +39,13 @@ public SieVoucherMismatchException(String description) { super(description); } + /** + * Creates a new SieVoucherMismatchException with the given description and cause. + * + * @param description a message identifying the mismatched voucher + * @param cause the underlying cause + */ + public SieVoucherMismatchException(String description, Throwable cause) { + super(description, cause); + } } diff --git a/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java b/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java index 8c6a202..516e0ca 100644 --- a/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java +++ b/src/test/java/alipsa/sieparser/SieDocumentReaderTest.java @@ -1,11 +1,17 @@ package alipsa.sieparser; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import static org.junit.jupiter.api.Assertions.*; @@ -148,4 +154,105 @@ public void rarsParsed() throws IOException { SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); assertFalse(doc.getRars().isEmpty(), "Booking years should be parsed"); } + + @Test + public void ignoreRTRANS() throws IOException { + URL url = Thread.currentThread().getContextClassLoader().getResource("samples/3_BL0001_typ4.SE"); + assertNotNull(url); + + SieDocumentReader reader = new SieDocumentReader(); + reader.setIgnoreRTRANS(true); + SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); + assertNotNull(doc); + + for (SieVoucher v : doc.getVER()) { + for (SieVoucherRow r : v.getRows()) { + assertNotEquals("#RTRANS", r.getToken()); + } + } + } + + @Test + public void streamValuesDoesNotStoreInDocument() throws IOException { + URL url = Thread.currentThread().getContextClassLoader().getResource("samples/1_BL0001_typ2.SE"); + assertNotNull(url); + + AtomicInteger ibCount = new AtomicInteger(0); + AtomicInteger ubCount = new AtomicInteger(0); + + SieDocumentReader reader = new SieDocumentReader(); + reader.setStreamValues(true); + reader.setIgnoreMissingOMFATTNING(true); + reader.getCallbacks().setIB(pv -> ibCount.incrementAndGet()); + reader.getCallbacks().setUB(pv -> ubCount.incrementAndGet()); + SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); + + assertTrue(doc.getIB().isEmpty(), "IB should not be stored when streaming"); + assertTrue(doc.getUB().isEmpty(), "UB should not be stored when streaming"); + assertTrue(ibCount.get() > 0, "IB callback should have been called"); + assertTrue(ubCount.get() > 0, "UB callback should have been called"); + } + + @Test + public void constructorWithParameters() throws IOException { + URL url = Thread.currentThread().getContextClassLoader().getResource("samples/1_BL0001_typ2.SE"); + assertNotNull(url); + + SieDocumentReader reader = new SieDocumentReader(false, true, false, true); + assertTrue(reader.isIgnoreMissingOMFATTNING()); + assertTrue(reader.isThrowErrors()); + assertFalse(reader.isIgnoreBTRANS()); + assertFalse(reader.isStreamValues()); + + SieDocument doc = reader.readDocument(new File(url.getFile()).getAbsolutePath()); + assertNotNull(doc); + } + + @Test + public void invalidFileThrowsException(@TempDir Path tempDir) throws IOException { + Path badFile = tempDir.resolve("bad.SE"); + Files.writeString(badFile, "This is not a SIE file\n"); + + SieDocumentReader reader = new SieDocumentReader(); + reader.setThrowErrors(true); + assertThrows(SieInvalidFileException.class, () -> { + reader.readDocument(badFile.toString()); + }); + } + + @Test + public void throwErrorsFalseCollectsExceptions(@TempDir Path tempDir) throws IOException { + Path badFile = tempDir.resolve("bad.SE"); + Files.writeString(badFile, "This is not a SIE file\n"); + + SieDocumentReader reader = new SieDocumentReader(); + reader.setThrowErrors(false); + List collected = new ArrayList<>(); + reader.getCallbacks().setSieException(collected::add); + SieDocument doc = reader.readDocument(badFile.toString()); + + assertNull(doc, "Should return null for invalid file"); + assertFalse(collected.isEmpty(), "Exceptions should be collected"); + assertInstanceOf(SieInvalidFileException.class, collected.get(0)); + } + + @Test + public void invalidDateHandledGracefully(@TempDir Path tempDir) throws IOException { + // Create a minimal SIE file with an invalid date (Feb 30) + String content = "#FLAGGA 0\n#SIETYP 4\n#PROGRAM \"Test\" 1.0\n#FORMAT PC8\n" + + "#GEN 20220230\n#FNAMN \"Test\"\n#KONTO 1000 \"Kassa\"\n#RAR 0 20220101 20221231\n"; + Path sieFile = tempDir.resolve("invalid_date.SE"); + Files.writeString(sieFile, content, Encoding.getCharset()); + + List collected = new ArrayList<>(); + SieDocumentReader reader = new SieDocumentReader(); + reader.setThrowErrors(false); + reader.getCallbacks().setSieException(collected::add); + SieDocument doc = reader.readDocument(sieFile.toString()); + + // GEN date should be null due to invalid date + assertNull(doc.getGEN_DATE(), "Invalid date should result in null"); + assertTrue(collected.stream().anyMatch(e -> e instanceof SieDateException), + "Should report a SieDateException for invalid date"); + } } From d9db753cffedb7e123c51f160467359328b2f195 Mon Sep 17 00:00:00 2001 From: pernyf Date: Thu, 26 Feb 2026 22:10:42 +0100 Subject: [PATCH 3/4] Low-priority fixes: CI pipeline, boxing overhead, and god class refactoring Add GitHub Actions CI workflow for build/test on push/PR to master. Eliminate Byte boxing in Encoding.getBytes() and SieCRC32 by using byte[] directly. Refactor SieDocumentReader to replace 35-branch if/else chain with a Map> dispatch table. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/ci.yml | 33 ++ src/main/java/alipsa/sieparser/Encoding.java | 16 +- src/main/java/alipsa/sieparser/SieCRC32.java | 15 +- .../alipsa/sieparser/SieDocumentReader.java | 286 ++++++++++-------- 4 files changed, 197 insertions(+), 153 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ca77abb --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build + run: ./gradlew build + + - name: Upload test reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: test-reports + path: build/reports/tests/ diff --git a/src/main/java/alipsa/sieparser/Encoding.java b/src/main/java/alipsa/sieparser/Encoding.java index 6999004..9639477 100644 --- a/src/main/java/alipsa/sieparser/Encoding.java +++ b/src/main/java/alipsa/sieparser/Encoding.java @@ -26,9 +26,6 @@ of this software and associated documentation files (the "Software"), to deal package alipsa.sieparser; import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; /** * Handles character encoding for SIE files. @@ -50,17 +47,12 @@ public static Charset getCharset() { } /** - * Converts a string to a collection of bytes using the SIE charset. + * Converts a string to a byte array using the SIE charset. * * @param value the string to convert - * @return a collection of bytes representing the string in IBM437 encoding + * @return a byte array representing the string in IBM437 encoding */ - public static Collection getBytes(String value) { - byte[] byteArray = value.getBytes(getCharset()); - List byteList = new ArrayList<>(); - for (byte b : byteArray) { - byteList.add(Byte.valueOf(b)); - } - return byteList; + public static byte[] getBytes(String value) { + return value.getBytes(getCharset()); } } diff --git a/src/main/java/alipsa/sieparser/SieCRC32.java b/src/main/java/alipsa/sieparser/SieCRC32.java index 225924c..502266a 100644 --- a/src/main/java/alipsa/sieparser/SieCRC32.java +++ b/src/main/java/alipsa/sieparser/SieCRC32.java @@ -25,9 +25,6 @@ of this software and associated documentation files (the "Software"), to deal package alipsa.sieparser; -import java.util.ArrayList; -import java.util.List; - /** * Implementation of the CRC32 checksum algorithm as specified in the SIE file format (#KSUMMA). * Used to verify the integrity of SIE file data. @@ -79,13 +76,11 @@ public void start() { * @param item the data item to include in the checksum */ public void addData(SieDataItem item) { - List buffer = new ArrayList<>(); - buffer.addAll(Encoding.getBytes(item.getItemType())); + crcAccumulate(Encoding.getBytes(item.getItemType())); for (String d : item.getData()) { String foo = d.replace("{", "").replace("}", ""); - buffer.addAll(Encoding.getBytes(foo)); + crcAccumulate(Encoding.getBytes(foo)); } - cRC_accumulate(buffer); } /** @@ -96,12 +91,12 @@ public long checksum() { return (~crc); } - private void cRC_accumulate(List buffer) { + private void crcAccumulate(byte[] buffer) { long temp1; long temp2; - for (Byte p : buffer) { + for (byte p : buffer) { temp1 = (crc >> 8) & 0x00FFFFFF; - temp2 = CRCTable[((int) crc ^ p.byteValue()) & 0xff]; + temp2 = CRCTable[((int) crc ^ p) & 0xff]; crc = temp1 ^ temp2; } } diff --git a/src/main/java/alipsa/sieparser/SieDocumentReader.java b/src/main/java/alipsa/sieparser/SieDocumentReader.java index 859a506..36617f1 100644 --- a/src/main/java/alipsa/sieparser/SieDocumentReader.java +++ b/src/main/java/alipsa/sieparser/SieDocumentReader.java @@ -31,7 +31,9 @@ of this software and associated documentation files (the "Software"), to deal import java.time.LocalDate; import java.util.ArrayList; import java.util.EnumSet; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.function.Consumer; /** @@ -57,6 +59,9 @@ public class SieDocumentReader { private boolean throwErrors = true; private String fileName; private int parsingLineNumber = 0; + private SieVoucher curVoucher; + private boolean abortParsing; + private final Map> handlers = new LinkedHashMap<>(); /** * Returns the callbacks invoked during document reading. @@ -208,6 +213,7 @@ public static int getSieVersion(String fileName) throws IOException { public SieDocumentReader() { sieDocument = new SieDocument(); setValidationExceptions(new ArrayList<>()); + initHandlers(); } /** @@ -257,6 +263,9 @@ public void setAcceptSIETypes(EnumSet acceptSIETypes) { */ public SieDocument readDocument(String fileName) throws IOException { this.fileName = fileName; + curVoucher = null; + abortParsing = false; + if (throwErrors) { Consumer existing = callbacks.getSieException(); callbacks.setSieException(ex -> { @@ -266,7 +275,6 @@ public SieDocument readDocument(String fileName) throws IOException { }); } - SieVoucher curVoucher = null; boolean firstLine = true; parsingLineNumber = 0; @@ -286,141 +294,20 @@ public SieDocument readDocument(String fileName) throws IOException { if (!ignoreKSUMMA && CRC.isStarted() && !SIE.KSUMMA.equals(di.getItemType())) CRC.addData(di); - SiePeriodValue pv; String itemType = di.getItemType(); - if (SIE.ADRESS.equals(itemType)) { - sieDocument.getFNAMN().setContact(di.getString(0)); - sieDocument.getFNAMN().setStreet(di.getString(1)); - sieDocument.getFNAMN().setZipCity(di.getString(2)); - sieDocument.getFNAMN().setPhone(di.getString(3)); - } else if (SIE.BKOD.equals(itemType)) { - sieDocument.getFNAMN().setSni(di.getInt(0)); - } else if (SIE.BTRANS.equals(itemType)) { - if (!ignoreBTRANS) { - if (curVoucher == null) { - callbacks.callbackException(new SieParseException( - "#BTRANS outside #VER block at line " + parsingLineNumber)); - } else { - parseTRANS(di, curVoucher); - } - } - } else if (SIE.DIM.equals(itemType)) { - parseDimension(di); - } else if (SIE.ENHET.equals(itemType)) { - parseENHET(di); - } else if (SIE.FLAGGA.equals(itemType)) { - sieDocument.setFLAGGA(di.getInt(0)); - } else if (SIE.FNAMN.equals(itemType)) { - sieDocument.getFNAMN().setName(di.getString(0)); - } else if (SIE.FNR.equals(itemType)) { - sieDocument.getFNAMN().setCode(di.getString(0)); - } else if (SIE.FORMAT.equals(itemType)) { - sieDocument.setFORMAT(di.getString(0)); - } else if (SIE.FTYP.equals(itemType)) { - sieDocument.getFNAMN().setOrgType(di.getString(0)); - } else if (SIE.GEN.equals(itemType)) { - sieDocument.setGEN_DATE(di.getDate(0)); - sieDocument.setGEN_NAMN(di.getString(1)); - } else if (SIE.IB.equals(itemType)) { - parseIB(di); - } else if (SIE.KONTO.equals(itemType)) { - parseKONTO(di); - } else if (SIE.KSUMMA.equals(itemType)) { - if (!ignoreKSUMMA) { - if (CRC.isStarted()) { - parseKSUMMA(di); - } else { - CRC.start(); - } - } - } else if (SIE.KTYP.equals(itemType)) { - parseKTYP(di); - } else if (SIE.KPTYP.equals(itemType)) { - sieDocument.setKPTYP(di.getString(0)); - } else if (SIE.OBJEKT.equals(itemType)) { - parseOBJEKT(di); - } else if (SIE.OIB.equals(itemType)) { - pv = parseOIB_OUB(di); - callbacks.callbackOIB(pv); - if (!streamValues) sieDocument.getOIB().add(pv); - } else if (SIE.OUB.equals(itemType)) { - pv = parseOIB_OUB(di); - callbacks.callbackOUB(pv); - if (!streamValues) sieDocument.getOUB().add(pv); - } else if (SIE.ORGNR.equals(itemType)) { - sieDocument.getFNAMN().setOrgIdentifier(di.getString(0)); - } else if (SIE.OMFATTN.equals(itemType)) { - sieDocument.setOMFATTN(di.getDate(0)); - } else if (SIE.PBUDGET.equals(itemType)) { - pv = parsePBUDGET_PSALDO(di); - if (pv != null) { - callbacks.callbackPBUDGET(pv); - if (!streamValues) sieDocument.getPBUDGET().add(pv); - } - } else if (SIE.PROGRAM.equals(itemType)) { - sieDocument.setPROGRAM(di.getData()); - } else if (SIE.PROSA.equals(itemType)) { - sieDocument.setPROSA(di.getString(0)); - } else if (SIE.PSALDO.equals(itemType)) { - pv = parsePBUDGET_PSALDO(di); - if (pv != null) { - callbacks.callbackPSALDO(pv); - if (!streamValues) sieDocument.getPSALDO().add(pv); - } - } else if (SIE.RAR.equals(itemType)) { - parseRAR(di); - } else if (SIE.RTRANS.equals(itemType)) { - if (!ignoreRTRANS) { - if (curVoucher == null) { - callbacks.callbackException(new SieParseException( - "#RTRANS outside #VER block at line " + parsingLineNumber)); - } else { - parseTRANS(di, curVoucher); - } - } - } else if (SIE.SIETYP.equals(itemType)) { - sieDocument.setSIETYP(di.getInt(0)); - if (acceptSIETypes != null) { - try { - SieType parsed = SieType.fromValue(di.getInt(0)); - if (!acceptSIETypes.contains(parsed)) { - callbacks.callbackException(new SieInvalidFeatureException( - "SIE type " + di.getInt(0) + " is not accepted")); - return null; - } - } catch (IllegalArgumentException e) { - callbacks.callbackException(new SieInvalidFeatureException( - "Unknown SIE type: " + di.getInt(0))); - } - } - } else if (SIE.SRU.equals(itemType)) { - parseSRU(di); - } else if (SIE.TAXAR.equals(itemType)) { - sieDocument.setTAXAR(di.getInt(0)); - } else if (SIE.UB.equals(itemType)) { - parseUB(di); - } else if (SIE.TRANS.equals(itemType)) { - if (curVoucher == null) { - callbacks.callbackException(new SieParseException( - "#TRANS outside #VER block at line " + parsingLineNumber)); - } else { - parseTRANS(di, curVoucher); - } - } else if (SIE.RES.equals(itemType)) { - parseRES(di); - } else if (SIE.UNDERDIM.equals(itemType)) { - parseUnderDimension(di); - } else if (SIE.VALUTA.equals(itemType)) { - sieDocument.setVALUTA(di.getString(0)); - } else if (SIE.VER.equals(itemType)) { - curVoucher = parseVER(di); - } else if ("".equals(itemType)) { - } else if ("{".equals(itemType)) { + if ("".equals(itemType) || "{".equals(itemType)) { + // blank lines and opening braces are ignored } else if ("}".equals(itemType)) { if (curVoucher != null) closeVoucher(curVoucher); curVoucher = null; } else { - callbacks.callbackException(new UnsupportedOperationException(di.getItemType())); + Consumer handler = handlers.get(itemType); + if (handler != null) { + handler.accept(di); + if (abortParsing) return null; + } else { + callbacks.callbackException(new UnsupportedOperationException(di.getItemType())); + } } } } @@ -434,6 +321,143 @@ public SieDocument readDocument(String fileName) throws IOException { return sieDocument; } + private void initHandlers() { + handlers.put(SIE.ADRESS, this::handleADRESS); + handlers.put(SIE.BKOD, di -> sieDocument.getFNAMN().setSni(di.getInt(0))); + handlers.put(SIE.BTRANS, this::handleBTRANS); + handlers.put(SIE.DIM, this::parseDimension); + handlers.put(SIE.ENHET, this::parseENHET); + handlers.put(SIE.FLAGGA, di -> sieDocument.setFLAGGA(di.getInt(0))); + handlers.put(SIE.FNAMN, di -> sieDocument.getFNAMN().setName(di.getString(0))); + handlers.put(SIE.FNR, di -> sieDocument.getFNAMN().setCode(di.getString(0))); + handlers.put(SIE.FORMAT, di -> sieDocument.setFORMAT(di.getString(0))); + handlers.put(SIE.FTYP, di -> sieDocument.getFNAMN().setOrgType(di.getString(0))); + handlers.put(SIE.GEN, this::handleGEN); + handlers.put(SIE.IB, this::parseIB); + handlers.put(SIE.KONTO, this::parseKONTO); + handlers.put(SIE.KSUMMA, this::handleKSUMMA); + handlers.put(SIE.KTYP, this::parseKTYP); + handlers.put(SIE.KPTYP, di -> sieDocument.setKPTYP(di.getString(0))); + handlers.put(SIE.OBJEKT, this::parseOBJEKT); + handlers.put(SIE.OIB, this::handleOIB); + handlers.put(SIE.OUB, this::handleOUB); + handlers.put(SIE.ORGNR, di -> sieDocument.getFNAMN().setOrgIdentifier(di.getString(0))); + handlers.put(SIE.OMFATTN, di -> sieDocument.setOMFATTN(di.getDate(0))); + handlers.put(SIE.PBUDGET, this::handlePBUDGET); + handlers.put(SIE.PROGRAM, di -> sieDocument.setPROGRAM(di.getData())); + handlers.put(SIE.PROSA, di -> sieDocument.setPROSA(di.getString(0))); + handlers.put(SIE.PSALDO, this::handlePSALDO); + handlers.put(SIE.RAR, this::parseRAR); + handlers.put(SIE.RTRANS, this::handleRTRANS); + handlers.put(SIE.SIETYP, this::handleSIETYP); + handlers.put(SIE.SRU, this::parseSRU); + handlers.put(SIE.TAXAR, di -> sieDocument.setTAXAR(di.getInt(0))); + handlers.put(SIE.UB, this::parseUB); + handlers.put(SIE.TRANS, this::handleTRANS); + handlers.put(SIE.RES, this::parseRES); + handlers.put(SIE.UNDERDIM, this::parseUnderDimension); + handlers.put(SIE.VALUTA, di -> sieDocument.setVALUTA(di.getString(0))); + handlers.put(SIE.VER, di -> curVoucher = parseVER(di)); + } + + private void handleADRESS(SieDataItem di) { + sieDocument.getFNAMN().setContact(di.getString(0)); + sieDocument.getFNAMN().setStreet(di.getString(1)); + sieDocument.getFNAMN().setZipCity(di.getString(2)); + sieDocument.getFNAMN().setPhone(di.getString(3)); + } + + private void handleGEN(SieDataItem di) { + sieDocument.setGEN_DATE(di.getDate(0)); + sieDocument.setGEN_NAMN(di.getString(1)); + } + + private void handleBTRANS(SieDataItem di) { + if (!ignoreBTRANS) { + if (curVoucher == null) { + callbacks.callbackException(new SieParseException( + "#BTRANS outside #VER block at line " + parsingLineNumber)); + } else { + parseTRANS(di, curVoucher); + } + } + } + + private void handleRTRANS(SieDataItem di) { + if (!ignoreRTRANS) { + if (curVoucher == null) { + callbacks.callbackException(new SieParseException( + "#RTRANS outside #VER block at line " + parsingLineNumber)); + } else { + parseTRANS(di, curVoucher); + } + } + } + + private void handleTRANS(SieDataItem di) { + if (curVoucher == null) { + callbacks.callbackException(new SieParseException( + "#TRANS outside #VER block at line " + parsingLineNumber)); + } else { + parseTRANS(di, curVoucher); + } + } + + private void handleKSUMMA(SieDataItem di) { + if (!ignoreKSUMMA) { + if (CRC.isStarted()) { + parseKSUMMA(di); + } else { + CRC.start(); + } + } + } + + private void handleSIETYP(SieDataItem di) { + sieDocument.setSIETYP(di.getInt(0)); + if (acceptSIETypes != null) { + try { + SieType parsed = SieType.fromValue(di.getInt(0)); + if (!acceptSIETypes.contains(parsed)) { + callbacks.callbackException(new SieInvalidFeatureException( + "SIE type " + di.getInt(0) + " is not accepted")); + abortParsing = true; + } + } catch (IllegalArgumentException e) { + callbacks.callbackException(new SieInvalidFeatureException( + "Unknown SIE type: " + di.getInt(0))); + } + } + } + + private void handleOIB(SieDataItem di) { + SiePeriodValue pv = parseOIB_OUB(di); + callbacks.callbackOIB(pv); + if (!streamValues) sieDocument.getOIB().add(pv); + } + + private void handleOUB(SieDataItem di) { + SiePeriodValue pv = parseOIB_OUB(di); + callbacks.callbackOUB(pv); + if (!streamValues) sieDocument.getOUB().add(pv); + } + + private void handlePBUDGET(SieDataItem di) { + SiePeriodValue pv = parsePBUDGET_PSALDO(di); + if (pv != null) { + callbacks.callbackPBUDGET(pv); + if (!streamValues) sieDocument.getPBUDGET().add(pv); + } + } + + private void handlePSALDO(SieDataItem di) { + SiePeriodValue pv = parsePBUDGET_PSALDO(di); + if (pv != null) { + callbacks.callbackPSALDO(pv); + if (!streamValues) sieDocument.getPSALDO().add(pv); + } + } + private void parseRAR(SieDataItem di) { SieBookingYear rar = new SieBookingYear(); rar.setId(di.getInt(0)); From 77879516fd8ee744246ca8c6fec65fc2e8f691c9 Mon Sep 17 00:00:00 2001 From: pernyf Date: Thu, 26 Feb 2026 22:13:22 +0100 Subject: [PATCH 4/4] Fix CI: add gradle-wrapper.jar to version control The *.jar gitignore rule was excluding the Gradle wrapper jar needed by CI. Add a negation rule and track the wrapper jar. Co-Authored-By: Claude Opus 4.6 --- .gitignore | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45633 bytes 2 files changed, 1 insertion(+) create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/.gitignore b/.gitignore index d671e00..d6421f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # Package Files # *.jar +!gradle/wrapper/gradle-wrapper.jar *.war *.ear diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f8e1ee3125fe0768e9a76ee977ac089eb657005e GIT binary patch literal 45633 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�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 literal 0 HcmV?d00001