Skip to content

Commit a6bef19

Browse files
jgallimorejgallimore
authored
Merge pull request #138 from jgallimore/backport-attempt-2
fix(JOHNZON-426): BigInteger/BigDecimal string adapter flags swapped
2 parents 63f36b8 + a2f4dcf commit a6bef19

File tree

7 files changed

+162
-28
lines changed

7 files changed

+162
-28
lines changed

‎johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,16 @@ public Jsonb build() {
233233
Integer.parseInt(it.toString()))
234234
.ifPresent(builder::setSnippetMaxLength);
235235

236+
or(config.getProperty("johnzon.use-biginteger-stringadapter"),
237+
() -> Optional.ofNullable(System.getProperty("johnzon.use-biginteger-stringadapter")))
238+
.map(Object::toString).map(Boolean::parseBoolean)
239+
.ifPresent(builder::setUseBigIntegerStringAdapter);
240+
241+
or(config.getProperty("johnzon.use-bigdecimal-stringadapter"),
242+
() -> Optional.ofNullable(System.getProperty("johnzon.use-bigdecimal-stringadapter")))
243+
.map(Object::toString).map(Boolean::parseBoolean)
244+
.ifPresent(builder::setUseBigDecimalStringAdapter);
245+
236246
// user adapters
237247
final Types types = new Types();
238248

@@ -455,6 +465,10 @@ private ClassLoader tccl() {
455465
return map;
456466
}
457467

468+
private static <T> Optional<T> or(Optional<T> first, Supplier<Optional<T>> second) {
469+
return first.isPresent() ? first : second.get();
470+
}
471+
458472
private static abstract class Lazy<T> implements Supplier<T> {
459473
private final AtomicReference<T> ref = new AtomicReference<>();
460474

‎johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBigDecimalTest.java‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.johnzon.jsonb;
20+
21+
import org.apache.johnzon.jsonb.test.JsonbRule;
22+
import org.junit.Assert;
23+
import org.junit.Rule;
24+
import org.junit.Test;
25+
26+
import javax.json.bind.annotation.JsonbProperty;
27+
import java.math.BigDecimal;
28+
import java.math.BigInteger;
29+
30+
public class JsonbBigDecimalTest {
31+
@Rule
32+
public final JsonbRule rule = new JsonbRule()
33+
.withProperty("johnzon.use-biginteger-stringadapter", "false")
34+
.withProperty("johnzon.use-bigdecimal-stringadapter", "false")
35+
;
36+
37+
private static class BigNumberWrapper {
38+
@JsonbProperty("bd")
39+
private BigDecimal bd;
40+
41+
@JsonbProperty("bi")
42+
private BigInteger bi;
43+
44+
public BigDecimal getBd() {
45+
return bd;
46+
}
47+
48+
public void setBd(BigDecimal bd) {
49+
this.bd = bd;
50+
}
51+
52+
public BigInteger getBi() {
53+
return bi;
54+
}
55+
56+
public void setBi(BigInteger bi) {
57+
this.bi = bi;
58+
}
59+
}
60+
61+
@Test
62+
public void jsonValue() {
63+
final BigNumberWrapper bnw = new BigNumberWrapper();
64+
bnw.setBd(new BigDecimal("0.000000733915"));
65+
bnw.setBi(new BigInteger("9223372036854775808"));
66+
67+
final String json = rule.toJson(bnw);
68+
Assert.assertEquals("{\"bd\":7.33915E-7,\"bi\":9223372036854775808}", json);
69+
}
70+
}

‎johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbTypesTest.java‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import static org.junit.Assert.assertEquals;
2222

2323
import java.io.StringReader;
24+
import java.math.BigDecimal;
25+
import java.math.BigInteger;
2426
import java.net.URI;
2527
import java.net.URL;
2628
import java.time.Duration;
@@ -63,7 +65,8 @@ public void readAndWrite() throws Exception {
6365
final LocalDate localDate = LocalDate.of(2015, 1, 1);
6466
final LocalTime localTime = LocalTime.of(1, 2, 3);
6567
final LocalDateTime localDateTime = LocalDateTime.of(2015, 1, 1, 1, 1);
66-
final String expected = "{\"calendar\":\"2015-01-01T01:01:00Z[UTC]\",\"date\":\"2015-01-01T01:01:00Z[UTC]\"," +
68+
final String expected = "{\"bigDecimal\":\"1.5\",\"bigInteger\":\"1\"," +
69+
"\"calendar\":\"2015-01-01T01:01:00Z[UTC]\",\"date\":\"2015-01-01T01:01:00Z[UTC]\"," +
6770
"\"duration\":\"PT30S\",\"gregorianCalendar\":\"2015-01-01T01:01:00Z[UTC]\"," +
6871
"\"instant\":\"2015-01-01T00:00:00Z\",\"localDate\":\"2015-01-01\"," +
6972
"\"localDateTime\":\"2015-01-01T01:01\",\"localTime\":\"01:02:03\"," +
@@ -103,6 +106,23 @@ public void readAndWrite() throws Exception {
103106
jsonb.close();
104107
}
105108

109+
@Test
110+
public void testReadAndWriteBigIntDecimalAsNumbers() throws Exception {
111+
final String expected = "{\"bigDecimal\":1.5,\"bigInteger\":1}";
112+
final Jsonb jsonb = newJsonb(
113+
new JsonbConfig()
114+
.setProperty("johnzon.use-biginteger-stringadapter", false)
115+
.setProperty("johnzon.use-bigdecimal-stringadapter", false));
116+
117+
final Types types = jsonb.fromJson(new StringReader(expected), Types.class);
118+
assertEquals(BigInteger.valueOf(1), types.bigInteger);
119+
assertEquals(BigDecimal.valueOf(1.5), types.bigDecimal);
120+
121+
assertEquals(expected, jsonb.toJson(types));
122+
123+
jsonb.close();
124+
}
125+
106126
@Test
107127
public void readAndWriteWithDateFormats() throws Exception {
108128
readAndWriteWithDateFormat(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"), "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
@@ -134,20 +154,25 @@ private void readAndWriteWithDateFormat(DateTimeFormatter dateTimeFormatter, Str
134154
}
135155

136156
private static Jsonb newJsonb() {
137-
return newJsonb(null);
157+
return newJsonb((String) null);
138158
}
139159

140160
private static Jsonb newJsonb(String dateFormat) {
141161
JsonbConfig jsonbConfig = new JsonbConfig();
142162
if (!StringUtils.isEmpty(dateFormat)){
143163
jsonbConfig.withDateFormat(dateFormat, Locale.getDefault());
144164
}
145-
return JsonbProvider.provider().create().withConfig(jsonbConfig.setProperty("johnzon.attributeOrder", new Comparator<String>() {
165+
166+
return newJsonb(jsonbConfig.setProperty("johnzon.attributeOrder", new Comparator<String>() {
146167
@Override
147168
public int compare(final String o1, final String o2) {
148169
return o1.compareTo(o2);
149170
}
150-
})).build();
171+
}));
172+
}
173+
174+
private static Jsonb newJsonb(JsonbConfig jsonbConfig) {
175+
return JsonbProvider.provider().create().withConfig(jsonbConfig).build();
151176
}
152177

153178
public static class Types {
@@ -172,6 +197,8 @@ public static class Types {
172197
private LocalDate localDate;
173198
private OffsetDateTime offsetDateTime;
174199
private OffsetTime offsetTime;
200+
private BigInteger bigInteger;
201+
private BigDecimal bigDecimal;
175202

176203
public LocalTime getLocalTime() {
177204
return localTime;
@@ -341,6 +368,22 @@ public void setOffsetTime(OffsetTime offsetTime) {
341368
this.offsetTime = offsetTime;
342369
}
343370

371+
public BigDecimal getBigDecimal() {
372+
return bigDecimal;
373+
}
374+
375+
public void setBigDecimal(BigDecimal bigDecimal) {
376+
this.bigDecimal = bigDecimal;
377+
}
378+
379+
public BigInteger getBigInteger() {
380+
return bigInteger;
381+
}
382+
383+
public void setBigInteger(BigInteger bigInteger) {
384+
this.bigInteger = bigInteger;
385+
}
386+
344387
@Override
345388
public boolean equals(final Object o) {
346389
if (this == o) {
@@ -369,15 +412,17 @@ public boolean equals(final Object o) {
369412
Objects.equals(localDateTime, types.localDateTime) &&
370413
Objects.equals(localDate, types.localDate) &&
371414
Objects.equals(offsetDateTime, types.offsetDateTime) &&
372-
Objects.equals(offsetTime, types.offsetTime);
415+
Objects.equals(offsetTime, types.offsetTime) &&
416+
Objects.equals(bigInteger, types.bigInteger) &&
417+
Objects.equals(bigDecimal, types.bigDecimal);
373418
}
374419

375420
@Override
376421
public int hashCode() {
377422
return Objects.hash(
378423
url, uri, optionalString, optionalInt, optionalLong, optionalDouble, date,
379424
calendar, gregorianCalendar, timeZone, zoneId, zoneOffset, simpleTimeZone, instant, duration,
380-
period, localDateTime, localDate, offsetDateTime, offsetTime);
425+
period, localDateTime, localDate, offsetDateTime, offsetTime, bigInteger, bigDecimal);
381426
}
382427
}
383428

‎johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ public JsonbRule withTypeAdapter(JsonbAdapter<?, ?>... jsonbAdapters) {
6262
return this;
6363
}
6464

65+
public JsonbRule withProperty(final String propertyName, final Object value) {
66+
config.setProperty(propertyName, value);
67+
return this;
68+
}
69+
6570
@Override
6671
public Statement apply(final Statement statement, final Description description) {
6772
return new Statement() {

‎johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,16 @@ public MapperBuilder setAdaptersDateTimeFormatter(final DateTimeFormatter dateTi
269269
return this;
270270
}
271271

272+
public MapperBuilder setUseBigIntegerStringAdapter(final boolean convertBigIntegerToString) {
273+
adapters.setUseBigIntegerStringAdapter(convertBigIntegerToString);
274+
return this;
275+
}
276+
277+
public MapperBuilder setUseBigDecimalStringAdapter(final boolean convertBigDecimalToString) {
278+
adapters.setUseBigDecimalStringAdapter(convertBigDecimalToString);
279+
return this;
280+
}
281+
272282
public MapperBuilder setAdaptersDateTimeFormatterString(final String dateTimeFormatter) {
273283
adapters.setDateTimeFormatter(DateTimeFormatter.ofPattern(dateTimeFormatter));
274284
return this;
@@ -529,16 +539,6 @@ public MapperBuilder setUseJsRange(boolean value) {
529539
return this;
530540
}
531541

532-
public MapperBuilder setUseBigIntegerStringAdapter(final boolean convertBigIntegerToString) {
533-
adapters.setUseBigIntegerStringAdapter(convertBigIntegerToString);
534-
return this;
535-
}
536-
537-
public MapperBuilder setUseBigDecimalStringAdapter(final boolean convertBigDecimalToString) {
538-
adapters.setUseBigDecimalStringAdapter(convertBigDecimalToString);
539-
return this;
540-
}
541-
542542
public MapperBuilder setUseBigDecimalForObjectNumbers(final boolean value) {
543543
this.useBigDecimalForObjectNumbers = value;
544544
return this;

‎johnzon-mapper/src/main/java/org/apache/johnzon/mapper/map/LazyConverterMap.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public Object from(final Object a) {
8686
private boolean useShortISO8601Format = true;
8787
private DateTimeFormatter dateTimeFormatter;
8888
// I-JSON (RFC 7493 Section 2.2): BigX exceed IEEE 754 double, string is safer by default.
89-
// Set -Djohnzon.use-ijson-big-number-stringadapter.disabled=true for strict JSON-B 3.0 / TCK compliance.
90-
private static final boolean IJSON_BIG_NUMBER_DEFAULT = !Boolean.getBoolean("johnzon.use-ijson-big-number-stringadapter.disabled");
89+
// Set -Djohnzon.use-big-number-stringadapter=false for strict JSON-B 3.0 / TCK compliance.
90+
private static final boolean IJSON_BIG_NUMBER_DEFAULT = !Boolean.getBoolean("johnzon.use-big-number-stringadapter.disabled");
9191
private boolean useBigIntegerStringAdapter = IJSON_BIG_NUMBER_DEFAULT;
9292
private boolean useBigDecimalStringAdapter = IJSON_BIG_NUMBER_DEFAULT;
9393

@@ -99,11 +99,11 @@ public void setDateTimeFormatter(final DateTimeFormatter dateTimeFormatter) {
9999
this.dateTimeFormatter = dateTimeFormatter;
100100
}
101101

102-
public void setUseBigDecimalStringAdapter(final boolean useBigDecimalStringAdapter) {
102+
public void setUseBigDecimalStringAdapter(boolean useBigDecimalStringAdapter) {
103103
this.useBigDecimalStringAdapter = useBigDecimalStringAdapter;
104104
}
105105

106-
public void setUseBigIntegerStringAdapter(final boolean useBigIntegerStringAdapter) {
106+
public void setUseBigIntegerStringAdapter(boolean useBigIntegerStringAdapter) {
107107
this.useBigIntegerStringAdapter = useBigIntegerStringAdapter;
108108
}
109109

@@ -139,13 +139,13 @@ public void setUseBigIntegerStringAdapter(final boolean useBigIntegerStringAdapt
139139

140140
public Set<AdapterKey> adapterKeys() {
141141
return Stream.concat(
142-
super.keySet().stream()
143-
.filter(it -> super.get(it) != NO_ADAPTER),
144-
Stream.of(Date.class, URI.class, URL.class, Class.class, String.class, BigDecimal.class, BigInteger.class,
145-
Locale.class, Period.class, Duration.class, Calendar.class, GregorianCalendar.class, TimeZone.class,
146-
ZoneId.class, ZoneOffset.class, SimpleTimeZone.class, Instant.class, LocalDateTime.class, LocalDate.class,
147-
ZonedDateTime.class, OffsetDateTime.class, OffsetTime.class)
148-
.map(it -> new AdapterKey(it, String.class, true)))
142+
super.keySet().stream()
143+
.filter(it -> super.get(it) != NO_ADAPTER),
144+
Stream.of(Date.class, URI.class, URL.class, Class.class, String.class, BigDecimal.class, BigInteger.class,
145+
Locale.class, Period.class, Duration.class, Calendar.class, GregorianCalendar.class, TimeZone.class,
146+
ZoneId.class, ZoneOffset.class, SimpleTimeZone.class, Instant.class, LocalDateTime.class, LocalDate.class,
147+
ZonedDateTime.class, OffsetDateTime.class, OffsetTime.class)
148+
.map(it -> new AdapterKey(it, String.class, true)))
149149
.collect(toSet());
150150
}
151151

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
<property name="ignorePattern" value="@version|@see" />
414414
</module>
415415
<module name="MethodLength">
416-
<property name="max" value="250" />
416+
<property name="max" value="260" />
417417
</module>
418418
<module name="ParameterNumber">
419419
<property name="max" value="11" />

0 commit comments

Comments
 (0)