diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index 460d41c8..22905417 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -165,6 +165,12 @@ public Jsonb build() {
config.getProperty("johnzon.useBigDecimalForFloats")
.map(this::toBool)
.ifPresent(builder::setUseBigDecimalForFloats);
+ config.getProperty("johnzon.useBigIntegerStringAdapter")
+ .map(this::toBool)
+ .ifPresent(builder::setUseBigIntegerStringAdapter);
+ config.getProperty("johnzon.useBigDecimalStringAdapter")
+ .map(this::toBool)
+ .ifPresent(builder::setUseBigDecimalStringAdapter);
config.getProperty("johnzon.deduplicateObjects")
.map(this::toBool)
.ifPresent(builder::setDeduplicateObjects);
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBigDecimalTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBigDecimalTest.java
new file mode 100644
index 00000000..98ccaf06
--- /dev/null
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBigDecimalTest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.johnzon.jsonb;
+
+import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+import jakarta.json.bind.annotation.JsonbProperty;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class JsonbBigDecimalTest {
+ @Rule
+ public final JsonbRule rule = new JsonbRule()
+ .withProperty("johnzon.useBigIntegerStringAdapter", "false")
+ .withProperty("johnzon.useBigDecimalStringAdapter", "false")
+ ;
+
+ private static class BigNumberWrapper {
+ @JsonbProperty("bd")
+ private BigDecimal bd;
+
+ @JsonbProperty("bi")
+ private BigInteger bi;
+
+ public BigDecimal getBd() {
+ return bd;
+ }
+
+ public void setBd(BigDecimal bd) {
+ this.bd = bd;
+ }
+
+ public BigInteger getBi() {
+ return bi;
+ }
+
+ public void setBi(BigInteger bi) {
+ this.bi = bi;
+ }
+ }
+
+ @Test
+ public void jsonValue() {
+ final BigNumberWrapper bnw = new BigNumberWrapper();
+ bnw.setBd(new BigDecimal("0.000000733915"));
+ bnw.setBi(new BigInteger("9223372036854775808"));
+
+ final String json = rule.toJson(bnw);
+ Assert.assertEquals("{\"bd\":7.33915E-7,\"bi\":9223372036854775808}", json);
+ }
+}
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
index 855d1593..12fbfa4c 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
@@ -62,6 +62,11 @@ public JsonbRule withTypeAdapter(JsonbAdapter, ?>... jsonbAdapters) {
return this;
}
+ public JsonbRule withProperty(final String propertyName, final Object value) {
+ config.setProperty(propertyName, value);
+ return this;
+ }
+
@Override
public Statement apply(final Statement statement, final Description description) {
return new Statement() {
diff --git a/pom.xml b/pom.xml
index 5111e9ea..1991b7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,7 +358,7 @@
-
+