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-jxpath.git
commit 439f2ef56e8c3a51dee34c8d2ab17ec3aa195be5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Oct 18 14:33:06 2022 -0400
Organize imports
---
.../java/org/apache/commons/jxpath/JXPathContextFactory.java | 1 +
.../java/org/apache/commons/jxpath/JXPathIntrospector.java | 2 +-
.../org/apache/commons/jxpath/ri/JXPathCompiledExpression.java | 2 +-
.../apache/commons/jxpath/ri/JXPathContextReferenceImpl.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/compiler/Expression.java | 10 +++++-----
.../apache/commons/jxpath/ri/compiler/VariableReference.java | 2 +-
.../java/org/apache/commons/jxpath/ri/parser/XPathParser.java | 3 ++-
.../org/apache/commons/jxpath/servlet/HttpSessionHandler.java | 1 +
.../apache/commons/jxpath/servlet/JXPathServletContexts.java | 1 +
.../apache/commons/jxpath/servlet/ServletContextHandler.java | 1 +
.../apache/commons/jxpath/servlet/ServletRequestHandler.java | 1 +
src/test/java/org/apache/commons/jxpath/JXPathTestCase.java | 4 ++--
.../java/org/apache/commons/jxpath/issues/JXPath118Test.java | 6 ++++--
.../org/apache/commons/jxpath/issues/JXPath172DynamicTest.java | 4 ++--
.../java/org/apache/commons/jxpath/issues/JXPath172Test.java | 4 ++--
.../java/org/apache/commons/jxpath/issues/JXPath177Test.java | 4 +++-
.../commons/jxpath/ri/JXPathContextReferenceImplTestCase.java | 4 ++--
src/test/java/org/apache/commons/jxpath/ri/StressTest.java | 4 ++--
.../commons/jxpath/ri/axes/SimplePathInterpreterTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/compiler/TestFunctions.java | 2 +-
.../jxpath/ri/model/beans/BadlyImplementedFactoryTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java | 1 -
.../org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java | 1 -
.../commons/jxpath/servlet/JXPathServletContextTest.java | 2 ++
.../org/apache/commons/jxpath/util/BasicTypeConverterTest.java | 4 ++--
.../java/org/apache/commons/jxpath/util/ValueUtilsTest.java | 1 +
26 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/apache/commons/jxpath/JXPathContextFactory.java
b/src/main/java/org/apache/commons/jxpath/JXPathContextFactory.java
index 5a0cfa3..42ba157 100644
--- a/src/main/java/org/apache/commons/jxpath/JXPathContextFactory.java
+++ b/src/main/java/org/apache/commons/jxpath/JXPathContextFactory.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
+
import org.apache.commons.jxpath.util.ClassLoaderUtil;
/**
diff --git a/src/main/java/org/apache/commons/jxpath/JXPathIntrospector.java
b/src/main/java/org/apache/commons/jxpath/JXPathIntrospector.java
index 61dc3db..9a7d1ab 100644
--- a/src/main/java/org/apache/commons/jxpath/JXPathIntrospector.java
+++ b/src/main/java/org/apache/commons/jxpath/JXPathIntrospector.java
@@ -18,8 +18,8 @@ package org.apache.commons.jxpath;
import java.util.Collections;
import java.util.Date;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.jxpath.util.ClassLoaderUtil;
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java
b/src/main/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java
index 7f89c12..fd9a88a 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/JXPathCompiledExpression.java
@@ -18,10 +18,10 @@ package org.apache.commons.jxpath.ri;
import java.util.Iterator;
-import org.apache.commons.jxpath.ri.compiler.Expression;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import org.apache.commons.jxpath.ri.compiler.Expression;
/**
* RI of CompiledExpression.
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
index 96b1281..2d73199 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
@@ -24,8 +24,8 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Vector;
import java.util.Map.Entry;
+import java.util.Vector;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.ExceptionHandler;
@@ -51,8 +51,8 @@ import
org.apache.commons.jxpath.ri.model.beans.BeanPointerFactory;
import org.apache.commons.jxpath.ri.model.beans.CollectionPointerFactory;
import org.apache.commons.jxpath.ri.model.container.ContainerPointerFactory;
import org.apache.commons.jxpath.ri.model.dynamic.DynamicPointerFactory;
-import org.apache.commons.jxpath.util.ReverseComparator;
import org.apache.commons.jxpath.util.ClassLoaderUtil;
+import org.apache.commons.jxpath.util.ReverseComparator;
import org.apache.commons.jxpath.util.TypeUtils;
/**
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/compiler/Expression.java
b/src/main/java/org/apache/commons/jxpath/ri/compiler/Expression.java
index 8fc79b3..3a913ec 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/compiler/Expression.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/Expression.java
@@ -16,17 +16,17 @@
*/
package org.apache.commons.jxpath.ri.compiler;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Locale;
+
import org.apache.commons.jxpath.NodeSet;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.EvalContext;
-import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.ri.QName;
+import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.util.ValueUtils;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Locale;
-
/**
* Common superclass for several types of nodes in the parse tree. Provides
* APIs for optimization of evaluation of expressions. Specifically, an
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java
b/src/main/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java
index 5074d9b..4a71a09 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/compiler/VariableReference.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.jxpath.ri.compiler;
-import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.EvalContext;
+import org.apache.commons.jxpath.ri.QName;
/**
* An element of the compile tree holding a variable reference.
diff --git a/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParser.java
b/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParser.java
index e060656..592a796 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParser.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParser.java
@@ -18,9 +18,10 @@
/* Generated By:JavaCC: Do not edit this line. XPathParser.java */
package org.apache.commons.jxpath.ri.parser;
- import org.apache.commons.jxpath.ri.Compiler;
import java.util.ArrayList;
+import org.apache.commons.jxpath.ri.Compiler;
+
public class XPathParser implements XPathParserConstants {
private Compiler compiler;
diff --git
a/src/main/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
b/src/main/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
index 3f89f64..2104d75 100644
--- a/src/main/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
+++ b/src/main/java/org/apache/commons/jxpath/servlet/HttpSessionHandler.java
@@ -18,6 +18,7 @@ package org.apache.commons.jxpath.servlet;
import java.util.Enumeration;
import java.util.HashSet;
+
import javax.servlet.http.HttpSession;
import org.apache.commons.jxpath.JXPathException;
diff --git
a/src/main/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
b/src/main/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
index e699d9e..9ef6162 100644
--- a/src/main/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
+++ b/src/main/java/org/apache/commons/jxpath/servlet/JXPathServletContexts.java
@@ -21,6 +21,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.PageContext;
+
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathContextFactory;
import org.apache.commons.jxpath.JXPathIntrospector;
diff --git
a/src/main/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
b/src/main/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
index 45f9816..54173b2 100644
--- a/src/main/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
+++ b/src/main/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
@@ -18,6 +18,7 @@ package org.apache.commons.jxpath.servlet;
import java.util.Enumeration;
import java.util.HashSet;
+
import javax.servlet.ServletContext;
import org.apache.commons.jxpath.DynamicPropertyHandler;
diff --git
a/src/main/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
b/src/main/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
index b67ee4f..297308d 100644
--- a/src/main/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
+++ b/src/main/java/org/apache/commons/jxpath/servlet/ServletRequestHandler.java
@@ -18,6 +18,7 @@ package org.apache.commons.jxpath.servlet;
import java.util.Enumeration;
import java.util.HashSet;
+
import javax.servlet.ServletRequest;
/**
diff --git a/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
b/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
index 5896964..21c2df2 100644
--- a/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
+++ b/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.ri.model.NodePointer;
+import junit.framework.TestCase;
+
/**
* Abstract superclass for various JXPath tests.
*/
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
index aab9d22..93c9c3f 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
@@ -17,11 +17,13 @@
package org.apache.commons.jxpath.issues;
import java.util.Iterator;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
/**
* Testcase proving JXPATH-118 issue with asPath() returning wrong names.
*/
diff --git
a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
index 9534bad..6899ab7 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
@@ -18,13 +18,13 @@ package org.apache.commons.jxpath.issues;
import java.util.HashMap;
-import junit.framework.TestSuite;
-
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathTestCase;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer;
+import junit.framework.TestSuite;
+
public class JXPath172DynamicTest extends JXPathTestCase
{
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
index 2d741dd..50ad4f4 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.jxpath.issues;
-import junit.framework.TestSuite;
-
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.JXPathTestCase;
@@ -25,6 +23,8 @@ import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.model.beans.BeanPropertyPointer;
import org.apache.commons.jxpath.ri.model.beans.NullPropertyPointer;
+import junit.framework.TestSuite;
+
public class JXPath172Test extends JXPathTestCase
{
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
b/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
index 3739302..f3dd727 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
@@ -18,11 +18,13 @@ package org.apache.commons.jxpath.issues;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.Variables;
+import junit.framework.TestCase;
+
public class JXPath177Test extends TestCase
{
Map model = new HashMap();
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
index 4280a52..369ccdf 100644
---
a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
+++
b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
@@ -17,10 +17,10 @@
package org.apache.commons.jxpath.ri;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.ri.model.container.ContainerPointerFactory;
+import junit.framework.TestCase;
+
public class JXPathContextReferenceImplTestCase extends TestCase {
/**
diff --git a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
index ee11910..6205080 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.jxpath.ri;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.JXPathContext;
+import junit.framework.TestCase;
+
/**
* Test thread safety.
*/
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
b/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
index 19ee728..4b0388c 100644
---
a/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
+++
b/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
@@ -18,8 +18,6 @@ package org.apache.commons.jxpath.ri.axes;
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.NestedTestBean;
import org.apache.commons.jxpath.Pointer;
@@ -37,6 +35,8 @@ import org.apache.commons.jxpath.ri.model.dom.DOMNodePointer;
import org.apache.commons.jxpath.ri.model.dynamic.DynamicPointer;
import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer;
+import junit.framework.TestCase;
+
public class SimplePathInterpreterTest extends TestCase {
private TestBeanWithNode bean;
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions.java
b/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions.java
index ee5d8ff..ac5eb8a 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/compiler/TestFunctions.java
@@ -24,8 +24,8 @@ import org.apache.commons.jxpath.BasicNodeSet;
import org.apache.commons.jxpath.ExpressionContext;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.NestedTestBean;
-import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.NodeSet;
+import org.apache.commons.jxpath.Pointer;
/**
*/
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
index 19b4352..221b1b9 100644
---
a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
+++
b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
@@ -19,14 +19,14 @@ package org.apache.commons.jxpath.ri.model.beans;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathAbstractFactoryException;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
import org.apache.commons.jxpath.Pointer;
+import junit.framework.TestCase;
+
/**
* Badly-implemented Factory test. From JIRA JXPATH-68.
*/
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
index 094ffd5..b6def8b 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
@@ -20,7 +20,6 @@ import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
import org.apache.commons.jxpath.xml.DocumentContainer;
-
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git
a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
index 4f241a7..d0816c9 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
@@ -22,7 +22,6 @@ import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
import org.apache.commons.jxpath.xml.DocumentContainer;
-
import org.jdom.Attribute;
import org.jdom.CDATA;
import org.jdom.Document;
diff --git
a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
index 8365921..0b81592 100644
---
a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
+++
b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.jxpath.servlet;
import java.util.Iterator;
+
import javax.servlet.ServletContext;
import org.apache.commons.jxpath.JXPathContext;
@@ -29,6 +30,7 @@ import com.mockrunner.mock.web.MockHttpSession;
import com.mockrunner.mock.web.MockPageContext;
import com.mockrunner.mock.web.MockServletConfig;
import com.mockrunner.mock.web.MockServletContext;
+
import junit.framework.TestCase;
/**
diff --git
a/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
b/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
index 77c7ef8..85b2e23 100644
--- a/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
+++ b/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
@@ -24,11 +24,11 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.commons.jxpath.NodeSet;
import org.apache.commons.jxpath.Pointer;
+import junit.framework.TestCase;
+
/**
* Tests BasicTypeConverter
*
diff --git a/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
b/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
index 7cdff6f..87342e7 100644
--- a/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
+++ b/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import junit.framework.TestCase;
public class ValueUtilsTest extends TestCase {
