Browse Source

Update Micronaut to 1.2.7 (#5315)

James Kleeh 5 years ago
parent
commit
1b6c718b70

+ 7 - 3
frameworks/Java/micronaut/README.md

@@ -1,13 +1,17 @@
-# [Micronaut](http://micronaut.io) Benchmarking Test (1.0.0.RC3)
+# [Micronaut](http://micronaut.io) Benchmarking Test (1.2.7)
 
 ### Test Type Implementation Source Code
 
 * [JSON](src/main/java/benchmark/JsonSerialization.java)
 * [PLAINTEXT](src/main/java/benchmark/PlainText.java)
+* [DB](src/main/java/benchmark/Database.java)
+* [QUERY](src/main/java/benchmark/Database.java)
+* [UPDATE](src/main/java/benchmark/Database.java)
+* [FORTUNES](src/main/java/benchmark/Database.java)
 
 ## Important Libraries
 The tests were run with:
-* [OpenJDK Java 10](http://jdk.java.net/10/)
+* [OpenJDK Java 11](http://jdk.java.net/11/)
 
 ## Test URLs
 ### JSON
@@ -32,4 +36,4 @@ http://localhost:8080/update?queries=
 
 ### FORTUNES
 
-http://localhost:8080/fortunes
+http://localhost:8080/fortunes

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

@@ -9,7 +9,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <exec.mainClass>benchmark.Application</exec.mainClass>
-        <micronaut.version>1.0.1</micronaut.version>
+        <micronaut.version>1.2.7</micronaut.version>
     </properties>
     <repositories>
         <repository>

+ 5 - 3
frameworks/Java/micronaut/src/main/java/benchmark/Database.java

@@ -8,12 +8,15 @@ import com.github.mustachejava.Mustache;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.views.ModelAndView;
 import io.micronaut.views.View;
 import io.reactivex.Flowable;
 import io.reactivex.Single;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static java.util.Comparator.comparing;
@@ -42,12 +45,11 @@ public class Database {
     }
 
     @Get(value = "/fortunes", produces = "text/html;charset=utf-8")
-    @View("fortunes")
-    public Single<List<Fortune>> fortune() {
+    public Single<ModelAndView<Map>> fortune() {
         return dbRepository.fortunes().toList().flatMap(fortunes -> {
             fortunes.add(new Fortune(0, "Additional fortune added at request time."));
             fortunes.sort(comparing(fortune -> fortune.message));
-            return Single.just(fortunes);
+            return Single.just(new ModelAndView<>("fortunes", Collections.singletonMap("fortunes", fortunes)));
         });
     }
 

+ 1 - 1
frameworks/Java/micronaut/src/main/resources/fortunes.mustache

@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>{{#.}}<tr><td>{{id}}</td><td>{{message}}</td></tr>{{/.}}</table></body></html>
+<title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>{{# fortunes}}<tr><td>{{id}}</td><td>{{message}}</td></tr>{{/ fortunes}}</table></body></html>