From 248372c98a39729e3dc0d239dda87348623d6e06 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Mon, 30 Jun 2025 11:39:43 +0200 Subject: [PATCH] closes #878 --- History.md | 2 ++ .../mustangproject/Exceptions/ArithmeticException.java | 5 +++-- .../mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java | 3 +-- .../java/org/mustangproject/validator/XMLValidator.java | 8 +++----- .../org/mustangproject/validator/XMLValidatorTest.java | 4 ++-- .../{invalidArithmetrics.xml => invalidArithmetics.xml} | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) rename validator/src/test/resources/{invalidArithmetrics.xml => invalidArithmetics.xml} (97%) diff --git a/History.md b/History.md index cdd3208c..d501ba69 100644 --- a/History.md +++ b/History.md @@ -12,6 +12,8 @@ - #855 - #874 - #876/830 +- #878 +- corrected typo ArithmetricException to ArithmeticException 2.17.0 ======= diff --git a/library/src/main/java/org/mustangproject/Exceptions/ArithmeticException.java b/library/src/main/java/org/mustangproject/Exceptions/ArithmeticException.java index f2341e1a..d0679073 100644 --- a/library/src/main/java/org/mustangproject/Exceptions/ArithmeticException.java +++ b/library/src/main/java/org/mustangproject/Exceptions/ArithmeticException.java @@ -4,13 +4,14 @@ import java.text.ParseException; /*** * will be thrown if an invoice cant be reproduced numerically + * ArithmetricException for backwards compatibility, was a spelling error */ public class ArithmeticException extends ArithmetricException { public ArithmeticException() { - this(""); + super(); } public ArithmeticException(String details) { -// super("Could not reproduce the invoice. " + details, 0); + super(details); } } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java index a8ec32ed..4cb47c4a 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java @@ -10,7 +10,6 @@ import org.apache.pdfbox.pdmodel.common.PDNameTreeNode; import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification; import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile; import org.mustangproject.*; -import org.mustangproject.Exceptions.ArithmetricException; import org.mustangproject.Exceptions.StructureException; import org.mustangproject.util.NodeMap; import org.slf4j.Logger; @@ -1096,7 +1095,7 @@ public class ZUGFeRDInvoiceImporter { .collect(Collectors.joining(" + ")); } catch (Exception ignored) { } - throw new ArithmetricException("Payable total in XML is " + payableTotalFromXml + ", but calculated total is " + calculatedPayableTotal + moreDetails); + throw new ArithmeticException("Payable total in XML is " + payableTotalFromXml + ", but calculated total is " + calculatedPayableTotal + moreDetails); } } } diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java index 3f737947..ccd57b3a 100644 --- a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java @@ -24,8 +24,6 @@ import javax.xml.xpath.XPathFactory; import org.mustangproject.CalculatedInvoice; import org.mustangproject.Exceptions.ArithmetricException; import org.mustangproject.XMLTools; -import org.mustangproject.ZUGFeRD.TransactionCalculator; -import org.mustangproject.ZUGFeRD.ZUGFeRDImporter; import org.mustangproject.ZUGFeRD.ZUGFeRDInvoiceImporter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -393,7 +391,7 @@ public class XMLValidator extends Validator { } } } - checkArithmetrics(context); + checkArithmetics(context); } catch (final IrrecoverableValidationError er) { @@ -417,14 +415,14 @@ public class XMLValidator extends Validator { } - private void checkArithmetrics(ValidationContext context) { + private void checkArithmetics(ValidationContext context) { ZUGFeRDInvoiceImporter zi=new ZUGFeRDInvoiceImporter(); try { zi.fromXML(zfXML); CalculatedInvoice ci=new CalculatedInvoice(); zi.extractInto(ci); - } catch ( ArithmetricException e) { + } catch ( ArithmeticException e) { try { context.addResultItem(new ValidationResultItem(ESeverity.warning, "Arithmetical issue:"+e.getMessage()).setSection(10)); diff --git a/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java index e3636261..5bb8d1d9 100644 --- a/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java +++ b/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java @@ -284,12 +284,12 @@ public class XMLValidatorTest extends ResourceCase { } - public void testArithmetrics() { + public void testArithmetics() { final ValidationContext ctx = new ValidationContext(null); final XMLValidator xv = new XMLValidator(ctx); final XPathEngine xpath = new JAXPXPathEngine(); - File tempFile = getResourceAsFile("invalidArithmetrics.xml"); + File tempFile = getResourceAsFile("invalidArithmetics.xml"); try { xv.setFilename(tempFile.getAbsolutePath()); xv.validate(); diff --git a/validator/src/test/resources/invalidArithmetrics.xml b/validator/src/test/resources/invalidArithmetics.xml similarity index 97% rename from validator/src/test/resources/invalidArithmetrics.xml rename to validator/src/test/resources/invalidArithmetics.xml index e32358f0..3986c2d3 100644 --- a/validator/src/test/resources/invalidArithmetrics.xml +++ b/validator/src/test/resources/invalidArithmetics.xml @@ -22,11 +22,11 @@ 160.0000 - 2.0000 + 1.0000 160.0000 - 2.0000 + 1.0000 @@ -179,7 +179,7 @@ 496.00 75.04 571.04 - 571.05 + 571.04