Update to helidon 1.0.0 (#4608)

frameworks/Java/helidon/README.md

@@ -32,7 +32,7 @@ There is currently one repository implementation.
 ## Versions
 
 * [Java OpenJDK 1.8](http://openjdk.java.net/)
-* [Helidon 0.10.1](http://helidon.io/)
+* [Helidon 1.0.0](http://helidon.io/)
 
 ## Test URLs
 

frameworks/Java/helidon/pom.xml

@@ -26,7 +26,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <helidon.version>0.10.1</helidon.version>
+        <helidon.version>1.0.0</helidon.version>
         <!-- Default package. Will be overriden by Maven archetype -->
         <package>io.helidon.examples.quickstart.se</package>
         <mainClass>io.helidon.benchmark.Main</mainClass>
@@ -48,18 +48,6 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.1</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.junit.platform</groupId>
-                            <artifactId>junit-platform-surefire-provider</artifactId>
-                            <version>1.1.0</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
@@ -125,7 +113,7 @@
             <dependency>
                 <groupId>io.reactivex.rxjava2</groupId>
                 <artifactId>rxjava</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.7</version>
             </dependency>
             <dependency>
                 <groupId>com.zaxxer</groupId>
@@ -135,7 +123,7 @@
             <dependency>
                 <groupId>com.github.spullara.mustache.java</groupId>
                 <artifactId>compiler</artifactId>
-                <version>0.9.5</version>
+                <version>0.9.6</version>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
@@ -143,28 +131,22 @@
                 <version>42.2.5</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>5.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.1.0</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-bundle</artifactId>
+            <artifactId>helidon-webserver</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.media.jsonp</groupId>
+            <artifactId>helidon-media-jsonp-server</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
@@ -181,15 +163,5 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

frameworks/Java/helidon/src/main/java/io/helidon/benchmark/Main.java

@@ -55,9 +55,9 @@ public final class Main {
 
     private static DataSource getDataSource(Config config) {
         HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(config.get("jdbcUrl").asString());
-        hikariConfig.setUsername(config.get("username").asString());
-        hikariConfig.setPassword(config.get("password").asString());
+        hikariConfig.setJdbcUrl(config.get("jdbcUrl").asString().get());
+        hikariConfig.setUsername(config.get("username").asString().get());
+        hikariConfig.setPassword(config.get("password").asString().get());
         hikariConfig.setMaximumPoolSize(Runtime.getRuntime().availableProcessors() * 2);
 
         return new HikariDataSource(hikariConfig);
@@ -119,7 +119,7 @@ public final class Main {
 
         // Get webserver config from the "server" section of application.yaml
         ServerConfiguration serverConfig =
-                ServerConfiguration.fromConfig(config.get("server"));
+                ServerConfiguration.create(config.get("server"));
 
         WebServer server = WebServer.create(serverConfig, createRouting(config));
 

frameworks/Java/helidon/src/main/java/io/helidon/benchmark/services/DbService.java

@@ -15,13 +15,14 @@ import io.reactivex.Single;
 
 import javax.json.Json;
 import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonStructure;
 import javax.json.JsonWriter;
 import javax.json.JsonWriterFactory;
 import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -47,7 +48,7 @@ public class DbService implements Service {
                           final ServerResponse response) {
         Single<DataChunk> result = repository.getWorld(randomWorldNumber())
                 .map(World::toJson)
-                .map(jsonObject -> getChunk(jsonObject));
+                .map(this::getChunk);
 
         send(response, result);
     }
@@ -80,17 +81,17 @@ public class DbService implements Service {
 
     private Single<DataChunk> marshall(Flowable<JsonObject>[] worlds) {
         return Flowable.mergeArray(worlds)
-                .collect(() -> new ArrayList<JsonObject>(), (worlds1, world) -> worlds1.add(world))
-                .map(jsonObjects -> buildArray(jsonObjects))
-                .map(jsonValues -> getChunk(jsonValues))
+                .toList()
+                .map(this::buildArray)
+                .map(this::getChunk)
                 .doOnError(Throwable::printStackTrace);
     }
 
-    private JsonArray buildArray(ArrayList<JsonObject> jsonObjects) {
+    private JsonArray buildArray(List<JsonObject> jsonObjects) {
         return jsonObjects.stream().reduce(
                 Json.createArrayBuilder(),
-                (jsonArrayBuilder, jsonObject) -> jsonArrayBuilder.add(jsonObject),
-                (jsonArrayBuilder, jsonArrayBuilder2) -> jsonArrayBuilder.addAll(jsonArrayBuilder2))
+                JsonArrayBuilder::add,
+                JsonArrayBuilder::addAll)
                 .build();
     }
 

frameworks/Java/helidon/src/main/java/io/helidon/benchmark/services/FortuneService.java

@@ -44,7 +44,7 @@ public class FortuneService implements Service {
                     fortunes.sort(comparing(fortune -> fortune.message));
                     return fortunes;
                 })
-            .map(fortunes -> this.getChunk(fortunes));
+            .map(this::getChunk);
 
         send(response, result);
     }

frameworks/Java/helidon/src/main/java/io/helidon/benchmark/services/JsonService.java

@@ -1,8 +1,8 @@
 package io.helidon.benchmark.services;
 
+import io.helidon.media.jsonp.server.JsonSupport;
 import io.helidon.webserver.Routing;
 import io.helidon.webserver.Service;
-import io.helidon.webserver.json.JsonSupport;
 
 import javax.json.Json;
 import java.util.Collections;
@@ -11,7 +11,7 @@ public class JsonService implements Service {
 
     @Override
     public void update(Routing.Rules rules) {
-        rules.register("/json", JsonSupport.get());
+        rules.register("/json", JsonSupport.create());
         rules.get("/json",
                 (req, res) -> res.send(Json.createObjectBuilder(Collections.singletonMap("message", "Hello, World!")).build()));
     }