From 2db7e94720f4a4cc0aaf9cbb8b63e0bcbd491661 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 9 Jan 2020 19:25:36 +0100
Subject: [PATCH] [fix] Make sure decimal separator correctly set
---
.../org/duniter/core/util/json/JsonAttributeParser.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/util/json/JsonAttributeParser.java b/duniter4j-core-shared/src/main/java/org/duniter/core/util/json/JsonAttributeParser.java
index a7e8df9f..14febc43 100644
--- a/duniter4j-core-shared/src/main/java/org/duniter/core/util/json/JsonAttributeParser.java
+++ b/duniter4j-core-shared/src/main/java/org/duniter/core/util/json/JsonAttributeParser.java
@@ -28,6 +28,7 @@ import org.duniter.core.util.Preconditions;
import javax.print.DocFlavor;
import java.math.BigDecimal;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@@ -88,7 +89,9 @@ public class JsonAttributeParser<T extends Object> {
type = Type.DOUBLE;
this.pattern = Pattern.compile(String.format(REGEX_ATTRIBUTE_NUMERIC_VALUE, attributeName));
this.decimalFormat = new DecimalFormat();
- this.decimalFormat.getDecimalFormatSymbols().setDecimalSeparator('.');
+ DecimalFormatSymbols symbols = this.decimalFormat.getDecimalFormatSymbols();
+ symbols.setDecimalSeparator('.');
+ symbols.setGroupingSeparator(',');
}
// BigDecimal
else if (BigDecimal.class.isAssignableFrom(clazz)) {
@@ -96,7 +99,9 @@ public class JsonAttributeParser<T extends Object> {
this.pattern = Pattern.compile(String.format(REGEX_ATTRIBUTE_NUMERIC_VALUE, attributeName));
this.decimalFormat = new DecimalFormat();
this.decimalFormat.setParseBigDecimal(true); // allow big decimal
- this.decimalFormat.getDecimalFormatSymbols().setDecimalSeparator('.');
+ DecimalFormatSymbols symbols = this.decimalFormat.getDecimalFormatSymbols();
+ symbols.setDecimalSeparator('.');
+ symbols.setGroupingSeparator(',');
}
// Boolean
else if (Boolean.class.isAssignableFrom(clazz)) {
--
GitLab