Merge pull request #70 from KristianKarl/3.4.2

KristianKarl · KristianKarl · commit dfcf6ee37a05 · 2016-05-19T20:11:43.000+02:00
3.4.2
diff --git a/README.md b/README.md
@@ -22,5 +22,5 @@ mvn package -pl graphwalker-cli -am
 
 The jar is in:
 ```bash
-graphwalker-cli/target/graphwalker-cli-3.4.1.jar
+graphwalker-cli/target/graphwalker-cli-3.4.2.jar
 ```
diff --git a/graphwalker-cli/pom.xml b/graphwalker-cli/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-cli</artifactId>
diff --git a/graphwalker-cli/src/test/resources/template/perl.template b/graphwalker-cli/src/test/resources/template/perl.template
@@ -4,10 +4,10 @@ use warnings;
 
 ##
 ## 1) Generate perl stub source code:
-##    java -jar graphwalker-3.4.1.jar source -i model.graphml perl.template > model.perl
+##    java -jar graphwalker-3.4.2.jar source -i model.graphml perl.template > model.perl
 ##
 ## 2) Start graphwalker:
-##    java -jar graphwalker-3.4.1.jar online -s RESTFUL -m model.graphml "random(edge_coverage(100))"
+##    java -jar graphwalker-3.4.2.jar online -s RESTFUL -m model.graphml "random(edge_coverage(100))"
 ##
 ## 3) Run the per program:
 ##    perl login.perl http://localhost:8887/graphwalker
diff --git a/graphwalker-cli/src/test/resources/template/python.template b/graphwalker-cli/src/test/resources/template/python.template
@@ -2,10 +2,10 @@ HEADER<{{
 import requests,json
 ##
 ## 1) Generate python stub source code:
-##    java -jar graphwalker-3.4.1.jar source -i model.graphml python.template > model.py
+##    java -jar graphwalker-3.4.2.jar source -i model.graphml python.template > model.py
 ##
 ## 2) Start graphwalker:
-##    java -jar graphwalker-3.4.1.jar online --json --service RESTFUL -m model.graphml "random(edge_coverage(100))"
+##    java -jar graphwalker-3.4.2.jar online --json --service RESTFUL -m model.graphml "random(edge_coverage(100))"
 ##
 ## 3) Run the per program:
 ##    python model.py
diff --git a/graphwalker-core/pom.xml b/graphwalker-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-core</artifactId>
diff --git a/graphwalker-dsl/pom.xml b/graphwalker-dsl/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-dsl</artifactId>
diff --git a/graphwalker-io/pom.xml b/graphwalker-io/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-io</artifactId>
diff --git a/graphwalker-java/pom.xml b/graphwalker-java/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-java</artifactId>
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/Result.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/Result.java
@@ -41,6 +41,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.graphwalker.core.common.Objects.isNotNullOrEmpty;
+
 /**
  * @author Nils Olsson
  */
@@ -201,7 +203,7 @@ public void updateResults(Machine machine, Map<Context, MachineException> failur
       results.put("requirementsFailed", requirementsFailedJson);
     }
 
-    if (failures.size() > 0) {
+    if (isNotNullOrEmpty(failures)) {
       JSONArray jsonFailures = new JSONArray();
       for (MachineException exception : failures.values()) {
         JSONObject jsonFailure = new JSONObject();
diff --git a/graphwalker-maven-archetype/README.md b/graphwalker-maven-archetype/README.md
@@ -7,7 +7,7 @@ A GraphWalker maven archetype. To help create boilerplate GraphWalker maven proj
 To create a sample project:
 
 ~~~sh
-%> mvn archetype:generate -B -DarchetypeGroupId=org.graphwalker -DarchetypeArtifactId=graphwalker-maven-archetype -DarchetypeVersion=3.4.1-DgroupId=com.company -DartifactId=myProject
+%> mvn archetype:generate -B -DarchetypeGroupId=org.graphwalker -DarchetypeArtifactId=graphwalker-maven-archetype -DarchetypeVersion=3.4.2-DgroupId=com.company -DartifactId=myProject
 ~~~
 
 Then cd into the project:
diff --git a/graphwalker-maven-archetype/pom.xml b/graphwalker-maven-archetype/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <name>GraphWalker Maven Archetype</name>
diff --git a/graphwalker-maven-archetype/src/main/resources/archetype-resources/pom.xml b/graphwalker-maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
   <name>GraphWalker Example</name>
 
   <properties>
-    <graphwalker.version>3.4.1</graphwalker.version>
+    <graphwalker.version>3.4.2</graphwalker.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
diff --git a/graphwalker-maven-plugin/pom.xml b/graphwalker-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-maven-plugin</artifactId>
diff --git a/graphwalker-model-checker/pom.xml b/graphwalker-model-checker/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-model-checker</artifactId>
diff --git a/graphwalker-restful/pom.xml b/graphwalker-restful/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.graphwalker</groupId>
     <artifactId>graphwalker-project</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
   </parent>
 
   <artifactId>graphwalker-restful</artifactId>
@@ -31,7 +31,6 @@
     <dependency>
       <groupId>org.graphwalker</groupId>
       <artifactId>graphwalker-java</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
diff --git a/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java b/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java
@@ -29,6 +29,7 @@
 import org.graphwalker.core.machine.*;
 import org.graphwalker.core.model.Action;
 import org.graphwalker.io.factory.gw3.GW3ContextFactory;
+import org.graphwalker.java.test.Result;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,17 +71,17 @@ public void setContexts(List<Context> contexts) {
   @Path("load")
   public String load(String jsonGW3) {
     logger.debug("Received load with gw3: " + jsonGW3);
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       List<Context> contexts = new GW3ContextFactory().createMultiple(jsonGW3);
       setContexts(contexts);
-      obj.put("result", "ok");
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   /**
@@ -95,20 +96,20 @@ public String load(String jsonGW3) {
   @Path("hasNext")
   public String hasNext() {
     logger.debug("Received hasNext");
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       if (machine.hasNextStep()) {
-        obj.put("hasNext", "true").toString();
+        resultJson.put("hasNext", "true").toString();
       } else {
-        obj.put("hasNext", "false").toString();
+        resultJson.put("hasNext", "false").toString();
       }
-      obj.put("result", "ok");
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   /**
@@ -123,18 +124,18 @@ public String hasNext() {
   @Path("getNext")
   public String getNext() {
     logger.debug("Received getNext");
-    JSONObject obj;
+    JSONObject resultJson;
     try {
       machine.getNextStep();
-      obj = Util.getStepAsJSON(machine, verbose, unvisited);
-      obj.put("result", "ok");
+      resultJson = Util.getStepAsJSON(machine, verbose, unvisited);
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj = new JSONObject();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson = new JSONObject();
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   @GET
@@ -143,20 +144,20 @@ public String getNext() {
   @Path("getData")
   public String getData() {
     logger.debug("Received getData");
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       JSONObject data = new JSONObject();
       for (Map.Entry<String, String> k : machine.getCurrentContext().getKeys().entrySet()) {
         data.put(k.getKey(), k.getValue());
       }
-      obj.put("data", data);
-      obj.put("result", "ok");
+      resultJson.put("data", data);
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   @PUT
@@ -165,33 +166,33 @@ public String getData() {
   @Path("setData/{script}")
   public String setData(@PathParam("script") String script) {
     logger.debug("Received setData with script: " + script);
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       machine.getCurrentContext().execute(new Action(script));
-      obj.put("result", "ok");
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   @PUT
   @Path("restart")
   @Produces("text/plain;charset=UTF-8")
   public String restart() {
     logger.debug("Received restart");
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       machine = new SimpleMachine(contexts);
-      obj.put("result", "ok");
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   @PUT
@@ -200,35 +201,36 @@ public String restart() {
   @Path("fail/{reason}")
   public String fail(@PathParam("reason") String reason) {
     logger.debug("Received fail with reason: " + reason);
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
       FailFastStrategy failFastStrategy = new FailFastStrategy();
       failFastStrategy.handle(machine, new MachineException(machine.getCurrentContext(), new Throwable(reason)));
-      obj.put("result", "ok");
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   @GET
   @Produces("text/plain;charset=UTF-8")
   @Path("getStatistics")
   public String getStatistics() {
     logger.debug("Received getStatistics");
-    JSONObject obj = new JSONObject();
+    JSONObject resultJson = new JSONObject();
     try {
-      obj = Util.getStatisticsAsJSON(machine);
-      obj.put("result", "ok");
+      Result result = new Result();
+      result.updateResults(machine, null);
+      resultJson = result.getResults();
+      resultJson.put("result", "ok");
     } catch (Exception e) {
       e.printStackTrace();
-      obj = new JSONObject();
-      obj.put("result", "nok");
-      obj.put("error", e.getMessage());
+      resultJson.put("result", "nok");
+      resultJson.put("error", e.getMessage());
     }
-    return obj.toString();
+    return resultJson.toString();
   }
 
   public List<Context> getContexts() {
diff --git a/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java b/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java
diff --git a/graphwalker-studio/pom.xml b/graphwalker-studio/pom.xml
diff --git a/graphwalker-websocket/pom.xml b/graphwalker-websocket/pom.xml
diff --git a/pom.xml b/pom.xml
