organized the imports

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e387a5ae
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e387a5ae
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e387a5ae

Branch: refs/heads/master
Commit: e387a5ae62b500b467fcdae3cac0513af57fc920
Parents: 6234fb4
Author: Jörg Unbehauen <jo...@unbehauen.net>
Authored: Wed Aug 2 14:39:31 2017 +0200
Committer: Jörg Unbehauen <jo...@unbehauen.net>
Committed: Wed Aug 2 14:39:31 2017 +0200

----------------------------------------------------------------------
 .../org/apache/metamodel/AbstractDataContext.java    | 13 ++++++-------
 .../org/apache/metamodel/CompositeDataContext.java   | 15 +++++++++++----
 .../main/java/org/apache/metamodel/DataContext.java  |  1 -
 .../org/apache/metamodel/convert/Converters.java     | 13 ++++++++-----
 .../org/apache/metamodel/data/AbstractDataSet.java   |  8 +++-----
 .../apache/metamodel/data/CachingDataSetHeader.java  |  7 +++----
 .../org/apache/metamodel/data/DataSetTableModel.java |  1 -
 .../apache/metamodel/data/ScalarFunctionDataSet.java |  5 ++---
 .../apache/metamodel/data/SimpleDataSetHeader.java   |  7 +++----
 .../java/org/apache/metamodel/data/UnionDataSet.java |  6 +++---
 .../intercept/InterceptableDataContext.java          |  2 --
 .../org/apache/metamodel/schema/AbstractSchema.java  | 11 ++++++-----
 .../org/apache/metamodel/schema/AbstractTable.java   |  8 +++-----
 .../metamodel/schema/ImmutableRelationship.java      |  1 -
 .../apache/metamodel/AbstractDataContextTest.java    |  1 -
 .../intercept/InterceptableDataContextTest.java      |  7 +++----
 .../LegacyDeserializationObjectInputStreamTest.java  |  6 ++----
 17 files changed, 53 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java 
b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
index 4fd00a6..379b9ed 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
@@ -18,13 +18,6 @@
  */
 package org.apache.metamodel;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 import org.apache.metamodel.data.DataSet;
 import org.apache.metamodel.query.CompiledQuery;
 import org.apache.metamodel.query.DefaultCompiledQuery;
@@ -36,6 +29,12 @@ import org.apache.metamodel.schema.Column;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.Table;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * Abstract implementation of the DataContext interface. Provides convenient
  * implementations of all trivial and datastore-independent methods.

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java 
b/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
index 0ddc78c..f595b2e 100644
--- a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
@@ -18,10 +18,6 @@
  */
 package org.apache.metamodel;
 
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import org.apache.metamodel.data.DataSet;
 import org.apache.metamodel.query.FromItem;
 import org.apache.metamodel.query.Query;
@@ -31,6 +27,17 @@ import org.apache.metamodel.schema.Table;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Function;
+
 
 /**
  * DataContext for composite datacontexts. Composite DataContexts wrap several

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/DataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/DataContext.java 
b/core/src/main/java/org/apache/metamodel/DataContext.java
index ee56f1e..58bec4a 100644
--- a/core/src/main/java/org/apache/metamodel/DataContext.java
+++ b/core/src/main/java/org/apache/metamodel/DataContext.java
@@ -27,7 +27,6 @@ import org.apache.metamodel.schema.Column;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.Table;
 
-import java.util.Collection;
 import java.util.List;
 
 /**

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/convert/Converters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/Converters.java 
b/core/src/main/java/org/apache/metamodel/convert/Converters.java
index f0859bb..3c2ad00 100644
--- a/core/src/main/java/org/apache/metamodel/convert/Converters.java
+++ b/core/src/main/java/org/apache/metamodel/convert/Converters.java
@@ -18,12 +18,7 @@
  */
 package org.apache.metamodel.convert;
 
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
 import org.apache.metamodel.DataContext;
-import org.apache.metamodel.MetaModelHelper;
 import org.apache.metamodel.UpdateableDataContext;
 import org.apache.metamodel.data.DataSet;
 import org.apache.metamodel.data.Row;
@@ -38,6 +33,14 @@ import org.apache.metamodel.schema.Table;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * This class consists of static methods for decorating {@link DataContext}s
  * with {@link TypeConverter}s, which allows for automatic conversion of values

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java 
b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
index 17699b5..39e5303 100644
--- a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
@@ -18,17 +18,15 @@
  */
 package org.apache.metamodel.data;
 
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.util.BaseObject;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.metamodel.MetaModelHelper;
-import org.apache.metamodel.query.SelectItem;
-import org.apache.metamodel.schema.Column;
-import org.apache.metamodel.util.BaseObject;
-
 /**
  * Abstract DataSet implementation. Provides convenient implementations of
  * trivial method and reusable parts of non-trivial methods of a DataSet.

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java 
b/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java
index 76ce891..965dea3 100644
--- a/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java
+++ b/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java
@@ -18,14 +18,13 @@
  */
 package org.apache.metamodel.data;
 
-import java.util.Arrays;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.metamodel.query.SelectItem;
-import org.apache.metamodel.schema.Column;
-
 /**
  * Most common implementation of {@link DataSetHeader}. This implementation is
  * 'caching' in the sense that index values of selectitems are cached in a map

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/DataSetTableModel.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/data/DataSetTableModel.java 
b/core/src/main/java/org/apache/metamodel/data/DataSetTableModel.java
index c67ff05..939b980 100644
--- a/core/src/main/java/org/apache/metamodel/data/DataSetTableModel.java
+++ b/core/src/main/java/org/apache/metamodel/data/DataSetTableModel.java
@@ -19,7 +19,6 @@
 package org.apache.metamodel.data;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.table.AbstractTableModel;

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java 
b/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java
index 9d45946..d9e6e9c 100644
--- a/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java
@@ -18,13 +18,12 @@
  */
 package org.apache.metamodel.data;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.metamodel.query.ScalarFunction;
 import org.apache.metamodel.query.SelectItem;
 import org.apache.metamodel.util.CollectionUtils;
 
+import java.util.List;
+
 /**
  * A {@link DataSet} that enhances another {@link DataSet} with
  * {@link ScalarFunction}s.

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java 
b/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java
index 71703d5..e3bf59d 100644
--- a/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java
+++ b/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java
@@ -18,15 +18,14 @@
  */
 package org.apache.metamodel.data;
 
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.metamodel.MetaModelHelper;
-import org.apache.metamodel.query.SelectItem;
-import org.apache.metamodel.schema.Column;
-
 /**
  * Simple implementation of {@link DataSetHeader} which does no magic to 
improve
  * performance.

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java 
b/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java
index f13124c..f8ef9bf 100644
--- a/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java
@@ -18,6 +18,9 @@
  */
 package org.apache.metamodel.data;
 
+import org.apache.metamodel.query.InvokableQuery;
+import org.apache.metamodel.util.ImmutableRef;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Objects;
@@ -25,9 +28,6 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.metamodel.query.InvokableQuery;
-import org.apache.metamodel.util.ImmutableRef;
-
 /**
  * A {@link DataSet} that represents the union of two or more other data sets
  */

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
 
b/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
index 3076ca8..74af932 100644
--- 
a/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
+++ 
b/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
@@ -36,9 +36,7 @@ import org.apache.metamodel.schema.Column;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.Table;
 import org.apache.metamodel.update.RowUpdationBuilder;
-import org.apache.metamodel.util.HasNameMapper;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java 
b/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java
index df4a033..f8b8c1d 100644
--- a/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java
+++ b/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java
@@ -18,15 +18,16 @@
  */
 package org.apache.metamodel.schema;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.apache.metamodel.util.CollectionUtils;
 import org.apache.metamodel.util.EqualsBuilder;
-import org.apache.metamodel.util.HasNameMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Abstract implementation of the {@link Schema} interface. Implements most
  * common and trivial methods.

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/schema/AbstractTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/schema/AbstractTable.java 
b/core/src/main/java/org/apache/metamodel/schema/AbstractTable.java
index 6e5b55f..4f11f50 100644
--- a/core/src/main/java/org/apache/metamodel/schema/AbstractTable.java
+++ b/core/src/main/java/org/apache/metamodel/schema/AbstractTable.java
@@ -18,15 +18,13 @@
  */
 package org.apache.metamodel.schema;
 
-import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.apache.metamodel.MetaModelHelper;
 import org.apache.metamodel.util.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * Abstract {@link Table} implementation. Includes most common/trivial methods.
  */

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/main/java/org/apache/metamodel/schema/ImmutableRelationship.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/metamodel/schema/ImmutableRelationship.java 
b/core/src/main/java/org/apache/metamodel/schema/ImmutableRelationship.java
index b930359..7ca8fe9 100644
--- a/core/src/main/java/org/apache/metamodel/schema/ImmutableRelationship.java
+++ b/core/src/main/java/org/apache/metamodel/schema/ImmutableRelationship.java
@@ -19,7 +19,6 @@
 package org.apache.metamodel.schema;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/test/java/org/apache/metamodel/AbstractDataContextTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/metamodel/AbstractDataContextTest.java 
b/core/src/test/java/org/apache/metamodel/AbstractDataContextTest.java
index c526df5..8c102af 100644
--- a/core/src/test/java/org/apache/metamodel/AbstractDataContextTest.java
+++ b/core/src/test/java/org/apache/metamodel/AbstractDataContextTest.java
@@ -21,7 +21,6 @@ package org.apache.metamodel;
 import java.util.*;
 
 import com.google.common.collect.Lists;
-import javafx.scene.Scene;
 import junit.framework.TestCase;
 import org.apache.metamodel.data.DataSet;
 import org.apache.metamodel.query.Query;

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java
 
b/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java
index 647ace4..fe69b6c 100644
--- 
a/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java
+++ 
b/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java
@@ -18,11 +18,7 @@
  */
 package org.apache.metamodel.intercept;
 
-import java.util.Arrays;
-import java.util.List;
-
 import junit.framework.TestCase;
-
 import org.apache.metamodel.DataContext;
 import org.apache.metamodel.MockUpdateableDataContext;
 import org.apache.metamodel.data.DataSet;
@@ -32,6 +28,9 @@ import org.apache.metamodel.schema.MutableSchema;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.Table;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class InterceptableDataContextTest extends TestCase {
 
        private final MockUpdateableDataContext delegateDataContext = new 
MockUpdateableDataContext();

http://git-wip-us.apache.org/repos/asf/metamodel/blob/e387a5ae/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
 
b/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
index 7753539..ce6e85c 100644
--- 
a/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
+++ 
b/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java
@@ -18,14 +18,12 @@
  */
 package org.apache.metamodel.util;
 
-import java.io.FileInputStream;
-
 import junit.framework.TestCase;
-
 import org.apache.metamodel.query.Query;
-import org.apache.metamodel.schema.Column;
 import org.apache.metamodel.schema.Table;
 
+import java.io.FileInputStream;
+
 public class LegacyDeserializationObjectInputStreamTest extends TestCase {
 
     /**

Reply via email to