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 c0501cf6975a4137be8a3fafacf8673f13975693 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Fri Jun 13 11:20:25 2025 -0400 Sort imports --- src/main/java/org/apache/commons/scxml2/EvaluatorFactory.java | 3 ++- .../java/org/apache/commons/scxml2/env/groovy/GroovyContext.java | 4 ++-- .../org/apache/commons/scxml2/env/groovy/GroovyContextBinding.java | 6 +++--- src/main/java/org/apache/commons/scxml2/model/CustomAction.java | 3 +-- .../org/apache/commons/scxml2/env/groovy/GroovyClosureTest.java | 1 - src/test/java/org/apache/commons/scxml2/io/ContentParserTest.java | 6 +++--- src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/apache/commons/scxml2/EvaluatorFactory.java b/src/main/java/org/apache/commons/scxml2/EvaluatorFactory.java index d482f55d..6adba816 100644 --- a/src/main/java/org/apache/commons/scxml2/EvaluatorFactory.java +++ b/src/main/java/org/apache/commons/scxml2/EvaluatorFactory.java @@ -16,6 +16,8 @@ */ package org.apache.commons.scxml2; +import static org.apache.commons.scxml2.Evaluator.DEFAULT_DATA_MODEL; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -25,7 +27,6 @@ import org.apache.commons.scxml2.env.jexl.JexlEvaluator; import org.apache.commons.scxml2.env.minimal.MinimalEvaluator; import org.apache.commons.scxml2.model.ModelException; import org.apache.commons.scxml2.model.SCXML; -import static org.apache.commons.scxml2.Evaluator.DEFAULT_DATA_MODEL; /** * A static singleton factory for {@link EvaluatorProvider}s by supported SCXML datamodel type. diff --git a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContext.java b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContext.java index e6b17b81..9f832ea9 100644 --- a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContext.java +++ b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContext.java @@ -16,8 +16,6 @@ */ package org.apache.commons.scxml2.env.groovy; -import groovy.lang.Closure; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -30,6 +28,8 @@ import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.SCInstanceObjectInputStream; import org.apache.commons.scxml2.env.SimpleContext; +import groovy.lang.Closure; + /** * Groovy Context implementation for Commons SCXML. */ diff --git a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContextBinding.java b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContextBinding.java index adaee9b0..7f102fe0 100644 --- a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContextBinding.java +++ b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyContextBinding.java @@ -16,13 +16,13 @@ */ package org.apache.commons.scxml2.env.groovy; -import groovy.lang.Binding; -import groovy.lang.MissingPropertyException; - import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; +import groovy.lang.Binding; +import groovy.lang.MissingPropertyException; + /** * Delegating Groovy Binding class which delegates all variables access to its GroovyContext */ diff --git a/src/main/java/org/apache/commons/scxml2/model/CustomAction.java b/src/main/java/org/apache/commons/scxml2/model/CustomAction.java index 31691104..a8cae31f 100644 --- a/src/main/java/org/apache/commons/scxml2/model/CustomAction.java +++ b/src/main/java/org/apache/commons/scxml2/model/CustomAction.java @@ -16,9 +16,8 @@ */ package org.apache.commons.scxml2.model; -import org.apache.commons.logging.LogFactory; - import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * A custom action is simply a tuple consisting of a namespace URI, diff --git a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyClosureTest.java b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyClosureTest.java index 180dbefe..2f034e04 100644 --- a/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyClosureTest.java +++ b/src/test/java/org/apache/commons/scxml2/env/groovy/GroovyClosureTest.java @@ -22,7 +22,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/io/ContentParserTest.java b/src/test/java/org/apache/commons/scxml2/io/ContentParserTest.java index eeada7d2..91bd27c0 100644 --- a/src/test/java/org/apache/commons/scxml2/io/ContentParserTest.java +++ b/src/test/java/org/apache/commons/scxml2/io/ContentParserTest.java @@ -19,12 +19,12 @@ package org.apache.commons.scxml2.io; import java.util.ArrayList; import java.util.LinkedHashMap; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.ObjectMapper; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; + class ContentParserTest { @Test diff --git a/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java b/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java index 5fa76a0e..5c140844 100644 --- a/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java +++ b/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java @@ -18,10 +18,10 @@ package org.apache.commons.scxml2.model; 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; /**