rearranged to eclipse import style
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/840aea41 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/840aea41 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/840aea41 Branch: refs/heads/master Commit: 840aea410c254e29253d46983629de03843297af Parents: 725e210 Author: JoÌrg Unbehauen <[email protected]> Authored: Wed Aug 2 15:14:20 2017 +0200 Committer: JoÌrg Unbehauen <[email protected]> Committed: Wed Aug 2 15:14:20 2017 +0200 ---------------------------------------------------------------------- .../org/apache/metamodel/AbstractDataContext.java | 12 ++++++------ .../apache/metamodel/CompositeDataContext.java | 18 +++++++++--------- .../java/org/apache/metamodel/DataContext.java | 4 ++-- .../org/apache/metamodel/convert/Converters.java | 16 ++++++++-------- .../apache/metamodel/data/AbstractDataSet.java | 6 +++--- .../metamodel/data/CachingDataSetHeader.java | 6 +++--- .../metamodel/data/ScalarFunctionDataSet.java | 4 ++-- .../metamodel/data/SimpleDataSetHeader.java | 6 +++--- .../org/apache/metamodel/data/UnionDataSet.java | 6 +++--- .../intercept/InterceptableDataContext.java | 6 +++--- .../apache/metamodel/schema/AbstractSchema.java | 8 ++++---- .../intercept/InterceptableDataContextTest.java | 7 ++++--- ...egacyDeserializationObjectInputStreamTest.java | 5 +++-- 13 files changed, 53 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 379b9ed..475add4 100644 --- a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java +++ b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java @@ -18,6 +18,12 @@ */ package org.apache.metamodel; +import java.util.ArrayList; +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; @@ -29,12 +35,6 @@ 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/840aea41/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 f595b2e..b7468fb 100644 --- a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java +++ b/core/src/main/java/org/apache/metamodel/CompositeDataContext.java @@ -18,15 +18,6 @@ */ package org.apache.metamodel; -import org.apache.metamodel.data.DataSet; -import org.apache.metamodel.query.FromItem; -import org.apache.metamodel.query.Query; -import org.apache.metamodel.schema.CompositeSchema; -import org.apache.metamodel.schema.Schema; -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; @@ -38,6 +29,15 @@ import java.util.Set; import java.util.TreeSet; import java.util.function.Function; +import org.apache.metamodel.data.DataSet; +import org.apache.metamodel.query.FromItem; +import org.apache.metamodel.query.Query; +import org.apache.metamodel.schema.CompositeSchema; +import org.apache.metamodel.schema.Schema; +import org.apache.metamodel.schema.Table; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * DataContext for composite datacontexts. Composite DataContexts wrap several http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 58bec4a..38223b9 100644 --- a/core/src/main/java/org/apache/metamodel/DataContext.java +++ b/core/src/main/java/org/apache/metamodel/DataContext.java @@ -18,6 +18,8 @@ */ package org.apache.metamodel; +import java.util.List; + import org.apache.metamodel.data.DataSet; import org.apache.metamodel.query.CompiledQuery; import org.apache.metamodel.query.Query; @@ -27,8 +29,6 @@ import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; -import java.util.List; - /** * A DataContext represents the central entry point for interactions with * datastores. The DataContext contains of the structure of data (in the form of http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 3c2ad00..905f1f7 100644 --- a/core/src/main/java/org/apache/metamodel/convert/Converters.java +++ b/core/src/main/java/org/apache/metamodel/convert/Converters.java @@ -18,6 +18,14 @@ */ package org.apache.metamodel.convert; +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; + import org.apache.metamodel.DataContext; import org.apache.metamodel.UpdateableDataContext; import org.apache.metamodel.data.DataSet; @@ -33,14 +41,6 @@ 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/840aea41/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 39e5303..33238a0 100644 --- a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java +++ b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java @@ -18,15 +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.query.SelectItem; +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/840aea41/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 965dea3..1ede3d9 100644 --- a/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java +++ b/core/src/main/java/org/apache/metamodel/data/CachingDataSetHeader.java @@ -18,13 +18,13 @@ */ package org.apache.metamodel.data; -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/840aea41/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 d9e6e9c..0b9a78f 100644 --- a/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java +++ b/core/src/main/java/org/apache/metamodel/data/ScalarFunctionDataSet.java @@ -18,12 +18,12 @@ */ package org.apache.metamodel.data; +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/840aea41/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 e3bf59d..5dc2ca9 100644 --- a/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java +++ b/core/src/main/java/org/apache/metamodel/data/SimpleDataSetHeader.java @@ -18,14 +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.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/840aea41/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 f8ef9bf..f13124c 100644 --- a/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java +++ b/core/src/main/java/org/apache/metamodel/data/UnionDataSet.java @@ -18,9 +18,6 @@ */ 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; @@ -28,6 +25,9 @@ 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/840aea41/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 74af932..b8f4c11 100644 --- a/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java +++ b/core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java @@ -18,6 +18,9 @@ */ package org.apache.metamodel.intercept; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.metamodel.DataContext; import org.apache.metamodel.MetaModelException; import org.apache.metamodel.UpdateScript; @@ -37,9 +40,6 @@ import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.update.RowUpdationBuilder; -import java.util.List; -import java.util.stream.Collectors; - public class InterceptableDataContext implements UpdateableDataContext { private final DataContext _delegate; http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 f8b8c1d..accfa27 100644 --- a/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java +++ b/core/src/main/java/org/apache/metamodel/schema/AbstractSchema.java @@ -18,16 +18,16 @@ */ package org.apache.metamodel.schema; -import org.apache.metamodel.util.EqualsBuilder; -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; +import org.apache.metamodel.util.EqualsBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Abstract implementation of the {@link Schema} interface. Implements most * common and trivial methods. http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 fe69b6c..446577d 100644 --- a/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java +++ b/core/src/test/java/org/apache/metamodel/intercept/InterceptableDataContextTest.java @@ -18,7 +18,9 @@ */ package org.apache.metamodel.intercept; -import junit.framework.TestCase; +import java.util.Arrays; +import java.util.List; + import org.apache.metamodel.DataContext; import org.apache.metamodel.MockUpdateableDataContext; import org.apache.metamodel.data.DataSet; @@ -28,8 +30,7 @@ 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; +import junit.framework.TestCase; public class InterceptableDataContextTest extends TestCase { http://git-wip-us.apache.org/repos/asf/metamodel/blob/840aea41/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 ce6e85c..8d18a5b 100644 --- a/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java +++ b/core/src/test/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStreamTest.java @@ -18,11 +18,12 @@ */ package org.apache.metamodel.util; -import junit.framework.TestCase; +import java.io.FileInputStream; + import org.apache.metamodel.query.Query; import org.apache.metamodel.schema.Table; -import java.io.FileInputStream; +import junit.framework.TestCase; public class LegacyDeserializationObjectInputStreamTest extends TestCase {
