RevenJ framework testing fixes (#2442)

* RevenJ framework testing fixes

* update travis to include new revenj-jvm testdir

.travis.yml

@@ -90,7 +90,7 @@ env:
     - "TESTDIR=Java/play2-java"
     - "TESTDIR=Java/rapidoid"
     - "TESTDIR=Java/restexpress"
-    - "TESTDIR=Java/revenj"
+    - "TESTDIR=Java/revenj-jvm"
     - "TESTDIR=Java/servlet"
     - "TESTDIR=Java/spark"
     - "TESTDIR=Java/spring"

frameworks/CSharp/revenj/benchmark_config.json

@@ -1,7 +1,7 @@
 {
   "framework": "revenj",
   "tests": [{
-    "windows": {
+    "default": {
       "setup_file": "setup",
       "json_url": "/bench/json",
       "db_url": "/bench/db",
@@ -16,17 +16,17 @@
       "database_os": "Linux",
       "framework": "Revenj",
       "language": "C#",
-      "flavor": "Microsoft",
+      "flavor": "Mono",
       "orm": "Full",
       "platform": "None",
       "webserver": "None",
-      "os": "Windows",
+      "os": "Linux",
       "display_name": "Revenj",
       "notes": "",
       "versus": "Revenj"
     },
-    "default": {
-      "setup_file": "setup",
+    "windows": {
+      "setup_file": "setup_windows",
       "json_url": "/bench/json",
       "db_url": "/bench/db",
       "query_url": "/bench/queries/",
@@ -40,14 +40,14 @@
       "database_os": "Linux",
       "framework": "Revenj",
       "language": "C#",
-      "flavor": "Mono",
+      "flavor": "Microsoft",
       "orm": "Full",
       "platform": "None",
       "webserver": "None",
-      "os": "Linux",
+      "os": "Windows",
       "display_name": "Revenj",
       "notes": "",
       "versus": "Revenj"
     }
-  }]
+ }]
 }

frameworks/CSharp/revenj/setup.ps1 → frameworks/CSharp/revenj/setup_windows.ps1

@@ -1,64 +1,64 @@
-param($action)
-
-if (!$TROOT) {
-  $TROOT = "C:\FrameworkBenchmarks\frameworks\CSharp\revenj"
-}
-if (!$IROOT) {
-  $IROOT = "C:\FrameworkBenchmarks\installs"
-}
-if (!$DBHOST) {
-  $DBHOST = "localhost"
-}
-
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-
-$msbuild = $Env:windir + "\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe"
-$java=$Env:JAVA_HOME + "\bin\java"
-$dslclc=$TROOT + "\dsl-clc.jar"
-$httpZip=$TROOT + "\http-server.zip"
-$sln=$TROOT + "\Revenj.Bench.sln"
-$revenj=$TROOT + "\exe\Revenj.Http.exe"
-$exe=$TROOT + "\exe\"
-$config=$TROOT + "\exe\Revenj.Http.exe.config"
-
-echo "Stopping existing Revenj.Http"
-Stop-Process -Name "Revenj.Http*" -ErrorAction 'SilentlyContinue' | Out-Null
-
-if ($action -eq 'start') {
-
-	echo "Cleaning up..."
-	If (Test-Path $TROOT/exe) {
-	  rmdir $TROOT/exe -recurse -force
-	}
-	if (Test-Path $TROOT/dsl-clc.jar) {
-	  rm $TROOT/dsl-clc.jar
-	}
-	if (Test-Path $TROOT/http-server.zip) {
-	  rm $TROOT/http-server.zip
-	}
-
-	echo "Download DSL compiler client"
-	$client = new-object System.Net.WebClient
-	$client.DownloadFile( "https://github.com/ngs-doo/dsl-compiler-client/releases/download/1.8.2/dsl-clc.jar", $dslclc )
-
-	echo "Download Revenj HTTP server"
-	$client = new-object System.Net.WebClient
-	$client.DownloadFile( "https://github.com/ngs-doo/revenj/releases/download/1.4.1/http-server.zip", $httpZip )
-
-	echo "Unzipping HTTP server"
-	[System.IO.Compression.ZipFile]::ExtractToDirectory($httpZip, $exe)
-
-	echo "Compiling the server model and downloading DSL Platform compiler..."
-	&$java -jar $dslclc temp=$TROOT/tmp/ force dsl=$TROOT/Revenj.Bench manual-json revenj.net=$TROOT/exe/ServerModel.dll no-prompt dependencies:revenj.net=$TROOT/exe compiler=$IROOT/dsl-compiler.exe
-
-	echo "Compiling the benchmark project..."
-	&$msbuild $sln /p:Configuration=Release /t:Rebuild
-
-	echo "Copying the configuration template"
-	$template = Get-Content $TROOT/Revenj.Http.exe.config
-	$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding($False)
-	[System.IO.File]::WriteAllText($config, $template.Replace("server=localhost", "server=" + $DBHOST), $Utf8NoBomEncoding)
-
-	echo "Starting Revenj..."
-	Start-Process $revenj
-}
+param($action)
+
+if (!$TROOT) {
+  $TROOT = "C:\FrameworkBenchmarks\frameworks\CSharp\revenj"
+}
+if (!$IROOT) {
+  $IROOT = "C:\FrameworkBenchmarks\installs"
+}
+if (!$DBHOST) {
+  $DBHOST = "localhost"
+}
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+$msbuild = $Env:windir + "\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe"
+$java=$Env:JAVA_HOME + "\bin\java"
+$dslclc=$TROOT + "\dsl-clc.jar"
+$httpZip=$TROOT + "\http-server.zip"
+$sln=$TROOT + "\Revenj.Bench.sln"
+$revenj=$TROOT + "\exe\Revenj.Http.exe"
+$exe=$TROOT + "\exe\"
+$config=$TROOT + "\exe\Revenj.Http.exe.config"
+
+echo "Stopping existing Revenj.Http"
+Stop-Process -Name "Revenj.Http*" -ErrorAction 'SilentlyContinue' | Out-Null
+
+if ($action -eq 'start') {
+
+	echo "Cleaning up..."
+	If (Test-Path $TROOT/exe) {
+	  rmdir $TROOT/exe -recurse -force
+	}
+	if (Test-Path $TROOT/dsl-clc.jar) {
+	  rm $TROOT/dsl-clc.jar
+	}
+	if (Test-Path $TROOT/http-server.zip) {
+	  rm $TROOT/http-server.zip
+	}
+
+	echo "Download DSL compiler client"
+	$client = new-object System.Net.WebClient
+	$client.DownloadFile( "https://github.com/ngs-doo/dsl-compiler-client/releases/download/1.8.2/dsl-clc.jar", $dslclc )
+
+	echo "Download Revenj HTTP server"
+	$client = new-object System.Net.WebClient
+	$client.DownloadFile( "https://github.com/ngs-doo/revenj/releases/download/1.4.1/http-server.zip", $httpZip )
+
+	echo "Unzipping HTTP server"
+	[System.IO.Compression.ZipFile]::ExtractToDirectory($httpZip, $exe)
+
+	echo "Compiling the server model and downloading DSL Platform compiler..."
+	&$java -jar $dslclc temp=$TROOT/tmp/ force dsl=$TROOT/Revenj.Bench manual-json revenj.net=$TROOT/exe/ServerModel.dll no-prompt dependencies:revenj.net=$TROOT/exe compiler=$IROOT/dsl-compiler.exe
+
+	echo "Compiling the benchmark project..."
+	&$msbuild $sln /p:Configuration=Release /t:Rebuild
+
+	echo "Copying the configuration template"
+	$template = Get-Content $TROOT/Revenj.Http.exe.config
+	$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding($False)
+	[System.IO.File]::WriteAllText($config, $template.Replace("server=localhost", "server=" + $DBHOST), $Utf8NoBomEncoding)
+
+	echo "Starting Revenj..."
+	Start-Process $revenj
+}

frameworks/Java/revenj/benchmark_config.json → frameworks/Java/revenj-jvm/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "revenj",
+  "framework": "revenj-jvm",
   "tests": [{
     "default": {
       "setup_file": "setup",

frameworks/Java/revenj/src/main/java/hello/Context.java → frameworks/Java/revenj-jvm/src/main/java/hello/Context.java

@@ -1,86 +1,86 @@
-package hello;
-
-import com.dslplatform.json.JsonWriter;
-import dsl.Boot;
-import dsl.FrameworkBench.*;
-import dsl.FrameworkBench.repositories.*;
-import org.revenj.extensibility.Container;
-import org.revenj.patterns.*;
-
-import java.io.IOException;
-import java.sql.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-class Context {
-	private static final ServiceLocator locator;
-	private static final String jdbcUrl;
-
-	static {
-		try {
-			javax.naming.Context ctx = new javax.naming.InitialContext();
-			jdbcUrl = (String) ctx.lookup("java:comp/env/revenj.jdbcUrl");
-			Properties props = new Properties();
-			props.setProperty("revenj.notifications.status", "disabled");
-			locator = Boot.configure(jdbcUrl, props);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public final JsonWriter json;
-	public final WorldRepository worlds;
-	public final FortuneRepository fortunes;
-	public final Connection connection;
-	private final ThreadLocalRandom random;
-	//public final RepositoryBulkReader bulkReader;
-	private final World[] buffer = new World[512];
-	//private final Callable[] callables = new Callable[512];
-
-	public Context() {
-		try {
-			Container ctx = locator.resolve(Container.class);
-			this.connection = DriverManager.getConnection(jdbcUrl);
-			connection.setAutoCommit(true);
-			ctx.registerInstance(connection);
-			this.json = new JsonWriter();
-			this.random = ThreadLocalRandom.current();
-			this.worlds = ctx.resolve(WorldRepository.class);
-			this.fortunes = ctx.resolve(FortuneRepository.class);
-			//this.bulkReader = ctx.resolve(RepositoryBulkReader.class);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public int getRandom10k() {
-		return random.nextInt(10000) + 1;
-	}
-
-	/* bulk loading of worlds. use such pattern for production code */
-	/*@SuppressWarnings("unchecked")
-	public World[] loadWorldsFast(final int count) throws IOException {
-		bulkReader.reset();
-		for (int i = 0; i < count; i++) {
-			callables[i] = bulkReader.find(World.class, Integer.toString(getRandom10k()));
-		}
-		bulkReader.execute();
-		try {
-			for (int i = 0; i < count; i++) {
-				buffer[i] = ((Optional<World>) callables[i].call()).get();
-			}
-		} catch (Exception e) {
-			throw new IOException(e);
-		}
-		return buffer;
-	}*/
-
-	/* multiple roundtrips loading of worlds. don't write such production code */
-	@SuppressWarnings("unchecked")
-	public World[] loadWorldsSlow(final int count) throws IOException {
-		for (int i = 0; i < count; i++) {
-			buffer[i] = worlds.find(getRandom10k(), connection).get();
-		}
-		return buffer;
-	}
-}
+package hello;
+
+import com.dslplatform.json.JsonWriter;
+import dsl.Boot;
+import dsl.FrameworkBench.*;
+import dsl.FrameworkBench.repositories.*;
+import org.revenj.extensibility.Container;
+import org.revenj.patterns.*;
+
+import java.io.IOException;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+class Context {
+	private static final ServiceLocator locator;
+	private static final String jdbcUrl;
+
+	static {
+		try {
+			javax.naming.Context ctx = new javax.naming.InitialContext();
+			jdbcUrl = (String) ctx.lookup("java:comp/env/revenj.jdbcUrl");
+			Properties props = new Properties();
+			props.setProperty("revenj.notifications.status", "disabled");
+			locator = Boot.configure(jdbcUrl, props);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public final JsonWriter json;
+	public final WorldRepository worlds;
+	public final FortuneRepository fortunes;
+	public final Connection connection;
+	private final ThreadLocalRandom random;
+	//public final RepositoryBulkReader bulkReader;
+	private final World[] buffer = new World[512];
+	//private final Callable[] callables = new Callable[512];
+
+	public Context() {
+		try {
+			Container ctx = locator.resolve(Container.class);
+			this.connection = DriverManager.getConnection(jdbcUrl);
+			connection.setAutoCommit(true);
+			ctx.registerInstance(connection);
+			this.json = new JsonWriter();
+			this.random = ThreadLocalRandom.current();
+			this.worlds = ctx.resolve(WorldRepository.class);
+			this.fortunes = ctx.resolve(FortuneRepository.class);
+			//this.bulkReader = ctx.resolve(RepositoryBulkReader.class);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public int getRandom10k() {
+		return random.nextInt(10000) + 1;
+	}
+
+	/* bulk loading of worlds. use such pattern for production code */
+	/*@SuppressWarnings("unchecked")
+	public World[] loadWorldsFast(final int count) throws IOException {
+		bulkReader.reset();
+		for (int i = 0; i < count; i++) {
+			callables[i] = bulkReader.find(World.class, Integer.toString(getRandom10k()));
+		}
+		bulkReader.execute();
+		try {
+			for (int i = 0; i < count; i++) {
+				buffer[i] = ((Optional<World>) callables[i].call()).get();
+			}
+		} catch (Exception e) {
+			throw new IOException(e);
+		}
+		return buffer;
+	}*/
+
+	/* multiple roundtrips loading of worlds. don't write such production code */
+	@SuppressWarnings("unchecked")
+	public World[] loadWorldsSlow(final int count) throws IOException {
+		for (int i = 0; i < count; i++) {
+			buffer[i] = worlds.find(getRandom10k(), connection).get();
+		}
+		return buffer;
+	}
+}

frameworks/Java/revenj/src/main/java/hello/DbServlet.java → frameworks/Java/revenj-jvm/src/main/java/hello/DbServlet.java

@@ -1,23 +1,23 @@
-package hello;
-
-import com.dslplatform.json.JsonWriter;
-import dsl.FrameworkBench.World;
-
-import java.io.*;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-public class DbServlet extends HttpServlet {
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		res.setContentType("application/json");
-		final Context ctx = Utils.getContext();
-		final Optional<World> world = ctx.worlds.find(ctx.getRandom10k(), ctx.connection);
-		final JsonWriter writer = ctx.json;
-		world.get().serialize(writer, false);
-		writer.toStream(res.getOutputStream());
-	}
-}
+package hello;
+
+import com.dslplatform.json.JsonWriter;
+import dsl.FrameworkBench.World;
+
+import java.io.*;
+import java.util.*;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+public class DbServlet extends HttpServlet {
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+		res.setContentType("application/json");
+		final Context ctx = Utils.getContext();
+		final Optional<World> world = ctx.worlds.find(ctx.getRandom10k(), ctx.connection);
+		final JsonWriter writer = ctx.json;
+		world.get().serialize(writer, false);
+		writer.toStream(res.getOutputStream());
+	}
+}

frameworks/Java/revenj/src/main/java/hello/FortunesServlet.java → frameworks/Java/revenj-jvm/src/main/java/hello/FortunesServlet.java

@@ -1,24 +1,24 @@
-package hello;
-
-import dsl.FrameworkBench.Fortune;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.*;
-import java.io.IOException;
-import java.util.*;
-
-public class FortunesServlet extends HttpServlet {
-
-	private static final Comparator<Fortune> COMPARATOR = (o1, o2) -> o1.getMessage().compareTo(o2.getMessage());
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		final Context ctx = Utils.getContext();
-		final List<Fortune> fortunes = ctx.fortunes.search();
-		fortunes.add(new Fortune(0, "Additional fortune added at request time."));
-		Collections.sort(fortunes, COMPARATOR);
-		req.setCharacterEncoding("UTF-8");
-		req.setAttribute("fortunes", fortunes);
-		req.getRequestDispatcher("/WEB-INF/jsp/fortunes.jsp").forward(req, res);
-	}
-}
+package hello;
+
+import dsl.FrameworkBench.Fortune;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.*;
+import java.io.IOException;
+import java.util.*;
+
+public class FortunesServlet extends HttpServlet {
+
+	private static final Comparator<Fortune> COMPARATOR = (o1, o2) -> o1.getMessage().compareTo(o2.getMessage());
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+		final Context ctx = Utils.getContext();
+		final List<Fortune> fortunes = ctx.fortunes.search();
+		fortunes.add(new Fortune(0, "Additional fortune added at request time."));
+		Collections.sort(fortunes, COMPARATOR);
+		req.setCharacterEncoding("UTF-8");
+		req.setAttribute("fortunes", fortunes);
+		req.getRequestDispatcher("/WEB-INF/jsp/fortunes.jsp").forward(req, res);
+	}
+}

frameworks/Java/revenj/src/main/java/hello/QueriesServlet.java → frameworks/Java/revenj-jvm/src/main/java/hello/QueriesServlet.java

@@ -1,22 +1,22 @@
-package hello;
-
-import com.dslplatform.json.JsonWriter;
-import dsl.FrameworkBench.World;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.*;
-import java.io.IOException;
-
-public class QueriesServlet extends HttpServlet {
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		res.setContentType("application/json");
-		final int count = Utils.parseBoundParam(req);
-		final Context ctx = Utils.getContext();
-		final JsonWriter json = ctx.json;
-		final World[] worlds = ctx.loadWorldsSlow(count);
-		json.serialize(worlds, count);
-		json.toStream(res.getOutputStream());
-	}
-}
+package hello;
+
+import com.dslplatform.json.JsonWriter;
+import dsl.FrameworkBench.World;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.*;
+import java.io.IOException;
+
+public class QueriesServlet extends HttpServlet {
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+		res.setContentType("application/json");
+		final int count = Utils.parseBoundParam(req);
+		final Context ctx = Utils.getContext();
+		final JsonWriter json = ctx.json;
+		final World[] worlds = ctx.loadWorldsSlow(count);
+		json.serialize(worlds, count);
+		json.toStream(res.getOutputStream());
+	}
+}

frameworks/Java/revenj/src/main/java/hello/UpdatesServlet.java → frameworks/Java/revenj-jvm/src/main/java/hello/UpdatesServlet.java

@@ -1,31 +1,31 @@
-package hello;
-
-import com.dslplatform.json.JsonWriter;
-import dsl.FrameworkBench.World;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.*;
-import java.io.IOException;
-import java.util.*;
-
-public class UpdatesServlet extends HttpServlet {
-
-	private static final Comparator<World> ASC = (l, r) -> l.getId() - r.getId();
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		res.setContentType("application/json");
-		final int count = Utils.parseBoundParam(req);
-		final Context ctx = Utils.getContext();
-		final JsonWriter json = ctx.json;
-		final World[] worlds = ctx.loadWorldsSlow(count);
-		final ArrayList<World> changed = new ArrayList<>(count);
-		for (int i = 0; i < count; i++) {
-			changed.add(worlds[i].setRandomNumber(ctx.getRandom10k()));
-		}
-		Collections.sort(changed, ASC);
-		ctx.worlds.update(changed);
-		json.serialize(worlds, count);
-		json.toStream(res.getOutputStream());
-	}
+package hello;
+
+import com.dslplatform.json.JsonWriter;
+import dsl.FrameworkBench.World;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.*;
+import java.io.IOException;
+import java.util.*;
+
+public class UpdatesServlet extends HttpServlet {
+
+	private static final Comparator<World> ASC = (l, r) -> l.getId() - r.getId();
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+		res.setContentType("application/json");
+		final int count = Utils.parseBoundParam(req);
+		final Context ctx = Utils.getContext();
+		final JsonWriter json = ctx.json;
+		final World[] worlds = ctx.loadWorldsSlow(count);
+		final ArrayList<World> changed = new ArrayList<>(count);
+		for (int i = 0; i < count; i++) {
+			changed.add(worlds[i].setRandomNumber(ctx.getRandom10k()));
+		}
+		Collections.sort(changed, ASC);
+		ctx.worlds.update(changed);
+		json.serialize(worlds, count);
+		json.toStream(res.getOutputStream());
+	}
 }