You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2019/08/28 08:42:23 UTC
[johnzon] branch master updated: don't enforce js range (IEEE754)
by default in JSON-B
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 515d363 don't enforce js range (IEEE754) by default in JSON-B
515d363 is described below
commit 515d363b8c55f0ba0835bda18f58dd545c0eb637
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Aug 28 10:42:15 2019 +0200
don't enforce js range (IEEE754) by default in JSON-B
---
.../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java | 6 +++---
.../org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
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 d092ff3..f5bb7ea 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
@@ -197,9 +197,9 @@ public class JohnzonBuilder implements JsonbBuilder {
config.getProperty("johnzon.interfaceImplementationMapping")
.map(Map.class::cast)
.ifPresent(builder::setInterfaceImplementationMapping);
- builder.setUseJsRange(config.getProperty("johnzon.use-js-range")
- .map(this::toBool)
- .orElse(true));
+ builder.setUseJsRange(toBool( // https://github.com/eclipse-ee4j/jsonb-api/issues/180
+ System.getProperty("johnzon.use-js-range", config.getProperty("johnzon.use-js-range")
+ .map(String::valueOf).orElse("false"))));
final Map<AdapterKey, Adapter<?, ?>> defaultConverters = createJava8Converters(builder);
diff --git a/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java b/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
index 13e7ec5..d0e89e1 100644
--- a/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
+++ b/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
@@ -112,6 +112,6 @@ public class ExampleToModelMojoTest {
assertTrue(output.isFile());
assertEquals(
new String(IOUtil.toByteArray(Thread.currentThread().getContextClassLoader().getResourceAsStream("SomeValue.java"))),
- new String(IOUtil.toByteArray(new FileReader(output))));
+ new String(IOUtil.toByteArray(new FileReader(output))).replace(File.separatorChar, '/'));
}
}