You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/03/25 21:35:29 UTC
[commons-configuration] 12/12: Organize imports
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-configuration.git
commit d5ffa439063c43c095058f37095b719304a03bf1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:35:11 2023 -0400
Organize imports
---
.../commons/configuration2/DatabaseConfiguration.java | 3 ++-
.../commons/configuration2/JNDIConfiguration.java | 13 +++++++------
.../commons/configuration2/JSONConfiguration.java | 13 +++++++------
.../commons/configuration2/XMLConfiguration.java | 19 ++++++++++---------
.../commons/configuration2/XMLDocumentHelper.java | 7 ++++---
.../builder/BasicBuilderParameters.java | 2 +-
.../builder/BasicBuilderProperties.java | 2 +-
.../builder/XMLBuilderParametersImpl.java | 4 ++--
.../web/ServletRequestConfiguration.java | 3 ++-
.../org/apache/commons/configuration2/Logging.java | 6 +++---
.../commons/configuration2/TestJSONConfiguration.java | 3 ++-
.../builder/TestXMLBuilderParametersImpl.java | 1 +
12 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 1df35c7d..e2a34d67 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.commons.configuration2;
-import javax.sql.DataSource;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -29,6 +28,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import javax.sql.DataSource;
+
import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
diff --git a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
index c193bc36..a5a1740c 100644
--- a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
@@ -17,6 +17,13 @@
package org.apache.commons.configuration2;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameClassPair;
@@ -24,12 +31,6 @@ import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.NotContextException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
import org.apache.commons.configuration2.io.ConfigurationLogger;
diff --git a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
index c1882195..d1806055 100644
--- a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
@@ -17,18 +17,19 @@
package org.apache.commons.configuration2;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.MapType;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.configuration2.io.InputStreamSupport;
-import org.apache.commons.configuration2.tree.ImmutableNode;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.InputStreamSupport;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.MapType;
+
/**
* <p>
* A specialized hierarchical configuration class that is able to parse JSON documents.
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 87c69300..8b0c93bb 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -17,15 +17,6 @@
package org.apache.commons.configuration2;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -40,6 +31,16 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.io.ConfigurationLogger;
diff --git a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
index 74ccce01..69ef0be2 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.configuration2;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -27,9 +31,6 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.w3c.dom.Document;
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
index 4d9cfac9..46d3e40e 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.sync.Synchronizer;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
index abce17e7..8de3d731 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
@@ -20,12 +20,12 @@ import java.util.Collection;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.sync.Synchronizer;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
index 85f8cecc..1eea1285 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.configuration2.builder;
-import javax.xml.parsers.DocumentBuilder;
-
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+
import org.xml.sax.EntityResolver;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
index 3e447c78..3c85eaa1 100644
--- a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
@@ -17,13 +17,14 @@
package org.apache.commons.configuration2.web;
-import javax.servlet.ServletRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.servlet.ServletRequest;
+
/**
* A configuration wrapper to read the parameters of a servlet request. This configuration is read only, adding or
* removing a property will throw an UnsupportedOperationException.
diff --git a/src/test/java/org/apache/commons/configuration2/Logging.java b/src/test/java/org/apache/commons/configuration2/Logging.java
index 7a864af6..7dd600bd 100644
--- a/src/test/java/org/apache/commons/configuration2/Logging.java
+++ b/src/test/java/org/apache/commons/configuration2/Logging.java
@@ -17,11 +17,11 @@
package org.apache.commons.configuration2;
import org.apache.commons.logging.impl.Log4JLogger;
-import org.apache.log4j.Priority;
-import org.apache.log4j.Level;
import org.apache.log4j.Appender;
-import org.apache.log4j.PatternLayout;
import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Priority;
/**
* Configures logging for tests.
diff --git a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
index c303b349..7fd70b12 100644
--- a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
@@ -18,8 +18,8 @@
package org.apache.commons.configuration2;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.FileReader;
import java.io.IOException;
@@ -32,6 +32,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.MapType;
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
index 5d821fa2..5e3f7590 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
import java.util.Map;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.commons.configuration2.beanutils.BeanHelper;