Browse Source

Use JsonBuildFactory, update Helidon to 1.1.2 (#4907)

Joe DiPol 6 years ago
parent
commit
1dd189902c

+ 1 - 1
frameworks/Java/helidon/pom.xml

@@ -26,7 +26,7 @@
     <name>${project.artifactId}</name>
     <name>${project.artifactId}</name>
 
 
     <properties>
     <properties>
-        <helidon.version>1.0.3</helidon.version>
+        <helidon.version>1.1.2</helidon.version>
         <!-- Default package. Will be overriden by Maven archetype -->
         <!-- Default package. Will be overriden by Maven archetype -->
         <package>io.helidon.examples.quickstart.se</package>
         <package>io.helidon.examples.quickstart.se</package>
         <mainClass>io.helidon.benchmark.Main</mainClass>
         <mainClass>io.helidon.benchmark.Main</mainClass>

+ 6 - 1
frameworks/Java/helidon/src/main/java/io/helidon/benchmark/models/World.java

@@ -1,9 +1,14 @@
 package io.helidon.benchmark.models;
 package io.helidon.benchmark.models;
 
 
 import javax.json.Json;
 import javax.json.Json;
+import javax.json.JsonBuilderFactory;
 import javax.json.JsonObject;
 import javax.json.JsonObject;
+import java.util.Collections;
 
 
 public final class World {
 public final class World {
+
+    private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
+
     public int id;
     public int id;
     public int randomNumber;
     public int randomNumber;
 
 
@@ -13,6 +18,6 @@ public final class World {
     }
     }
 
 
     public JsonObject toJson() {
     public JsonObject toJson() {
-        return Json.createObjectBuilder().add("id", id).add("randomNumber", randomNumber).build();
+        return JSON.createObjectBuilder().add("id", id).add("randomNumber", randomNumber).build();
     }
     }
 }
 }

+ 5 - 1
frameworks/Java/helidon/src/main/java/io/helidon/benchmark/services/DbService.java

@@ -16,18 +16,22 @@ import io.reactivex.Single;
 import javax.json.Json;
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonArrayBuilder;
+import javax.json.JsonBuilderFactory;
 import javax.json.JsonObject;
 import javax.json.JsonObject;
 import javax.json.JsonStructure;
 import javax.json.JsonStructure;
 import javax.json.JsonWriter;
 import javax.json.JsonWriter;
 import javax.json.JsonWriterFactory;
 import javax.json.JsonWriterFactory;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.ThreadLocalRandom;
 
 
 public class DbService implements Service {
 public class DbService implements Service {
 
 
+    private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
+
     private final DbRepository repository;
     private final DbRepository repository;
     private JsonWriterFactory jsonWriterFactory;
     private JsonWriterFactory jsonWriterFactory;
 
 
@@ -89,7 +93,7 @@ public class DbService implements Service {
 
 
     private JsonArray buildArray(List<JsonObject> jsonObjects) {
     private JsonArray buildArray(List<JsonObject> jsonObjects) {
         return jsonObjects.stream().reduce(
         return jsonObjects.stream().reduce(
-                Json.createArrayBuilder(),
+                JSON.createArrayBuilder(),
                 JsonArrayBuilder::add,
                 JsonArrayBuilder::add,
                 JsonArrayBuilder::addAll)
                 JsonArrayBuilder::addAll)
                 .build();
                 .build();

+ 4 - 1
frameworks/Java/helidon/src/main/java/io/helidon/benchmark/services/JsonService.java

@@ -5,14 +5,17 @@ import io.helidon.webserver.Routing;
 import io.helidon.webserver.Service;
 import io.helidon.webserver.Service;
 
 
 import javax.json.Json;
 import javax.json.Json;
+import javax.json.JsonBuilderFactory;
 import java.util.Collections;
 import java.util.Collections;
 
 
 public class JsonService implements Service {
 public class JsonService implements Service {
 
 
+    private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
+
     @Override
     @Override
     public void update(Routing.Rules rules) {
     public void update(Routing.Rules rules) {
         rules.register("/json", JsonSupport.create());
         rules.register("/json", JsonSupport.create());
         rules.get("/json",
         rules.get("/json",
-                (req, res) -> res.send(Json.createObjectBuilder(Collections.singletonMap("message", "Hello, World!")).build()));
+                (req, res) -> res.send(JSON.createObjectBuilder(Collections.singletonMap("message", "Hello, World!")).build()));
     }
     }
 }
 }