This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
commit 968b1394378838b37f90e9fc0725f55c3d7ed466 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Fri Jun 13 11:22:37 2025 -0400 Sort imports --- .../scxml2/env/groovy/GroovyExtendableScriptCache.java | 10 +++++----- .../apache/commons/scxml2/env/groovy/GroovySCXMLScript.java | 8 ++++---- .../org/apache/commons/scxml2/env/jexl/JexlEvaluator.java | 2 +- src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java | 12 ++++++------ src/main/java/org/apache/commons/scxml2/model/If.java | 2 +- src/main/java/org/apache/commons/scxml2/model/Invoke.java | 2 +- src/main/java/org/apache/commons/scxml2/model/Raise.java | 2 +- src/main/java/org/apache/commons/scxml2/model/Var.java | 2 +- .../apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java | 2 +- .../java/org/apache/commons/scxml2/test/StandaloneUtils.java | 2 +- .../apache/commons/scxml2/env/javascript/JSExampleTest.java | 5 ++--- .../commons/scxml2/env/javascript/JavaScriptEngineTest.java | 4 ++-- .../org/apache/commons/scxml2/env/jexl/StaticMethodTest.java | 1 - .../apache/commons/scxml2/invoke/InvokeParamNameTest.java | 2 +- .../java/org/apache/commons/scxml2/io/SCXMLReaderTest.java | 6 +++--- .../commons/scxml2/io/SCXMLRequiredAttributesTest.java | 8 ++++---- .../java/org/apache/commons/scxml2/io/SCXMLWriterTest.java | 4 ++-- .../java/org/apache/commons/scxml2/issues/Issue62Test.java | 1 - src/test/java/org/apache/commons/scxml2/model/Hello.java | 2 +- src/test/java/org/apache/commons/scxml2/model/SendTest.java | 2 +- .../org/apache/commons/scxml2/model/StatelessModelTest.java | 2 +- 21 files changed, 39 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java index c452a767..99d93e1b 100644 --- a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java +++ b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java @@ -16,11 +16,6 @@ */ package org.apache.commons.scxml2.env.groovy; -import groovy.lang.GroovyClassLoader; -import groovy.lang.GroovyCodeSource; -import groovy.lang.GroovyRuntimeException; -import groovy.lang.Script; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; @@ -30,6 +25,11 @@ import java.util.LinkedHashMap; import org.codehaus.groovy.control.CompilerConfiguration; +import groovy.lang.GroovyClassLoader; +import groovy.lang.GroovyCodeSource; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.Script; + /** * GroovyExtendableScriptCache is a general purpose and <em>{@link Serializable}</em> Groovy Script cache. * <p> diff --git a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovySCXMLScript.java b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovySCXMLScript.java index 988f0f42..29cca3aa 100644 --- a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovySCXMLScript.java +++ b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovySCXMLScript.java @@ -16,16 +16,16 @@ */ package org.apache.commons.scxml2.env.groovy; -import groovy.lang.Binding; -import groovy.lang.MissingPropertyException; -import groovy.lang.Script; - import java.lang.reflect.Array; import java.util.Collection; import java.util.Map; import org.apache.commons.scxml2.Builtin; +import groovy.lang.Binding; +import groovy.lang.MissingPropertyException; +import groovy.lang.Script; + /** * Groovy {@link Script} base class for SCXML, providing the standard 'builtin' function {@link #In(String)}, * as well as JEXL like convenience functions {@link #empty(Object)} and {@link #var(String)}. diff --git a/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java index fffc7101..127ec3c3 100644 --- a/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java +++ b/src/main/java/org/apache/commons/scxml2/env/jexl/JexlEvaluator.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.jexl3.JexlBuilder; -import org.apache.commons.jexl3.JexlExpression; import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.JexlExpression; import org.apache.commons.jexl3.JexlScript; import org.apache.commons.jexl3.introspection.JexlPermissions; import org.apache.commons.scxml2.Context; diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java index 7e17f743..64ad4969 100644 --- a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java +++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java @@ -54,12 +54,6 @@ import org.apache.commons.scxml2.model.Datamodel; import org.apache.commons.scxml2.model.Else; import org.apache.commons.scxml2.model.ElseIf; import org.apache.commons.scxml2.model.EnterableState; -import org.apache.commons.scxml2.model.JsonValue; -import org.apache.commons.scxml2.model.NodeListValue; -import org.apache.commons.scxml2.model.NodeValue; -import org.apache.commons.scxml2.model.ParsedValue; -import org.apache.commons.scxml2.model.Raise; -import org.apache.commons.scxml2.model.ParsedValueContainer; import org.apache.commons.scxml2.model.Final; import org.apache.commons.scxml2.model.Finalize; import org.apache.commons.scxml2.model.Foreach; @@ -67,11 +61,17 @@ import org.apache.commons.scxml2.model.History; import org.apache.commons.scxml2.model.If; import org.apache.commons.scxml2.model.Initial; import org.apache.commons.scxml2.model.Invoke; +import org.apache.commons.scxml2.model.JsonValue; import org.apache.commons.scxml2.model.Log; +import org.apache.commons.scxml2.model.NodeListValue; +import org.apache.commons.scxml2.model.NodeValue; import org.apache.commons.scxml2.model.OnEntry; import org.apache.commons.scxml2.model.OnExit; import org.apache.commons.scxml2.model.Parallel; import org.apache.commons.scxml2.model.Param; +import org.apache.commons.scxml2.model.ParsedValue; +import org.apache.commons.scxml2.model.ParsedValueContainer; +import org.apache.commons.scxml2.model.Raise; import org.apache.commons.scxml2.model.SCXML; import org.apache.commons.scxml2.model.Script; import org.apache.commons.scxml2.model.Send; diff --git a/src/main/java/org/apache/commons/scxml2/model/If.java b/src/main/java/org/apache/commons/scxml2/model/If.java index 0258684e..21076e47 100644 --- a/src/main/java/org/apache/commons/scxml2/model/If.java +++ b/src/main/java/org/apache/commons/scxml2/model/If.java @@ -22,9 +22,9 @@ import java.util.List; import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.semantics.ErrorConstants; /** diff --git a/src/main/java/org/apache/commons/scxml2/model/Invoke.java b/src/main/java/org/apache/commons/scxml2/model/Invoke.java index 35883c44..7adef7d5 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Invoke.java +++ b/src/main/java/org/apache/commons/scxml2/model/Invoke.java @@ -25,13 +25,13 @@ import java.util.Map; import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.PathResolver; import org.apache.commons.scxml2.SCXMLConstants; import org.apache.commons.scxml2.SCXMLExecutionContext; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.SCXMLSystemContext; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.invoke.Invoker; import org.apache.commons.scxml2.invoke.InvokerException; import org.apache.commons.scxml2.io.ContentParser; diff --git a/src/main/java/org/apache/commons/scxml2/model/Raise.java b/src/main/java/org/apache/commons/scxml2/model/Raise.java index 3b8c69cb..d077112b 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Raise.java +++ b/src/main/java/org/apache/commons/scxml2/model/Raise.java @@ -17,9 +17,9 @@ package org.apache.commons.scxml2.model; import org.apache.commons.scxml2.ActionExecutionContext; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; /** * The class in this SCXML object model that corresponds to the diff --git a/src/main/java/org/apache/commons/scxml2/model/Var.java b/src/main/java/org/apache/commons/scxml2/model/Var.java index 0e4d0a4a..ba0a75a6 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Var.java +++ b/src/main/java/org/apache/commons/scxml2/model/Var.java @@ -19,10 +19,10 @@ package org.apache.commons.scxml2.model; import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLConstants; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.io.SCXMLWriter; /** diff --git a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java index e8ac439e..65f4b288 100644 --- a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java +++ b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.ErrorReporter; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.ParentSCXMLIOProcessor; import org.apache.commons.scxml2.SCInstance; import org.apache.commons.scxml2.SCXMLExecutionContext; @@ -35,7 +36,6 @@ import org.apache.commons.scxml2.SCXMLSemantics; import org.apache.commons.scxml2.SCXMLSystemContext; import org.apache.commons.scxml2.StateConfiguration; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.invoke.InvokerException; import org.apache.commons.scxml2.model.Action; import org.apache.commons.scxml2.model.ActionExecutionError; diff --git a/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java b/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java index b4c24c71..0b58bf9a 100644 --- a/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java +++ b/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java @@ -27,9 +27,9 @@ import javax.xml.stream.XMLStreamException; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.env.Tracer; import org.apache.commons.scxml2.invoke.SimpleSCXMLInvoker; import org.apache.commons.scxml2.io.SCXMLReader; diff --git a/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java b/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java index 18b032ad..f5f61a0d 100644 --- a/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java +++ b/src/test/java/org/apache/commons/scxml2/env/javascript/JSExampleTest.java @@ -21,16 +21,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.apache.commons.scxml2.ActionExecutionContext; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.model.Action; -import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.model.CustomAction; import org.apache.commons.scxml2.model.EnterableState; import org.apache.commons.scxml2.model.SCXML; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/scxml2/env/javascript/JavaScriptEngineTest.java b/src/test/java/org/apache/commons/scxml2/env/javascript/JavaScriptEngineTest.java index 26241742..b425f61c 100644 --- a/src/test/java/org/apache/commons/scxml2/env/javascript/JavaScriptEngineTest.java +++ b/src/test/java/org/apache/commons/scxml2/env/javascript/JavaScriptEngineTest.java @@ -16,12 +16,12 @@ */ package org.apache.commons.scxml2.env.javascript; -import java.util.UUID; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.UUID; + import org.apache.commons.scxml2.SCXMLSystemContext; import org.apache.commons.scxml2.StateConfiguration; import org.apache.commons.scxml2.Status; diff --git a/src/test/java/org/apache/commons/scxml2/env/jexl/StaticMethodTest.java b/src/test/java/org/apache/commons/scxml2/env/jexl/StaticMethodTest.java index d01d2958..59d2595d 100644 --- a/src/test/java/org/apache/commons/scxml2/env/jexl/StaticMethodTest.java +++ b/src/test/java/org/apache/commons/scxml2/env/jexl/StaticMethodTest.java @@ -21,7 +21,6 @@ import java.util.Set; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.model.EnterableState; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java b/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java index 038bdcea..f6005912 100644 --- a/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java +++ b/src/test/java/org/apache/commons/scxml2/invoke/InvokeParamNameTest.java @@ -18,11 +18,11 @@ package org.apache.commons.scxml2.invoke; import java.util.Map; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLIOProcessor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.model.ModelException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java b/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java index ecbc2f58..6d03177d 100644 --- a/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java +++ b/src/test/java/org/apache/commons/scxml2/io/SCXMLReaderTest.java @@ -38,18 +38,18 @@ import org.apache.commons.scxml2.model.CustomActionWrapper; import org.apache.commons.scxml2.model.Data; import org.apache.commons.scxml2.model.Datamodel; import org.apache.commons.scxml2.model.EnterableState; -import org.apache.commons.scxml2.model.ParsedValue; -import org.apache.commons.scxml2.model.ParsedValueContainer; import org.apache.commons.scxml2.model.Final; import org.apache.commons.scxml2.model.ModelException; +import org.apache.commons.scxml2.model.ParsedValue; +import org.apache.commons.scxml2.model.ParsedValueContainer; import org.apache.commons.scxml2.model.SCXML; import org.apache.commons.scxml2.model.Send; import org.apache.commons.scxml2.model.State; import org.apache.commons.scxml2.model.Transition; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/commons/scxml2/io/SCXMLRequiredAttributesTest.java b/src/test/java/org/apache/commons/scxml2/io/SCXMLRequiredAttributesTest.java index 1999cc3a..e8402fcc 100644 --- a/src/test/java/org/apache/commons/scxml2/io/SCXMLRequiredAttributesTest.java +++ b/src/test/java/org/apache/commons/scxml2/io/SCXMLRequiredAttributesTest.java @@ -16,6 +16,10 @@ */ package org.apache.commons.scxml2.io; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.StringReader; import org.apache.commons.scxml2.SCXMLExecutor; @@ -24,10 +28,6 @@ import org.apache.commons.scxml2.model.ModelException; import org.apache.commons.scxml2.model.SCXML; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Test enforcement of required SCXML element attributes, spec https://www.w3.org/TR/2015/REC-scxml-20150901 * <p> diff --git a/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java b/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java index 5cf06cbc..95285fa7 100644 --- a/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java +++ b/src/test/java/org/apache/commons/scxml2/io/SCXMLWriterTest.java @@ -19,6 +19,8 @@ package org.apache.commons.scxml2.io; import java.io.IOException; import java.util.LinkedHashMap; +import javax.xml.stream.XMLStreamException; + import org.apache.commons.scxml2.model.CommonsSCXML; import org.apache.commons.scxml2.model.Parallel; import org.apache.commons.scxml2.model.SCXML; @@ -27,8 +29,6 @@ import org.apache.commons.scxml2.model.State; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.xml.stream.XMLStreamException; - class SCXMLWriterTest { @Test diff --git a/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java b/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java index 85ec9f1a..72dc31d5 100644 --- a/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java +++ b/src/test/java/org/apache/commons/scxml2/issues/Issue62Test.java @@ -21,7 +21,6 @@ import java.util.Set; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.model.EnterableState; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/scxml2/model/Hello.java b/src/test/java/org/apache/commons/scxml2/model/Hello.java index db7883fc..b54e3ae4 100644 --- a/src/test/java/org/apache/commons/scxml2/model/Hello.java +++ b/src/test/java/org/apache/commons/scxml2/model/Hello.java @@ -17,8 +17,8 @@ package org.apache.commons.scxml2.model; import org.apache.commons.scxml2.ActionExecutionContext; -import org.apache.commons.scxml2.TriggerEvent; import org.apache.commons.scxml2.EventBuilder; +import org.apache.commons.scxml2.TriggerEvent; /** * Our custom "hello world" action. diff --git a/src/test/java/org/apache/commons/scxml2/model/SendTest.java b/src/test/java/org/apache/commons/scxml2/model/SendTest.java index 4293a481..74c46286 100644 --- a/src/test/java/org/apache/commons/scxml2/model/SendTest.java +++ b/src/test/java/org/apache/commons/scxml2/model/SendTest.java @@ -21,12 +21,12 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.SCXMLIOProcessor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.env.SimpleDispatcher; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java b/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java index 19af6104..c94e5ba9 100644 --- a/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java +++ b/src/test/java/org/apache/commons/scxml2/model/StatelessModelTest.java @@ -19,10 +19,10 @@ package org.apache.commons.scxml2.model; import java.util.Iterator; import java.util.Set; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExecutor; import org.apache.commons.scxml2.SCXMLTestHelper; import org.apache.commons.scxml2.TriggerEvent; -import org.apache.commons.scxml2.EventBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /**