louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109 from swsch/issue23

Browse Source 
use RoundingMode enumeration and locale-safe BigDecimal.toPlainString
This commit is contained in:
Jochen Staerk
2019-07-24 17:34:44 +02:00
committed by GitHub
parent 4623595e78 deac979877
commit 915e863978
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.SimpleDateFormat;
@@ -93,20 +94,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
* end I decided to calculate myself and take eur+sparator+cents
*
*/
value = value.setScale(scale, BigDecimal.ROUND_HALF_UP); // first, round so that e.g.
// 1.189999999999999946709294817992486059665679931640625
// becomes 1.19
char[] repeat = new char[scale];
Arrays.fill(repeat, '0');
DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols();
otherSymbols.setDecimalSeparator('.');
String baseFormat="0";
if (scale>0) {
baseFormat+=".";
}
DecimalFormat dec = new DecimalFormat(baseFormat + new String(repeat), otherSymbols);
return dec.format(value);
return value.setScale(scale, RoundingMode.HALF_UP).toPlainString();
}

9
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDTransactionModelConverter.java
View File

@@ -19,6 +19,7 @@
package org.mustangproject.ZUGFeRD;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.SimpleDateFormat;
@@ -849,22 +850,22 @@ class ZUGFeRDTransactionModelConverter {
private BigDecimal vatFormat(BigDecimal value) {
return value.setScale(2, BigDecimal.ROUND_HALF_UP);
return value.setScale(2, RoundingMode.HALF_UP);
}
private BigDecimal currencyFormat(BigDecimal value) {
return value.setScale(2, BigDecimal.ROUND_HALF_UP);
return value.setScale(2, RoundingMode.HALF_UP);
}
private BigDecimal priceFormat(BigDecimal value) {
return value.setScale(4, BigDecimal.ROUND_HALF_UP);
return value.setScale(4, RoundingMode.HALF_UP);
}
private BigDecimal quantityFormat(BigDecimal value) {
return value.setScale(4, BigDecimal.ROUND_HALF_UP);
return value.setScale(4, RoundingMode.HALF_UP);
}