Browse Source

Updated /update test in relation to this comment: https://github.com/TechEmpower/FrameworkBenchmarks/pull/1166#discussion_r19762334

Donovan Muller 10 years ago
parent
commit
e40fec2ba8

+ 10 - 21
frameworks/Java/play2-java/play2-java-ebean-bonecp/app/controllers/Application.java

@@ -93,13 +93,19 @@ public class Application extends Controller {
 
     @Predicated(predicate = IsDbAvailable.class, failed = SERVICE_UNAVAILABLE)
     public static F.Promise<Result> update(final String queryCountString) {
-        return getRandomWorlds(queryCount(queryCountString)).flatMap(new F.Function<List<World>, F.Promise<Result>>() {
+        return getRandomWorlds(queryCount(queryCountString)).map(new F.Function<List<World>, Result>() {
 
             @Override
-            public F.Promise<Result> apply(List<World> worlds) throws Throwable {
-                return updateWorlds(worlds);
+            public Result apply(List<World> worlds) throws Throwable {
+                Random random = ThreadLocalRandom.current();
+                for (World world : worlds) {
+                    world.randomNumber = (long) (random.nextInt(10000) + 1);
+                }
+
+                List<World> updatedWorlds = World.save(worlds);
+                return ok(Json.toJson(updatedWorlds));
             }
-        });
+        }, dbEc);
     }
 
     private static int queryCount(String queryCountString) {
@@ -135,21 +141,4 @@ public class Application extends Controller {
         }, dbEc);
     }
 
-    private static F.Promise<Result> updateWorlds(final List<World> worlds) {
-        return F.Promise.promise(new F.Function0<Result>() {
-
-            @Override
-            public Result apply() throws Throwable {
-                Random random = ThreadLocalRandom.current();
-                for (World world : worlds) {
-                    world.randomNumber = (long) (random.nextInt(10000) + 1);
-                }
-
-                List<World> updatedWorlds = World.save(worlds);
-                return ok(Json.toJson(updatedWorlds));
-            }
-        }, dbEc);
-    }
-
-
 }

+ 10 - 21
frameworks/Java/play2-java/play2-java-ebean-hikaricp/app/controllers/Application.java

@@ -93,13 +93,19 @@ public class Application extends Controller {
 
     @Predicated(predicate = IsDbAvailable.class, failed = SERVICE_UNAVAILABLE)
     public static F.Promise<Result> update(final String queryCountString) {
-        return getRandomWorlds(queryCount(queryCountString)).flatMap(new F.Function<List<World>, F.Promise<Result>>() {
+        return getRandomWorlds(queryCount(queryCountString)).map(new F.Function<List<World>, Result>() {
 
             @Override
-            public F.Promise<Result> apply(List<World> worlds) throws Throwable {
-                return updateWorlds(worlds);
+            public Result apply(List<World> worlds) throws Throwable {
+                Random random = ThreadLocalRandom.current();
+                for (World world : worlds) {
+                    world.randomNumber = (long) (random.nextInt(10000) + 1);
+                }
+
+                List<World> updatedWorlds = World.save(worlds);
+                return ok(Json.toJson(updatedWorlds));
             }
-        });
+        }, dbEc);
     }
 
     private static int queryCount(String queryCountString) {
@@ -135,21 +141,4 @@ public class Application extends Controller {
         }, dbEc);
     }
 
-    private static F.Promise<Result> updateWorlds(final List<World> worlds) {
-        return F.Promise.promise(new F.Function0<Result>() {
-
-            @Override
-            public Result apply() throws Throwable {
-                Random random = ThreadLocalRandom.current();
-                for (World world : worlds) {
-                    world.randomNumber = (long) (random.nextInt(10000) + 1);
-                }
-
-                List<World> updatedWorlds = World.save(worlds);
-                return ok(Json.toJson(updatedWorlds));
-            }
-        }, dbEc);
-    }
-
-
 }

+ 10 - 20
frameworks/Java/play2-java/play2-java-jpa-bonecp/app/controllers/Application.java

@@ -103,13 +103,19 @@ public class Application extends Controller {
 
     @Predicated(predicate = IsDbAvailable.class, failed = SERVICE_UNAVAILABLE)
     public static F.Promise<Result> update(final String queryCountString) {
-        return getRandomWorlds(queryCount(queryCountString)).flatMap(new F.Function<List<World>, F.Promise<Result>>() {
+        return getRandomWorlds(queryCount(queryCountString)).map(new F.Function<List<World>, Result>() {
 
             @Override
-            public F.Promise<Result> apply(List<World> worlds) throws Throwable {
-                return updateWorlds(worlds);
+            public Result apply(List<World> worlds) throws Throwable {
+                Random random = ThreadLocalRandom.current();
+                for (World world : worlds) {
+                    world.randomNumber = (long) (random.nextInt(10000) + 1);
+                }
+
+                List<World> updatedWorlds = World.save(worlds);
+                return ok(Json.toJson(updatedWorlds));
             }
-        });
+        }, dbEc);
     }
 
     private static int queryCount(String queryCountString) {
@@ -145,20 +151,4 @@ public class Application extends Controller {
         }, dbEc);
     }
 
-    private static F.Promise<Result> updateWorlds(final List<World> worlds) {
-        return F.Promise.promise(new F.Function0<Result>() {
-
-            @Override
-            public Result apply() throws Throwable {
-                Random random = ThreadLocalRandom.current();
-                for (World world : worlds) {
-                    world.randomNumber = (long) (random.nextInt(10000) + 1);
-                }
-
-                List<World> updatedWorlds = World.save(worlds);
-                return ok(Json.toJson(updatedWorlds));
-            }
-        }, dbEc);
-    }
-
 }

+ 10 - 20
frameworks/Java/play2-java/play2-java-jpa-hikaricp/app/controllers/Application.java

@@ -104,13 +104,19 @@ public class Application extends Controller {
 
     @Predicated(predicate = IsDbAvailable.class, failed = SERVICE_UNAVAILABLE)
     public static F.Promise<Result> update(final String queryCountString) {
-        return getRandomWorlds(queryCount(queryCountString)).flatMap(new F.Function<List<World>, F.Promise<Result>>() {
+        return getRandomWorlds(queryCount(queryCountString)).map(new F.Function<List<World>, Result>() {
 
             @Override
-            public F.Promise<Result> apply(List<World> worlds) throws Throwable {
-                return updateWorlds(worlds);
+            public Result apply(List<World> worlds) throws Throwable {
+                Random random = ThreadLocalRandom.current();
+                for (World world : worlds) {
+                    world.randomNumber = (long) (random.nextInt(10000) + 1);
+                }
+
+                List<World> updatedWorlds = World.save(worlds);
+                return ok(Json.toJson(updatedWorlds));
             }
-        });
+        }, dbEc);
     }
 
     private static int queryCount(String queryCountString) {
@@ -146,20 +152,4 @@ public class Application extends Controller {
         }, dbEc);
     }
 
-    private static F.Promise<Result> updateWorlds(final List<World> worlds) {
-        return F.Promise.promise(new F.Function0<Result>() {
-
-            @Override
-            public Result apply() throws Throwable {
-                Random random = ThreadLocalRandom.current();
-                for (World world : worlds) {
-                    world.randomNumber = (long) (random.nextInt(10000) + 1);
-                }
-
-                List<World> updatedWorlds = World.save(worlds);
-                return ok(Json.toJson(updatedWorlds));
-            }
-        }, dbEc);
-    }
-
 }