diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Check.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Check.java
index 6d5c2b508..fcd79d50d 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Check.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Check.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Methods.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Methods.java
index a05583829..11cb6bbc1 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Methods.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Methods.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Offline.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Offline.java
index 02e7fd777..81df2e72f 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Offline.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Offline.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Online.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Online.java
index 629ca8cec..7d30988ee 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Online.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Online.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Requirements.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Requirements.java
index 9394dcb83..bf89b2eba 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Requirements.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Requirements.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Source.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Source.java
index f5bf69bcb..5ef7a6fe5 100644
--- a/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Source.java
+++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/commands/Source.java
@@ -28,6 +28,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java
index c0aebfe5b..8a9d6dee3 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java
@@ -26,11 +26,12 @@
* #L%
*/
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java
index 80fdfe8e1..e815a6fb4 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java
@@ -26,13 +26,14 @@
package org.graphwalker.cli;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.Is.is;
+
public class CheckTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java
index da9886a8f..0c9c92ab7 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java
@@ -26,12 +26,13 @@
package org.graphwalker.cli;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.core.Is.is;
+
public class ConvertFilesTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java
index 8ee0cc78b..f8ee1a7bb 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java
@@ -48,14 +48,15 @@
package org.graphwalker.cli;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.core.Is.is;
-import java.util.Arrays;
-import org.junit.Assert;
-import org.junit.Test;
-
public class CorrectModelsTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java
index a20cdea20..f0d29ba03 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java
@@ -26,11 +26,11 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+
public class IOErrorsTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java
index 6612c35e2..17897836f 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java
@@ -26,11 +26,11 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+
public class IncorrectModelsTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java
index 554e201b3..ac083726f 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java
@@ -26,13 +26,14 @@
package org.graphwalker.cli;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.core.Is.is;
+import org.junit.Assert;
+import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.core.Is.is;
public class MethodsTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java
index 580780a19..91405a34b 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java
@@ -26,12 +26,13 @@
package org.graphwalker.cli;
+import org.junit.Test;
+
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
public class OnlineTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java
index a1eb3cb3e..07c03f3fa 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java
@@ -26,13 +26,14 @@
package org.graphwalker.cli;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.core.Is.is;
+
public class PrintHelpTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java
index cbe8610d7..c687ca366 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java
@@ -26,13 +26,14 @@
package org.graphwalker.cli;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.core.Is.is;
+
public class PrintVersionTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java
index 7cb3dc6a6..86e40645d 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java
@@ -26,14 +26,15 @@
package org.graphwalker.cli;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.core.Is.is;
+import org.junit.Assert;
+import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.core.Is.is;
public class RequirementsTest extends CLITestRoot {
diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java
index 5c6a556bf..1939123c2 100644
--- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java
+++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java
@@ -26,12 +26,13 @@
package org.graphwalker.cli;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.core.Is.is;
+
public class SourceTest extends CLITestRoot {
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/condition/AlternativeCondition.java b/graphwalker-core/src/main/java/org/graphwalker/core/condition/AlternativeCondition.java
index de0d4163c..6bbee1658 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/condition/AlternativeCondition.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/condition/AlternativeCondition.java
@@ -29,7 +29,6 @@
import org.graphwalker.core.machine.Context;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/condition/CombinedCondition.java b/graphwalker-core/src/main/java/org/graphwalker/core/condition/CombinedCondition.java
index 1c5b9ccf8..51900dbdd 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/condition/CombinedCondition.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/condition/CombinedCondition.java
@@ -29,7 +29,6 @@
import org.graphwalker.core.machine.Context;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/condition/EdgeCoverage.java b/graphwalker-core/src/main/java/org/graphwalker/core/condition/EdgeCoverage.java
index e98d6ae38..eafe8058f 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/condition/EdgeCoverage.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/condition/EdgeCoverage.java
@@ -28,8 +28,6 @@
import org.graphwalker.core.machine.Context;
-import static org.graphwalker.core.model.Edge.RuntimeEdge;
-
/**
* EdgeCoverage
* The EdgeCoverage stop condition is fulfilled when the percentage of visited edges in the
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/condition/InternalState.java b/graphwalker-core/src/main/java/org/graphwalker/core/condition/InternalState.java
index fb9e46012..b1225a7ff 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/condition/InternalState.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/condition/InternalState.java
@@ -30,8 +30,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.script.ScriptException;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/condition/PredefinedPathStopCondition.java b/graphwalker-core/src/main/java/org/graphwalker/core/condition/PredefinedPathStopCondition.java
index 81fdebeee..5fddf4c79 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/condition/PredefinedPathStopCondition.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/condition/PredefinedPathStopCondition.java
@@ -1,6 +1,5 @@
package org.graphwalker.core.condition;
-import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Vertex;
public class PredefinedPathStopCondition extends StopConditionBase {
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/generator/CombinedPath.java b/graphwalker-core/src/main/java/org/graphwalker/core/generator/CombinedPath.java
index ffafb983a..49653f48b 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/generator/CombinedPath.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/generator/CombinedPath.java
@@ -30,7 +30,6 @@
import org.graphwalker.core.machine.Context;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/machine/SimpleMachine.java b/graphwalker-core/src/main/java/org/graphwalker/core/machine/SimpleMachine.java
index 51d45e5c2..67476fdc2 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/machine/SimpleMachine.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/machine/SimpleMachine.java
@@ -38,7 +38,8 @@
import java.util.*;
-import static org.graphwalker.core.common.Objects.*;
+import static org.graphwalker.core.common.Objects.isNotNull;
+import static org.graphwalker.core.common.Objects.isNull;
import static org.graphwalker.core.model.Edge.RuntimeEdge;
import static org.graphwalker.core.model.Vertex.RuntimeVertex;
diff --git a/graphwalker-core/src/main/java/org/graphwalker/core/model/Model.java b/graphwalker-core/src/main/java/org/graphwalker/core/model/Model.java
index 1ea3b4c37..9c69386fa 100644
--- a/graphwalker-core/src/main/java/org/graphwalker/core/model/Model.java
+++ b/graphwalker-core/src/main/java/org/graphwalker/core/model/Model.java
@@ -27,7 +27,6 @@
*/
import org.graphwalker.core.common.Objects;
-import org.graphwalker.core.machine.MachineException;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/Models.java b/graphwalker-core/src/test/java/org/graphwalker/core/Models.java
index 407ac0d11..c0986dabd 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/Models.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/Models.java
@@ -26,14 +26,14 @@
* #L%
*/
-import static org.graphwalker.core.model.Edge.RuntimeEdge;
-import static org.graphwalker.core.model.Model.RuntimeModel;
-import static org.graphwalker.core.model.Vertex.RuntimeVertex;
-
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
+import static org.graphwalker.core.model.Edge.RuntimeEdge;
+import static org.graphwalker.core.model.Model.RuntimeModel;
+import static org.graphwalker.core.model.Vertex.RuntimeVertex;
+
public abstract class Models {
private static final Vertex VERTEX_A = new Vertex()
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java
index 36d067735..49c7355c9 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java
@@ -26,18 +26,14 @@
* #L%
*/
+import org.graphwalker.core.machine.TestExecutionContext;
+import org.graphwalker.core.model.*;
+import org.junit.Test;
+
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Path;
-import org.graphwalker.core.model.Vertex;
-import org.junit.Test;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AllClassificationCombinationsTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AllClassificationCombinationsTest.java
index 98f3389f2..74b72a4f0 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AllClassificationCombinationsTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AllClassificationCombinationsTest.java
@@ -26,12 +26,12 @@
* #L%
*/
-import static org.junit.Assert.assertNotNull;
-
import org.graphwalker.core.model.Classification;
import org.graphwalker.core.model.ClassificationTree;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java
index e02d921f6..41a3ad879 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java
@@ -26,15 +26,15 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java
index c07a752fd..a2e9bcffc 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java
@@ -26,15 +26,15 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FleuryTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FleuryTest.java
index a31ad35d1..7d40ecc77 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FleuryTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FleuryTest.java
@@ -26,18 +26,15 @@
* #L%
*/
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Arrays;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Path;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.model.*;
import org.junit.Test;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertArrayEquals;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java
index 334026563..08276e4df 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java
@@ -26,15 +26,15 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/common/ObjectsTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/common/ObjectsTest.java
index b1e6700b0..4dfa26d32 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/common/ObjectsTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/common/ObjectsTest.java
@@ -30,9 +30,7 @@
import java.util.*;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class ObjectsTest {
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java
index 0e1f6faa8..56208da19 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java
@@ -26,11 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.Machine;
@@ -41,6 +36,9 @@
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java
index 08db3e644..bbaffc364 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java
@@ -26,12 +26,12 @@
* #L%
*/
+import org.junit.Test;
+
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ComplexConditionsTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ComplexConditionsTest.java
index fc0b0e6b8..166c3c86a 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ComplexConditionsTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ComplexConditionsTest.java
@@ -31,11 +31,7 @@
import org.graphwalker.core.machine.Machine;
import org.graphwalker.core.machine.SimpleMachine;
import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.model.*;
import org.junit.Test;
/**
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java
index 7ad955db4..d5eee1e92 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java
@@ -26,21 +26,18 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Profiler;
import org.graphwalker.core.statistics.SimpleProfiler;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Miroslav Janeski
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java
index 3ffaa4c54..e819f38b0 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java
@@ -26,21 +26,18 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Profiler;
import org.graphwalker.core.statistics.SimpleProfiler;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java
index 0cb43b463..67354813d 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java
@@ -26,20 +26,17 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Profiler;
import org.graphwalker.core.statistics.SimpleProfiler;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java
index c6117c873..948182b33 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java
@@ -26,13 +26,11 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java
index 1f38557f8..2002443df 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java
@@ -26,11 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
@@ -39,6 +34,9 @@
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java
index 89da4974a..d7894fbbf 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java
@@ -26,29 +26,22 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
import org.graphwalker.core.generator.AStarPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.Machine;
import org.graphwalker.core.machine.SimpleMachine;
import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.model.*;
import org.graphwalker.core.statistics.Execution;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java
index 3879861e7..bdfd8cfd2 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java
@@ -26,11 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
@@ -39,6 +34,9 @@
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java
index 138ca3264..889f2d474 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java
@@ -26,25 +26,17 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.RequirementStatus;
-import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.machine.TestExecutionContext;
+import org.graphwalker.core.machine.*;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Requirement;
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java
index 5197be517..318b18867 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java
@@ -26,12 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.Machine;
@@ -42,6 +36,11 @@
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java
index 2c8717349..fd54bc5d7 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java
@@ -26,21 +26,18 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Profiler;
import org.graphwalker.core.statistics.SimpleProfiler;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java
index 92f5d6b11..faba676eb 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java
@@ -26,29 +26,23 @@
* #L%
*/
-import static org.graphwalker.core.event.EventType.AFTER_ELEMENT;
-import static org.graphwalker.core.event.EventType.BEFORE_ELEMENT;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.MachineBase;
-import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.machine.TestExecutionContext;
+import org.graphwalker.core.machine.*;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Element;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.graphwalker.core.event.EventType.AFTER_ELEMENT;
+import static org.graphwalker.core.event.EventType.BEFORE_ELEMENT;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java
index 97409122a..3de6c08b7 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java
@@ -26,24 +26,16 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.ExecutionContext;
-import org.graphwalker.core.machine.ExecutionStatus;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.MachineException;
-import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.machine.*;
+import org.graphwalker.core.model.*;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/example/ObjectMirrorTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/example/ObjectMirrorTest.java
index 1878d6823..43f71bb59 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/example/ObjectMirrorTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/example/ObjectMirrorTest.java
@@ -26,20 +26,17 @@
* #L%
*/
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.machine.Machine;
import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.model.*;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/generator/AStarPathTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/generator/AStarPathTest.java
index 462f0b8e2..43377753f 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/generator/AStarPathTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/generator/AStarPathTest.java
@@ -30,11 +30,7 @@
import org.graphwalker.core.condition.StopConditionException;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
+import org.graphwalker.core.model.*;
import org.junit.Test;
/**
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java
index c82c1bacb..6573ff950 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java
@@ -26,11 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.condition.ReachedEdge;
import org.graphwalker.core.condition.ReachedVertex;
@@ -44,10 +39,13 @@
import org.junit.Test;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/generator/PredefinedPathTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/generator/PredefinedPathTest.java
index e3d63f07f..79ec7d3d1 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/generator/PredefinedPathTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/generator/PredefinedPathTest.java
@@ -3,7 +3,6 @@
import org.graphwalker.core.condition.Never;
import org.graphwalker.core.condition.PredefinedPathStopCondition;
import org.graphwalker.core.condition.StopConditionException;
-import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.machine.*;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/generator/ShortestAllPathsTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/generator/ShortestAllPathsTest.java
index 102171e60..a706813cf 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/generator/ShortestAllPathsTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/generator/ShortestAllPathsTest.java
@@ -26,25 +26,21 @@
* #L%
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Deque;
import org.graphwalker.core.algorithm.AlgorithmException;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.TestExecutionContext;
-import org.graphwalker.core.model.Builder;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Profiler;
+import org.graphwalker.core.model.*;
import org.graphwalker.core.statistics.SimpleProfiler;
import org.junit.Test;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java
index f9ecd4761..382a0c55d 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java
@@ -26,9 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.condition.RequirementCoverage;
import org.graphwalker.core.condition.StopCondition;
import org.graphwalker.core.generator.RandomPath;
@@ -38,6 +35,9 @@
import org.graphwalker.core.model.Vertex;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginCrashSharedStateModelTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginCrashSharedStateModelTest.java
index e54be3abe..368812446 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginCrashSharedStateModelTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginCrashSharedStateModelTest.java
@@ -26,28 +26,19 @@
* #L%
*/
-import static org.junit.Assert.assertArrayEquals;
+import org.graphwalker.core.condition.*;
+import org.graphwalker.core.generator.AStarPath;
+import org.graphwalker.core.generator.RandomPath;
+import org.graphwalker.core.generator.ShortestAllPaths;
+import org.graphwalker.core.model.*;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.graphwalker.core.condition.AlternativeCondition;
-import org.graphwalker.core.condition.CombinedCondition;
-import org.graphwalker.core.condition.EdgeCoverage;
-import org.graphwalker.core.condition.ReachedEdge;
-import org.graphwalker.core.condition.ReachedVertex;
-import org.graphwalker.core.condition.VertexCoverage;
-import org.graphwalker.core.generator.AStarPath;
-import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.generator.ShortestAllPaths;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
-import org.junit.Test;
+
+import static org.junit.Assert.assertArrayEquals;
/**
* This is a programatic implementaion of the models:
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java
index 09a50439d..a9ebfaf40 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java
@@ -26,32 +26,22 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
+import org.graphwalker.core.condition.*;
+import org.graphwalker.core.generator.AStarPath;
+import org.graphwalker.core.generator.RandomPath;
+import org.graphwalker.core.generator.ShortestAllPaths;
+import org.graphwalker.core.model.*;
+import org.graphwalker.core.statistics.Execution;
+import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import org.graphwalker.core.condition.AlternativeCondition;
-import org.graphwalker.core.condition.CombinedCondition;
-import org.graphwalker.core.condition.EdgeCoverage;
-import org.graphwalker.core.condition.ReachedEdge;
-import org.graphwalker.core.condition.ReachedVertex;
-import org.graphwalker.core.condition.VertexCoverage;
-import org.graphwalker.core.generator.AStarPath;
-import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.generator.ShortestAllPaths;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Execution;
-import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThat;
/**
* This is a programatic implementaion of the loginModel:
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java
index 2581767ea..8234fd43d 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java
@@ -26,9 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.model.*;
@@ -38,6 +35,9 @@
import java.util.List;
import java.util.stream.Collectors;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java
index 5452ea70a..7d86a933a 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java
@@ -26,26 +26,20 @@
* #L%
*/
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
+import org.graphwalker.core.condition.*;
+import org.graphwalker.core.generator.*;
+import org.graphwalker.core.model.*;
+import org.graphwalker.core.statistics.Execution;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import org.graphwalker.core.condition.*;
-import org.graphwalker.core.generator.*;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Vertex;
-import org.graphwalker.core.statistics.Execution;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/TestExecutionContext.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/TestExecutionContext.java
index 4f7af5857..47561c070 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/TestExecutionContext.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/TestExecutionContext.java
@@ -26,7 +26,6 @@
* #L%
*/
-import org.graalvm.polyglot.Context;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.generator.RandomPath;
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ActionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ActionTest.java
index 802fe3353..d15d9375a 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ActionTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ActionTest.java
@@ -26,11 +26,11 @@
* #L%
*/
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java
index 77d52c15b..5443fb5cd 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java
@@ -26,13 +26,11 @@
* #L%
*/
+import org.junit.Test;
+
import static org.graphwalker.core.model.Classification.RuntimeClassification;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java
index a6615a338..11785c0fa 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java
@@ -26,13 +26,11 @@
* #L%
*/
+import org.junit.Test;
+
import static org.graphwalker.core.model.ClassificationTree.RuntimeClassificationTree;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java
index 1c376231a..9a18820e6 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java
@@ -26,16 +26,13 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import java.util.Arrays;
-import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/GuardTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/GuardTest.java
index 31555a104..fcd6697de 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/GuardTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/GuardTest.java
@@ -26,11 +26,11 @@
* #L%
*/
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java
index 6cac985ab..ef6d9d67e 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java
@@ -26,19 +26,18 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.*;
+import org.graphwalker.core.model.Model.RuntimeModel;
+import org.junit.Test;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import org.graphwalker.core.model.Model.RuntimeModel;
-import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java
index 0dab0bfd3..cf4c45a0d 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java
@@ -26,22 +26,16 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
import org.graphwalker.core.condition.AlternativeCondition;
import org.graphwalker.core.condition.ReachedVertex;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.RequirementStatus;
-import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.machine.TestExecutionContext;
+import org.graphwalker.core.machine.*;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java
index bbaf53dc1..f97201f30 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java
@@ -26,19 +26,14 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Test;
import java.util.Arrays;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java
index 45b3b6919..8c97ec1dc 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java
@@ -26,17 +26,16 @@
* #L%
*/
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
import static org.graphwalker.core.model.Edge.RuntimeEdge;
import static org.graphwalker.core.model.Model.RuntimeModel;
import static org.graphwalker.core.model.Vertex.RuntimeVertex;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
+import static org.junit.Assert.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java
index d11bb8d77..bc54c0717 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java
@@ -26,18 +26,18 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import java.util.concurrent.TimeUnit;
-
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.machine.TestExecutionContext;
import org.graphwalker.core.model.Vertex;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java
index 6c5fd093b..cd8891934 100644
--- a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java
+++ b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java
@@ -26,20 +26,9 @@
* #L%
*/
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.ExecutionContext;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.machine.TestExecutionContext;
+import org.graphwalker.core.machine.*;
import org.graphwalker.core.model.Action;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
@@ -51,6 +40,10 @@
import java.util.Arrays;
import java.util.HashSet;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-dsl/src/main/java/org/graphwalker/dsl/antlr/generator/GeneratorLoader.java b/graphwalker-dsl/src/main/java/org/graphwalker/dsl/antlr/generator/GeneratorLoader.java
index 9f66ccd1e..7011b83a6 100644
--- a/graphwalker-dsl/src/main/java/org/graphwalker/dsl/antlr/generator/GeneratorLoader.java
+++ b/graphwalker-dsl/src/main/java/org/graphwalker/dsl/antlr/generator/GeneratorLoader.java
@@ -26,10 +26,6 @@
* #L%
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
import org.graphwalker.core.condition.*;
import org.graphwalker.core.generator.*;
import org.graphwalker.dsl.generator.GeneratorParser;
@@ -37,6 +33,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
/**
* Created by krikar on 5/14/14.
*/
diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/RegexMatcher.java b/graphwalker-dsl/src/test/java/org/graphwalker/RegexMatcher.java
index bd36909bf..2613dbb14 100644
--- a/graphwalker-dsl/src/test/java/org/graphwalker/RegexMatcher.java
+++ b/graphwalker-dsl/src/test/java/org/graphwalker/RegexMatcher.java
@@ -26,10 +26,11 @@
package org.graphwalker;
-import java.util.regex.Pattern;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
+import java.util.regex.Pattern;
+
public class RegexMatcher extends BaseMatcher {
private final String regex;
diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java
index fc3940e2b..7e9275602 100644
--- a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java
+++ b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java
@@ -26,10 +26,6 @@
* #L%
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-
import org.graphwalker.core.condition.*;
import org.graphwalker.core.generator.*;
import org.graphwalker.dsl.antlr.DslException;
@@ -39,6 +35,10 @@
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+
/**
* Created by krikar on 5/14/14.
*/
diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java
index 205949124..424451ba8 100644
--- a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java
+++ b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java
@@ -26,10 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
-import java.util.Arrays;
-import java.util.List;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
@@ -38,6 +34,11 @@
import org.junit.Assert;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java
index d743b3ef0..23a1dfafa 100644
--- a/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java
+++ b/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java
@@ -26,10 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
-import java.util.Arrays;
-import java.util.List;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
@@ -39,6 +35,11 @@
import org.junit.Assert;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/common/ResourceUtils.java b/graphwalker-io/src/main/java/org/graphwalker/io/common/ResourceUtils.java
index 14f50afea..2d72e95be 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/common/ResourceUtils.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/common/ResourceUtils.java
@@ -26,6 +26,9 @@
* #L%
*/
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -35,9 +38,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/common/Util.java b/graphwalker-io/src/main/java/org/graphwalker/io/common/Util.java
index 61d158783..32866ee94 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/common/Util.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/common/Util.java
@@ -26,12 +26,6 @@
* #L%
*/
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Properties;
-
import org.apache.commons.io.IOUtils;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.model.Edge;
@@ -40,6 +34,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Properties;
+
/**
* Created by krikar on 2015-11-04.
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactory.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactory.java
index 0d3b5b1d7..8b63f0311 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactory.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactory.java
@@ -26,11 +26,12 @@
* #L%
*/
+import org.graphwalker.core.machine.Context;
+
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
-import org.graphwalker.core.machine.Context;
/**
* @author Nils Olsson
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactoryScanner.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactoryScanner.java
index b92a12d4a..3bb940ead 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactoryScanner.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/ContextFactoryScanner.java
@@ -26,10 +26,6 @@
* #L%
*/
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
@@ -39,6 +35,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContext.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContext.java
index 5eb2b8102..32ef76179 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContext.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContext.java
@@ -26,12 +26,13 @@
* #L%
*/
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Model;
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContextFactory.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContextFactory.java
index 6f52f1ebd..fee5d4da7 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContextFactory.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/dot/DotContextFactory.java
@@ -26,17 +26,6 @@
* #L%
*/
-import java.io.*;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.tree.ParseTreeWalker;
@@ -54,6 +43,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContext.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContext.java
index 7588041a5..bc85b4ebb 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContext.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContext.java
@@ -26,12 +26,13 @@
* #L%
*/
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Model;
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContextFactory.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContextFactory.java
index 241fdda08..c72f090bc 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContextFactory.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/java/JavaContextFactory.java
@@ -26,16 +26,6 @@
* #L%
*/
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import com.google.common.collect.ImmutableList;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +38,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContext.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContext.java
index 9b1c94065..9adf4bb5b 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContext.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContext.java
@@ -26,12 +26,13 @@
* #L%
*/
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Model;
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+
/**
* Created by krikar on 9/24/14.
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContextFactory.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContextFactory.java
index 667dde79f..0a7169120 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContextFactory.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonContextFactory.java
@@ -26,23 +26,7 @@
* #L%
*/
-import static org.graphwalker.core.common.Objects.isNull;
-
import com.google.gson.Gson;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import org.apache.commons.io.FilenameUtils;
import org.graphwalker.core.generator.SingletonRandomGenerator;
import org.graphwalker.core.machine.Context;
@@ -55,6 +39,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+
+import static org.graphwalker.core.common.Objects.isNull;
+
/**
* Created by krikar on 9/24/14.
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonEdge.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonEdge.java
index d9725d7d1..90660fdb5 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonEdge.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonEdge.java
@@ -26,15 +26,16 @@
* #L%
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.graphwalker.core.model.Action;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Guard;
import org.graphwalker.core.model.Requirement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonModel.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonModel.java
index 953ca38d4..aca5cdcde 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonModel.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonModel.java
@@ -26,15 +26,15 @@
* #L%
*/
+import org.graphwalker.core.model.*;
+import org.graphwalker.io.factory.ContextFactoryException;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.graphwalker.core.model.*;
-import org.graphwalker.io.factory.ContextFactoryException;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonMultimodel.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonMultimodel.java
index 94840c48f..7503efcb9 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonMultimodel.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonMultimodel.java
@@ -26,11 +26,11 @@
* #L%
*/
-import static org.graphwalker.core.common.Objects.isNull;
-
import java.util.ArrayList;
import java.util.List;
+import static org.graphwalker.core.common.Objects.isNull;
+
public final class JsonMultimodel {
private String name;
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonVertex.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonVertex.java
index 1a491e3b6..37c6a6ec6 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonVertex.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/json/JsonVertex.java
@@ -26,15 +26,15 @@
* #L%
*/
+import org.graphwalker.core.model.Action;
+import org.graphwalker.core.model.Requirement;
+import org.graphwalker.core.model.Vertex;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Requirement;
-import org.graphwalker.core.model.Vertex;
-
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContext.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContext.java
index 8e34b396b..1449067db 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContext.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContext.java
@@ -26,12 +26,13 @@
* #L%
*/
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Model;
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContextFactory.java b/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContextFactory.java
index 6d8c74791..35beacbb7 100644
--- a/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContextFactory.java
+++ b/graphwalker-io/src/main/java/org/graphwalker/io/factory/yed/YEdContextFactory.java
@@ -35,8 +35,8 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.graphdrawing.graphml.xmlns.*;
import org.graphdrawing.graphml.xmlns.NodeType;
+import org.graphdrawing.graphml.xmlns.*;
import org.graphdrawing.graphml.xmlns.impl.DataTypeImpl;
import org.graphdrawing.graphml.xmlns.impl.KeyForTypeImpl;
import org.graphdrawing.graphml.xmlns.impl.KeyTypeImpl;
diff --git a/graphwalker-io/src/main/xsd/portconstraints.xsd b/graphwalker-io/src/main/xsd/portconstraints.xsd
index d8e2519b5..4305e0e91 100644
--- a/graphwalker-io/src/main/xsd/portconstraints.xsd
+++ b/graphwalker-io/src/main/xsd/portconstraints.xsd
@@ -2,16 +2,14 @@
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+>
diff --git a/graphwalker-io/src/main/xsd/xlink.xsd b/graphwalker-io/src/main/xsd/xlink.xsd
index 4de85194f..37a97d169 100644
--- a/graphwalker-io/src/main/xsd/xlink.xsd
+++ b/graphwalker-io/src/main/xsd/xlink.xsd
@@ -1,13 +1,12 @@
-
diff --git a/graphwalker-io/src/main/xsd/yfeatures.xsd b/graphwalker-io/src/main/xsd/yfeatures.xsd
index ece110647..bbd1e7233 100644
--- a/graphwalker-io/src/main/xsd/yfeatures.xsd
+++ b/graphwalker-io/src/main/xsd/yfeatures.xsd
@@ -1,13 +1,11 @@
-
diff --git a/graphwalker-io/src/main/xsd/ygraphics.xsd b/graphwalker-io/src/main/xsd/ygraphics.xsd
index 2039b64ce..f9418c5b1 100644
--- a/graphwalker-io/src/main/xsd/ygraphics.xsd
+++ b/graphwalker-io/src/main/xsd/ygraphics.xsd
@@ -2,17 +2,15 @@
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+>
diff --git a/graphwalker-io/src/main/xsd/ygraphml.xsd b/graphwalker-io/src/main/xsd/ygraphml.xsd
index 0c68d28b2..270058919 100644
--- a/graphwalker-io/src/main/xsd/ygraphml.xsd
+++ b/graphwalker-io/src/main/xsd/ygraphml.xsd
@@ -2,17 +2,14 @@
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+>
diff --git a/graphwalker-io/src/main/xsd/yprocessors.xsd b/graphwalker-io/src/main/xsd/yprocessors.xsd
index de565c052..a98868211 100644
--- a/graphwalker-io/src/main/xsd/yprocessors.xsd
+++ b/graphwalker-io/src/main/xsd/yprocessors.xsd
@@ -2,16 +2,14 @@
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+>
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/TestExecutionContext.java b/graphwalker-io/src/test/java/org/graphwalker/io/TestExecutionContext.java
index ebf0ecc20..da623ccca 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/TestExecutionContext.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/TestExecutionContext.java
@@ -26,14 +26,15 @@
* #L%
*/
-import static org.graphwalker.core.model.Model.RuntimeModel;
-
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Model;
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+
+import static org.graphwalker.core.model.Model.RuntimeModel;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/common/ResourceUtilsTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/common/ResourceUtilsTest.java
index fa4a3f467..737fa4785 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/common/ResourceUtilsTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/common/ResourceUtilsTest.java
@@ -26,15 +26,16 @@
* #L%
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Paths;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Paths;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java
index 3ac956bc7..527f63180 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java
@@ -26,18 +26,19 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.List;
import org.graphwalker.core.machine.Context;
import org.graphwalker.io.factory.json.JsonContextFactory;
import org.graphwalker.io.factory.yed.YEdContextFactory;
import org.junit.Test;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
/**
* Created by krikar on 2015-11-04.
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ContextFactoryScannerTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ContextFactoryScannerTest.java
index b4b00b3b7..8942da1bd 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ContextFactoryScannerTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ContextFactoryScannerTest.java
@@ -26,9 +26,10 @@
* #L%
*/
-import java.io.File;
import org.junit.Test;
+import java.io.File;
+
import static org.junit.Assert.assertNotNull;
/**
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java
index 089fc058f..e63c46330 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java
@@ -26,27 +26,27 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
import org.graphwalker.core.machine.Context;
import org.graphwalker.io.factory.dot.DotContextFactory;
import org.graphwalker.io.factory.java.JavaContextFactory;
import org.graphwalker.io.factory.json.JsonContextFactory;
import org.graphwalker.io.factory.yed.YEdContextFactory;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java
index 60296e4fc..52a5f5ec7 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java
@@ -26,17 +26,16 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.io.common.ResourceNotFoundException;
+import org.junit.Test;
import java.io.IOException;
import java.nio.file.Paths;
import java.util.List;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.io.common.ResourceNotFoundException;
-import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
/**
* @author Kristian Karl
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/java/JavaContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/java/JavaContextFactoryTest.java
index 07f5f0a5d..b6022a2a0 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/java/JavaContextFactoryTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/java/JavaContextFactoryTest.java
@@ -26,12 +26,13 @@
* #L%
*/
-import java.nio.file.Paths;
import org.graphwalker.io.factory.ContextFactoryException;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.nio.file.Paths;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/json/JsonContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/json/JsonContextFactoryTest.java
index 0dcea0ae5..d8a56d0bf 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/json/JsonContextFactoryTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/json/JsonContextFactoryTest.java
@@ -26,39 +26,33 @@
* #L%
*/
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.generator.SingletonRandomGenerator;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
+import org.graphwalker.core.model.*;
import org.graphwalker.core.model.Edge.RuntimeEdge;
-import org.graphwalker.core.model.Element;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
-import org.graphwalker.core.model.Requirement;
-import org.graphwalker.core.model.Vertex;
import org.graphwalker.io.TestExecutionContext;
import org.graphwalker.io.factory.ContextFactory;
import org.graphwalker.io.factory.ContextFactoryException;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/yed/YEdContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/yed/YEdContextFactoryTest.java
index 8438f6f60..0edd2c605 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/yed/YEdContextFactoryTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/yed/YEdContextFactoryTest.java
@@ -26,35 +26,15 @@
* #L%
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.commons.io.IOUtils;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.Machine;
import org.graphwalker.core.machine.SimpleMachine;
-import org.graphwalker.core.model.Action;
-import org.graphwalker.core.model.Edge;
+import org.graphwalker.core.model.*;
import org.graphwalker.core.model.Edge.RuntimeEdge;
-import org.graphwalker.core.model.Guard;
-import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Model.RuntimeModel;
-import org.graphwalker.core.model.Vertex;
import org.graphwalker.core.model.Vertex.RuntimeVertex;
import org.graphwalker.io.TestExecutionContext;
import org.graphwalker.io.common.ResourceUtils;
@@ -64,6 +44,18 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
/**
* @author Nils Olsson
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java
index 840125029..8f9abbb90 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java
@@ -26,13 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
-import java.util.Arrays;
-import java.util.List;
-
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
@@ -41,6 +34,13 @@
import org.graphwalker.dsl.yed.YEdVertexParser;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java
index 0f6f8e1b7..07c7b04df 100644
--- a/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java
+++ b/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java
@@ -26,15 +26,15 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
import org.apache.xmlbeans.XmlException;
import org.graphdrawing.graphml.xmlns.GraphmlDocument;
-import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/annotation/AnnotationUtils.java b/graphwalker-java/src/main/java/org/graphwalker/java/annotation/AnnotationUtils.java
index 59d4e39e2..ac2d4c0c4 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/annotation/AnnotationUtils.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/annotation/AnnotationUtils.java
@@ -26,12 +26,6 @@
* #L%
*/
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Set;
-
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ClassInfo;
import io.github.classgraph.ScanResult;
@@ -39,6 +33,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/annotation/GraphWalker.java b/graphwalker-java/src/main/java/org/graphwalker/java/annotation/GraphWalker.java
index f752afb5a..02070619c 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/annotation/GraphWalker.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/annotation/GraphWalker.java
@@ -26,15 +26,16 @@
* #L%
*/
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import org.graphwalker.core.condition.StopCondition;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.generator.RandomPath;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/factory/PathGeneratorFactory.java b/graphwalker-java/src/main/java/org/graphwalker/java/factory/PathGeneratorFactory.java
index e06ddf128..1fefd7655 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/factory/PathGeneratorFactory.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/factory/PathGeneratorFactory.java
@@ -26,7 +26,6 @@
* #L%
*/
-import java.lang.reflect.Constructor;
import org.graphwalker.core.condition.ReachedStopCondition;
import org.graphwalker.core.condition.StopCondition;
import org.graphwalker.core.generator.PathGenerator;
@@ -35,6 +34,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Constructor;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/report/XMLReportGenerator.java b/graphwalker-java/src/main/java/org/graphwalker/java/report/XMLReportGenerator.java
index 0e1e72c62..991b5a38a 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/report/XMLReportGenerator.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/report/XMLReportGenerator.java
@@ -26,26 +26,22 @@
* #L%
*/
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.core.machine.Machine;
+import org.graphwalker.java.test.Executor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import java.io.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
-import java.util.concurrent.TimeUnit;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.java.test.Executor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/source/ChangeContext.java b/graphwalker-java/src/main/java/org/graphwalker/java/source/ChangeContext.java
index 1e7888b5d..cfcebda9a 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/source/ChangeContext.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/source/ChangeContext.java
@@ -26,12 +26,13 @@
* #L%
*/
-import static org.graphwalker.core.model.Model.RuntimeModel;
-
import japa.parser.ast.body.MethodDeclaration;
+import org.graphwalker.core.model.Element;
+
import java.util.HashSet;
import java.util.Set;
-import org.graphwalker.core.model.Element;
+
+import static org.graphwalker.core.model.Model.RuntimeModel;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/CacheEntry.java b/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/CacheEntry.java
index f5cf1a5a5..67bdbb711 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/CacheEntry.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/CacheEntry.java
@@ -27,6 +27,7 @@
*/
import com.google.gson.annotations.Expose;
+
import java.nio.file.attribute.FileTime;
import java.util.concurrent.TimeUnit;
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/SimpleCache.java b/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/SimpleCache.java
index d114cccf0..c57613780 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/SimpleCache.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/source/cache/SimpleCache.java
@@ -29,17 +29,17 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.lang.reflect.Type;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/Configuration.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/Configuration.java
index ed7d6ef10..0dc5b3442 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/Configuration.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/Configuration.java
@@ -26,11 +26,7 @@
* #L%
*/
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/Executor.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/Executor.java
index 7eb4845c8..b774cbaa8 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/Executor.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/Executor.java
@@ -26,13 +26,14 @@
* #L%
*/
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.core.machine.Machine;
+import org.graphwalker.core.machine.MachineException;
+
import java.io.File;
import java.util.Collection;
import java.util.Date;
import java.util.Properties;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.machine.Machine;
-import org.graphwalker.core.machine.MachineException;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/IsolatedClassLoader.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/IsolatedClassLoader.java
index 5581a246c..fd912ea13 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/IsolatedClassLoader.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/IsolatedClassLoader.java
@@ -26,14 +26,15 @@
* #L%
*/
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/Reflections.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/Reflections.java
index 67f9e5d22..574da0ce6 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/Reflections.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/Reflections.java
@@ -26,11 +26,12 @@
* #L%
*/
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Nils Olsson
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
index 1f7a6e166..58392f17e 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/Result.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/Result.java
@@ -26,13 +26,6 @@
* #L%
*/
-import static org.graphwalker.core.common.Objects.isNotNullOrEmpty;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.Machine;
import org.graphwalker.core.machine.MachineException;
@@ -42,6 +35,14 @@
import org.json.JSONArray;
import org.json.JSONObject;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.graphwalker.core.common.Objects.isNotNullOrEmpty;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/main/java/org/graphwalker/java/test/TestBuilder.java b/graphwalker-java/src/main/java/org/graphwalker/java/test/TestBuilder.java
index 82902af1c..cd6eb5744 100644
--- a/graphwalker-java/src/main/java/org/graphwalker/java/test/TestBuilder.java
+++ b/graphwalker-java/src/main/java/org/graphwalker/java/test/TestBuilder.java
@@ -26,12 +26,6 @@
* #L%
*/
-import static org.graphwalker.core.common.Objects.isNullOrEmpty;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.generator.PathGenerator;
import org.graphwalker.core.machine.Context;
import org.graphwalker.dsl.antlr.generator.GeneratorFactory;
@@ -40,6 +34,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.graphwalker.core.common.Objects.isNullOrEmpty;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java
index 3190730ef..a5c37f74c 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java
@@ -26,15 +26,16 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
-import java.util.Set;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.java.annotation.resources.MyTest;
import org.junit.Assert;
import org.junit.Test;
+import java.util.Set;
+
+import static org.hamcrest.core.Is.is;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/resources/MyTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/resources/MyTest.java
index 0732ca56a..53219e26b 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/resources/MyTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/resources/MyTest.java
@@ -29,13 +29,7 @@
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.ExecutionContext;
-import org.graphwalker.java.annotation.AfterElement;
-import org.graphwalker.java.annotation.AfterExecution;
-import org.graphwalker.java.annotation.BeforeElement;
-import org.graphwalker.java.annotation.BeforeExecution;
-import org.graphwalker.java.annotation.Edge;
-import org.graphwalker.java.annotation.GraphWalker;
-import org.graphwalker.java.annotation.Vertex;
+import org.graphwalker.java.annotation.*;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java
index 03dfaabf7..16fa3c539 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java
@@ -26,8 +26,13 @@
* #L%
*/
-import static org.junit.Assert.assertThat;
-import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.io.factory.json.JsonContextFactory;
+import org.graphwalker.java.test.Executor;
+import org.graphwalker.java.test.TestExecutor;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import java.io.IOException;
import java.nio.file.Files;
@@ -37,13 +42,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.io.factory.json.JsonContextFactory;
-import org.graphwalker.java.test.Executor;
-import org.graphwalker.java.test.TestExecutor;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+
+import static org.junit.Assert.assertThat;
+import static org.xmlunit.matchers.HasXPathMatcher.hasXPath;
/**
* @author Nils Olsson
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/source/CodeGeneratorTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/source/CodeGeneratorTest.java
index 96c096813..28f2e1dee 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/source/CodeGeneratorTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/source/CodeGeneratorTest.java
@@ -6,11 +6,14 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.FileTime;
import java.util.Arrays;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
public class CodeGeneratorTest {
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java
index 7b937c8dd..aaa2e3f6f 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java
@@ -1,6 +1,5 @@
package org.graphwalker.java.source;
-import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/source/cache/SimpleCacheTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/source/cache/SimpleCacheTest.java
index 25705e653..670de5b9e 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/source/cache/SimpleCacheTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/source/cache/SimpleCacheTest.java
@@ -1,6 +1,5 @@
package org.graphwalker.java.source.cache;
-import org.junit.Before;
import org.junit.Test;
import java.io.File;
@@ -8,7 +7,8 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class SimpleCacheTest {
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/CombinedGeneratorTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/CombinedGeneratorTest.java
index 6bc410b9c..51052af29 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/CombinedGeneratorTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/CombinedGeneratorTest.java
@@ -26,9 +26,6 @@
* #L%
*/
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.CombinedPath;
@@ -38,6 +35,10 @@
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
/**
* @author Kristian Karl
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java
index 666c4b701..6f782dc37 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java
@@ -26,11 +26,11 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
import org.junit.Assert;
import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/MultipleModelTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/MultipleModelTest.java
index 9a00d35ee..686ad68cf 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/MultipleModelTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/MultipleModelTest.java
@@ -26,18 +26,16 @@
* #L%
*/
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.condition.ReachedVertex;
import org.graphwalker.core.generator.AStarPath;
import org.graphwalker.core.generator.RandomPath;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.io.factory.ContextFactoryScanner;
-import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
import static org.junit.Assert.assertTrue;
/**
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java
index b8b384363..a34b907ec 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java
@@ -26,7 +26,12 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.io.factory.json.JsonContextFactory;
+import org.hamcrest.core.StringStartsWith;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
import java.io.IOException;
import java.nio.file.Paths;
@@ -34,12 +39,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.io.factory.json.JsonContextFactory;
-import org.hamcrest.core.StringStartsWith;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
/**
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleAnnotationTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleAnnotationTest.java
index 0a451808d..fb67dc67c 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleAnnotationTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleAnnotationTest.java
@@ -26,11 +26,12 @@
* #L%
*/
-import java.io.IOException;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.java.annotation.GraphWalker;
import org.junit.Test;
+import java.io.IOException;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java
index 55e5846ac..3535db85b 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java
@@ -26,15 +26,6 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Deque;
import org.graphwalker.core.condition.VertexCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.ExecutionContext;
@@ -45,6 +36,16 @@
import org.graphwalker.java.annotation.BeforeExecution;
import org.junit.Test;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java
index a5edccfcd..8457aa6c8 100644
--- a/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java
+++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java
@@ -26,6 +26,7 @@
* #L%
*/
+import io.github.classgraph.ClassGraph;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.machine.ExecutionContext;
import org.graphwalker.core.model.Edge;
@@ -38,8 +39,6 @@
import org.junit.Assert;
import org.junit.Test;
-import io.github.classgraph.ClassGraph;
-
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
diff --git a/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/Runner.java b/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/Runner.java
index dd768bd53..d58614a9c 100644
--- a/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/Runner.java
+++ b/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/Runner.java
@@ -1,9 +1,3 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-package ${package};
-
-import ${package}.SomeSmallTest;
import org.graphwalker.java.test.Result;
import org.graphwalker.java.test.TestExecutor;
diff --git a/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/SomeSmallTest.java b/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/SomeSmallTest.java
index a4a217c23..dc0c48e36 100644
--- a/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/SomeSmallTest.java
+++ b/graphwalker-maven-archetype/src/main/resources/archetype-resources/src/main/java/SomeSmallTest.java
@@ -1,8 +1,3 @@
-#set($symbol_pound='#')
-#set($symbol_dollar='$')
-#set($symbol_escape='\' )
-package ${package};
-
import org.graphwalker.core.machine.ExecutionContext;
/**
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/DefaultMojoBase.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/DefaultMojoBase.java
index 75a38c712..4498c8642 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/DefaultMojoBase.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/DefaultMojoBase.java
@@ -26,9 +26,6 @@
* #L%
*/
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -36,6 +33,10 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMainMojo.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMainMojo.java
index 0e43300d2..9a9dc6432 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMainMojo.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMainMojo.java
@@ -26,7 +26,6 @@
* #L%
*/
-import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -34,6 +33,8 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import java.io.File;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMojoBase.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMojoBase.java
index 6df5f594d..a6cbc2e77 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMojoBase.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateMojoBase.java
@@ -26,11 +26,12 @@
* #L%
*/
-import java.io.File;
-import java.util.List;
import org.apache.maven.model.Resource;
import org.graphwalker.java.source.CodeGenerator;
+import java.io.File;
+import java.util.List;
+
/**
* @author Nils Olsson
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateTestMojo.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateTestMojo.java
index c19bb9b9f..0b5845ca4 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateTestMojo.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/GenerateTestMojo.java
@@ -26,7 +26,6 @@
* #L%
*/
-import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -34,6 +33,8 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import java.io.File;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/TestMojo.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/TestMojo.java
index 0e2414200..cd9d58c5f 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/TestMojo.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/TestMojo.java
@@ -26,6 +26,15 @@
* #L%
*/
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.*;
+import org.codehaus.plexus.util.StringUtils;
+import org.graphwalker.java.test.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -33,22 +42,6 @@
import java.util.List;
import java.util.Properties;
import java.util.Set;
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.codehaus.plexus.util.StringUtils;
-import org.graphwalker.java.test.Configuration;
-import org.graphwalker.java.test.ContextConfiguration;
-import org.graphwalker.java.test.IsolatedClassLoader;
-import org.graphwalker.java.test.Reflector;
-import org.graphwalker.java.test.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Nils Olsson
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/ValidateMojoBase.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/ValidateMojoBase.java
index 498fcd23b..19f663ed6 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/ValidateMojoBase.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/ValidateMojoBase.java
@@ -26,9 +26,10 @@
* #L%
*/
-import java.util.List;
import org.apache.maven.model.Resource;
+import java.util.List;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/WatchMojo.java b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/WatchMojo.java
index b53650b66..2ce6fe3cb 100644
--- a/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/WatchMojo.java
+++ b/graphwalker-maven-plugin/src/main/java/org/graphwalker/maven/plugin/WatchMojo.java
@@ -26,29 +26,6 @@
* #L%
*/
-import static com.sun.nio.file.SensitivityWatchEventModifier.HIGH;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
-import static java.nio.file.StandardWatchEventKinds.OVERFLOW;
-import static org.graphwalker.core.model.Model.RuntimeModel;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -66,6 +43,20 @@
import org.graphwalker.java.source.CodeGenerator;
import org.graphwalker.java.source.SourceFile;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static com.sun.nio.file.SensitivityWatchEventModifier.HIGH;
+import static java.nio.file.StandardWatchEventKinds.*;
+import static org.graphwalker.core.model.Model.RuntimeModel;
+
/**
* @author Nils Olsson
*/
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextChecker.java
index 696a5729f..2770831f2 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextChecker.java
@@ -1,12 +1,13 @@
package org.graphwalker.modelchecker;
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
import org.graphwalker.core.model.Vertex;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextsChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextsChecker.java
index 1e30f7420..fe394abd9 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextsChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ContextsChecker.java
@@ -1,11 +1,12 @@
package org.graphwalker.modelchecker;
+import org.graphwalker.core.machine.Context;
+import org.graphwalker.core.model.Element;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.graphwalker.core.machine.Context;
-import org.graphwalker.core.model.Element;
/**
* Created by krikar on 2015-11-08.
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/EdgeChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/EdgeChecker.java
index 347bac592..9420fab4a 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/EdgeChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/EdgeChecker.java
@@ -1,9 +1,10 @@
package org.graphwalker.modelchecker;
import com.google.common.base.CharMatcher;
+import org.graphwalker.core.model.Edge;
+
import java.util.ArrayList;
import java.util.List;
-import org.graphwalker.core.model.Edge;
/**
* Created by krikar on 2015-11-08.
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ElementChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ElementChecker.java
index d587873f9..d234fe3b0 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ElementChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ElementChecker.java
@@ -1,11 +1,12 @@
package org.graphwalker.modelchecker;
-import java.util.ArrayList;
-import java.util.List;
import org.graphwalker.core.model.Action;
import org.graphwalker.core.model.Element;
import org.graphwalker.core.model.Requirement;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ModelChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ModelChecker.java
index 746b11435..6fa3b31e7 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ModelChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/ModelChecker.java
@@ -1,14 +1,15 @@
package org.graphwalker.modelchecker;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Element;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/VertexChecker.java b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/VertexChecker.java
index 6bb3f0331..8a2f40611 100644
--- a/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/VertexChecker.java
+++ b/graphwalker-model-checker/src/main/java/org/graphwalker/modelchecker/VertexChecker.java
@@ -1,9 +1,10 @@
package org.graphwalker.modelchecker;
import com.google.common.base.CharMatcher;
+import org.graphwalker.core.model.Vertex;
+
import java.util.ArrayList;
import java.util.List;
-import org.graphwalker.core.model.Vertex;
/**
* Created by krikar on 2015-11-08.
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java
index d18fffe03..7c4b86d1b 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java
@@ -1,8 +1,5 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.core.Is.is;
-
-import java.util.List;
import org.graphwalker.core.condition.EdgeCoverage;
import org.graphwalker.core.generator.RandomPath;
import org.graphwalker.core.machine.Context;
@@ -13,6 +10,10 @@
import org.junit.Assert;
import org.junit.Test;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java
index cdf60bf3b..0ec2c9759 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java
@@ -1,15 +1,16 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.core.Is.is;
-
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.List;
import org.graphwalker.core.machine.Context;
import org.graphwalker.io.factory.json.JsonContextFactory;
import org.junit.Assert;
import org.junit.Test;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java
index 6064b949f..b368ea248 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java
@@ -1,13 +1,14 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.core.Is.is;
-
-import java.util.List;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Vertex;
import org.junit.Assert;
import org.junit.Test;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java
index 0c82ff924..56781c654 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java
@@ -1,8 +1,5 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.core.Is.is;
-
-import java.util.List;
import org.graphwalker.core.model.Action;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Requirement;
@@ -10,6 +7,10 @@
import org.junit.Assert;
import org.junit.Test;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java
index 8adaa7048..0c6f71e2e 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java
@@ -1,15 +1,16 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.Is.is;
-
-import java.util.List;
import org.graphwalker.core.model.Edge;
import org.graphwalker.core.model.Model;
import org.graphwalker.core.model.Vertex;
import org.junit.Assert;
import org.junit.Test;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java
index 21b642a65..1cbb66f10 100644
--- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java
+++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java
@@ -1,12 +1,13 @@
package org.graphwalker.modelchecker;
-import static org.hamcrest.core.Is.is;
-
-import java.util.List;
import org.graphwalker.core.model.Vertex;
import org.junit.Assert;
import org.junit.Test;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 2015-11-08.
*/
diff --git a/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java b/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java
index c1cf023f3..d300462a7 100644
--- a/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java
+++ b/graphwalker-restful/src/main/java/org/graphwalker/restful/Restful.java
@@ -26,17 +26,6 @@
* #L%
*/
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
import org.graalvm.polyglot.Value;
import org.graphwalker.core.machine.*;
import org.graphwalker.core.model.Action;
@@ -47,6 +36,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.*;
+import java.util.List;
+import java.util.stream.Collectors;
+
import static org.graphwalker.core.common.Objects.isNull;
/**
diff --git a/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java b/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java
index dcd233142..4f859df65 100644
--- a/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java
+++ b/graphwalker-restful/src/main/java/org/graphwalker/restful/Util.java
@@ -26,7 +26,6 @@
* #L%
*/
-import java.util.Map;
import org.apache.commons.io.FilenameUtils;
import org.graalvm.polyglot.Value;
import org.graphwalker.core.machine.Context;
@@ -37,6 +36,8 @@
import org.json.JSONArray;
import org.json.JSONObject;
+import java.util.Map;
+
/**
* Helper class to create output in different formats, like JSON or plain text.
* Created by krikar on 9/13/14.
diff --git a/graphwalker-restful/src/test/java/org/graphwalker/restful/ResetTest.java b/graphwalker-restful/src/test/java/org/graphwalker/restful/ResetTest.java
index fb856a083..b0924e720 100644
--- a/graphwalker-restful/src/test/java/org/graphwalker/restful/ResetTest.java
+++ b/graphwalker-restful/src/test/java/org/graphwalker/restful/ResetTest.java
@@ -14,7 +14,9 @@
import org.glassfish.grizzly.http.server.HttpServer;
import org.graphwalker.io.common.ResourceUtils;
import org.json.JSONObject;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import java.io.IOException;
diff --git a/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java b/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java
index f0d7ba356..37f1f3a35 100644
--- a/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java
+++ b/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java
@@ -26,18 +26,11 @@
* #L%
*/
-import static org.hamcrest.core.Is.is;
-
import com.sun.jersey.api.container.grizzly2.GrizzlyServerFactory;
import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.api.core.ResourceConfig;
-import java.io.IOException;
import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.*;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.FileEntity;
import org.apache.http.impl.client.BasicResponseHandler;
@@ -54,11 +47,13 @@
import org.junit.Assert;
import org.junit.Test;
import org.skyscreamer.jsonassert.JSONAssert;
-import org.skyscreamer.jsonassert.JSONCompareMode;
-import org.skyscreamer.jsonassert.comparator.ArraySizeComparator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+
+import static org.hamcrest.core.Is.is;
+
/**
* Created by krikar on 10/10/14.
*/
diff --git a/graphwalker-studio/src/main/js/Application.js b/graphwalker-studio/src/main/js/Application.js
index ec16fdaee..77737238a 100644
--- a/graphwalker-studio/src/main/js/Application.js
+++ b/graphwalker-studio/src/main/js/Application.js
@@ -1,11 +1,10 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
import Container from "./components/container";
import StatusBar from "./components/statusbar";
import SideMenu from "./components/sidemenu";
import Editor from "./components/editor";
import ConfigPanel from "./components/configpanel";
-import { Divider } from "@blueprintjs/core";
import Banner from "./graphwalker.inline.svg";
import PanelGroup from "react-panelgroup";
import './style.css';
diff --git a/graphwalker-studio/src/main/js/components/configpanel/element-group.js b/graphwalker-studio/src/main/js/components/configpanel/element-group.js
index 4f06f0490..64da9fe23 100644
--- a/graphwalker-studio/src/main/js/components/configpanel/element-group.js
+++ b/graphwalker-studio/src/main/js/components/configpanel/element-group.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { FormGroup, InputGroup, Switch, TextArea } from "@blueprintjs/core";
-import { updateElement, setStartElement } from "../../redux/actions";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {FormGroup, InputGroup, Switch, TextArea} from "@blueprintjs/core";
+import {setStartElement, updateElement} from "../../redux/actions";
import Group from "./group";
class ElementGroup extends Component {
diff --git a/graphwalker-studio/src/main/js/components/configpanel/execution-group.js b/graphwalker-studio/src/main/js/components/configpanel/execution-group.js
index d58033805..8deb833a1 100644
--- a/graphwalker-studio/src/main/js/components/configpanel/execution-group.js
+++ b/graphwalker-studio/src/main/js/components/configpanel/execution-group.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
import {FormGroup, InputGroup, Slider} from "@blueprintjs/core";
-import { setExecutionDelay, updateModel } from "../../redux/actions";
+import {setExecutionDelay, updateModel} from "../../redux/actions";
import Group from "./group";
class ExecutionGroup extends Component {
diff --git a/graphwalker-studio/src/main/js/components/configpanel/group/index.js b/graphwalker-studio/src/main/js/components/configpanel/group/index.js
index 8a00859e1..860f0be18 100644
--- a/graphwalker-studio/src/main/js/components/configpanel/group/index.js
+++ b/graphwalker-studio/src/main/js/components/configpanel/group/index.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import styled from 'styled-components';
import {Collapse, Icon} from "@blueprintjs/core";
diff --git a/graphwalker-studio/src/main/js/components/configpanel/index.js b/graphwalker-studio/src/main/js/components/configpanel/index.js
index b90120370..4031ff7b3 100644
--- a/graphwalker-studio/src/main/js/components/configpanel/index.js
+++ b/graphwalker-studio/src/main/js/components/configpanel/index.js
@@ -1,6 +1,5 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import styled from 'styled-components';
-import {Divider, Icon} from "@blueprintjs/core";
import ModelGroup from "./model-group";
import ElementGroup from "./element-group";
import "./style.css"
diff --git a/graphwalker-studio/src/main/js/components/configpanel/model-group.js b/graphwalker-studio/src/main/js/components/configpanel/model-group.js
index a3a09c22a..0b57c4d28 100644
--- a/graphwalker-studio/src/main/js/components/configpanel/model-group.js
+++ b/graphwalker-studio/src/main/js/components/configpanel/model-group.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { FormGroup, InputGroup, TextArea } from "@blueprintjs/core";
-import { updateModel } from "../../redux/actions";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {FormGroup, InputGroup, TextArea} from "@blueprintjs/core";
+import {updateModel} from "../../redux/actions";
import Group from "./group";
class ModelGroup extends Component {
diff --git a/graphwalker-studio/src/main/js/components/container/index.js b/graphwalker-studio/src/main/js/components/container/index.js
index 702e7a9da..665aec99e 100644
--- a/graphwalker-studio/src/main/js/components/container/index.js
+++ b/graphwalker-studio/src/main/js/components/container/index.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import './style.css';
export default class Container extends Component {
diff --git a/graphwalker-studio/src/main/js/components/editor/editor-panel/editor-component.js b/graphwalker-studio/src/main/js/components/editor/editor-panel/editor-component.js
index b4c2d10c7..a99fe143b 100644
--- a/graphwalker-studio/src/main/js/components/editor/editor-panel/editor-component.js
+++ b/graphwalker-studio/src/main/js/components/editor/editor-panel/editor-component.js
@@ -1,18 +1,18 @@
-import React, { Component } from 'react';
-import { findDOMNode } from "react-dom";
-import { connect } from "react-redux";
+import React, {Component} from 'react';
+import {findDOMNode} from "react-dom";
+import {connect} from "react-redux";
import {
createElement,
deleteElement,
+ saveEditorState,
selectElement,
setStartElement,
- updateElementPosition,
- saveEditorState,
- toggleBreakpoint
+ toggleBreakpoint,
+ updateElementPosition
} from "../../../redux/actions";
-import {Classes, ContextMenu, Divider, Menu, MenuDivider, MenuItem, ResizeSensor} from "@blueprintjs/core";
-import { debounce } from "debounce";
-import { v4 as uuid } from 'uuid';
+import {ContextMenu, Divider, Menu, MenuItem, ResizeSensor} from "@blueprintjs/core";
+import {debounce} from "debounce";
+import {v4 as uuid} from 'uuid';
import Cytoscape from "cytoscape";
import coseBilkent from 'cytoscape-cose-bilkent';
import stylesheet from "./editor-stylesheet";
diff --git a/graphwalker-studio/src/main/js/components/editor/editor-panel/index.js b/graphwalker-studio/src/main/js/components/editor/editor-panel/index.js
index 49c3207f1..7aed5ae99 100644
--- a/graphwalker-studio/src/main/js/components/editor/editor-panel/index.js
+++ b/graphwalker-studio/src/main/js/components/editor/editor-panel/index.js
@@ -1,6 +1,5 @@
-import React, { Component, createRef } from 'react';
+import React, {Component} from 'react';
import styled from 'styled-components';
-import { ResizeSensor } from "@blueprintjs/core";
import EditorComponent from "./editor-component";
const EditorPanelContainer = styled.div`
diff --git a/graphwalker-studio/src/main/js/components/editor/editor-tabs/index.js b/graphwalker-studio/src/main/js/components/editor/editor-tabs/index.js
index 18b50c40c..ebe94cfd8 100644
--- a/graphwalker-studio/src/main/js/components/editor/editor-tabs/index.js
+++ b/graphwalker-studio/src/main/js/components/editor/editor-tabs/index.js
@@ -1,8 +1,8 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
import styled from 'styled-components';
-import { Button, Icon, Menu, MenuDivider, MenuItem, Popover, Position } from "@blueprintjs/core";
-import { addModel, selectModel, closeModel, closeAllModels } from "../../../redux/actions";
+import {Button, Icon, Menu, MenuItem, Popover, Position} from "@blueprintjs/core";
+import {addModel, closeAllModels, closeModel, selectModel} from "../../../redux/actions";
import "./style.css";
const TabsContainer = styled.div`
diff --git a/graphwalker-studio/src/main/js/components/editor/index.js b/graphwalker-studio/src/main/js/components/editor/index.js
index 4d3e565d4..9940384ec 100644
--- a/graphwalker-studio/src/main/js/components/editor/index.js
+++ b/graphwalker-studio/src/main/js/components/editor/index.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import styled from 'styled-components';
import EditorTabs from './editor-tabs';
import EditorPanel from "./editor-panel";
diff --git a/graphwalker-studio/src/main/js/components/sidemenu/editor-menu.js b/graphwalker-studio/src/main/js/components/sidemenu/editor-menu.js
index abc3c574f..8d533c128 100644
--- a/graphwalker-studio/src/main/js/components/sidemenu/editor-menu.js
+++ b/graphwalker-studio/src/main/js/components/sidemenu/editor-menu.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { Button, ButtonGroup } from "@blueprintjs/core";
-import { toggleProperties} from "../../redux/actions";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {Button, ButtonGroup} from "@blueprintjs/core";
+import {toggleProperties} from "../../redux/actions";
class EditorMenu extends Component {
diff --git a/graphwalker-studio/src/main/js/components/sidemenu/execution-menu.js b/graphwalker-studio/src/main/js/components/sidemenu/execution-menu.js
index 5266048de..33353468e 100644
--- a/graphwalker-studio/src/main/js/components/sidemenu/execution-menu.js
+++ b/graphwalker-studio/src/main/js/components/sidemenu/execution-menu.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { Button, ButtonGroup } from "@blueprintjs/core";
-import { runTest, pauseTest, stepTest, stopTest } from "../../redux/actions";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {Button, ButtonGroup} from "@blueprintjs/core";
+import {pauseTest, runTest, stepTest, stopTest} from "../../redux/actions";
class ExecutionMenu extends Component {
render() {
diff --git a/graphwalker-studio/src/main/js/components/sidemenu/file-menu.js b/graphwalker-studio/src/main/js/components/sidemenu/file-menu.js
index ff252f817..c9785eabc 100644
--- a/graphwalker-studio/src/main/js/components/sidemenu/file-menu.js
+++ b/graphwalker-studio/src/main/js/components/sidemenu/file-menu.js
@@ -1,6 +1,6 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { Button, ButtonGroup } from "@blueprintjs/core";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {Button, ButtonGroup} from "@blueprintjs/core";
import {addModel, loadTest, newTest} from "../../redux/actions";
class FileMenu extends Component {
diff --git a/graphwalker-studio/src/main/js/components/sidemenu/index.js b/graphwalker-studio/src/main/js/components/sidemenu/index.js
index 6b43f68d8..ce11cb648 100644
--- a/graphwalker-studio/src/main/js/components/sidemenu/index.js
+++ b/graphwalker-studio/src/main/js/components/sidemenu/index.js
@@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import { Divider } from "@blueprintjs/core";
+import React, {Component} from 'react';
+import {Divider} from "@blueprintjs/core";
import FileMenu from "./file-menu";
import ExecutionMenu from "./execution-menu";
import EditorMenu from "./editor-menu";
diff --git a/graphwalker-studio/src/main/js/components/statusbar/index.js b/graphwalker-studio/src/main/js/components/statusbar/index.js
index 1d6924e7c..1a051a14e 100644
--- a/graphwalker-studio/src/main/js/components/statusbar/index.js
+++ b/graphwalker-studio/src/main/js/components/statusbar/index.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
-import { connect } from "react-redux";
-import { ProgressBar, Intent, Toast, Toaster, Position } from "@blueprintjs/core";
-import { stopTest } from "../../redux/actions";
+import React, {Component} from 'react';
+import {connect} from "react-redux";
+import {Intent, Position, ProgressBar, Toast, Toaster} from "@blueprintjs/core";
+import {stopTest} from "../../redux/actions";
import './style.css';
class StatusBar extends Component {
diff --git a/graphwalker-studio/src/main/js/index.js b/graphwalker-studio/src/main/js/index.js
index f14b4d47b..20264d812 100644
--- a/graphwalker-studio/src/main/js/index.js
+++ b/graphwalker-studio/src/main/js/index.js
@@ -1,8 +1,8 @@
import "core-js/stable";
import "regenerator-runtime/runtime";
import React from 'react';
-import { render } from "react-dom";
-import { Provider } from 'react-redux'
+import {render} from "react-dom";
+import {Provider} from 'react-redux'
import store from './redux/store'
import Application from './Application';
diff --git a/graphwalker-studio/src/main/js/redux/actions.js b/graphwalker-studio/src/main/js/redux/actions.js
index c51036083..0568e0445 100644
--- a/graphwalker-studio/src/main/js/redux/actions.js
+++ b/graphwalker-studio/src/main/js/redux/actions.js
@@ -1,12 +1,6 @@
import {
- TEST_LOAD,
- TEST_NEW,
+ EDITOR_PROPERTIES_TOGGLE,
EDITOR_SAVE_STATE,
- MODEL_ADD,
- MODEL_CLOSE,
- MODEL_CLOSE_ALL,
- MODEL_SELECT,
- MODEL_UPDATE,
ELEMENT_CREATE,
ELEMENT_DELETE,
ELEMENT_SELECT,
@@ -22,9 +16,16 @@ import {
EXECUTION_PAUSE,
EXECUTION_RUN,
EXECUTION_STEP,
- EXECUTION_STOP, EDITOR_PROPERTIES_TOGGLE
+ EXECUTION_STOP,
+ MODEL_ADD,
+ MODEL_CLOSE,
+ MODEL_CLOSE_ALL,
+ MODEL_SELECT,
+ MODEL_UPDATE,
+ TEST_LOAD,
+ TEST_NEW
} from "./actionTypes";
-import { v4 as uuid } from 'uuid';
+import {v4 as uuid} from 'uuid';
export const loadTest = content => {
return async (dispatch, getState, client) => {
diff --git a/graphwalker-studio/src/main/js/redux/reducers/index.js b/graphwalker-studio/src/main/js/redux/reducers/index.js
index 646eb1026..07ffa2256 100644
--- a/graphwalker-studio/src/main/js/redux/reducers/index.js
+++ b/graphwalker-studio/src/main/js/redux/reducers/index.js
@@ -1,4 +1,4 @@
-import { combineReducers } from "redux";
+import {combineReducers} from "redux";
import execution from "./execution";
import test from "./test"
import editor from "./editor";
diff --git a/graphwalker-studio/src/main/js/redux/reducers/test.js b/graphwalker-studio/src/main/js/redux/reducers/test.js
index 0063c8855..236440841 100644
--- a/graphwalker-studio/src/main/js/redux/reducers/test.js
+++ b/graphwalker-studio/src/main/js/redux/reducers/test.js
@@ -1,20 +1,21 @@
import produce from "immer";
import {
- TEST_LOAD,
- TEST_NEW,
- MODEL_ADD,
- MODEL_CLOSE,
- MODEL_CLOSE_ALL,
- MODEL_SELECT,
- MODEL_UPDATE,
+ EDITOR_SAVE_STATE,
ELEMENT_CREATE,
ELEMENT_DELETE,
ELEMENT_SELECT,
ELEMENT_START,
ELEMENT_UPDATE,
- ELEMENT_UPDATE_POSITION, EDITOR_SAVE_STATE
+ ELEMENT_UPDATE_POSITION,
+ MODEL_ADD,
+ MODEL_CLOSE,
+ MODEL_CLOSE_ALL,
+ MODEL_SELECT,
+ MODEL_UPDATE,
+ TEST_LOAD,
+ TEST_NEW
} from "../actionTypes";
-import { v4 as uuid } from 'uuid';
+import {v4 as uuid} from 'uuid';
const initialState = {
models: [],
diff --git a/graphwalker-studio/src/main/js/redux/store.js b/graphwalker-studio/src/main/js/redux/store.js
index 891c0506a..49b3868b8 100644
--- a/graphwalker-studio/src/main/js/redux/store.js
+++ b/graphwalker-studio/src/main/js/redux/store.js
@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware, compose } from "redux";
+import {applyMiddleware, compose, createStore} from "redux";
import thunk from 'redux-thunk';
import rootReducer from "./reducers";
import WebSocketClient from "../client";
diff --git a/graphwalker-studio/src/main/resources/static/lib/jquery-mobile-1.4.5/images/icons-svg/action-black.svg b/graphwalker-studio/src/main/resources/static/lib/jquery-mobile-1.4.5/images/icons-svg/action-black.svg
index ae0670ab0..a7cdb33d8 100644
--- a/graphwalker-studio/src/main/resources/static/lib/jquery-mobile-1.4.5/images/icons-svg/action-black.svg
+++ b/graphwalker-studio/src/main/resources/static/lib/jquery-mobile-1.4.5/images/icons-svg/action-black.svg
@@ -1,7 +1,7 @@
-