Merge pull request #221 from bivasdas/imports-fix

IDEA->Code->Optimize Imports'

guice/src/test/java/com/bazaarvoice/jolt/chainr/GuicedChainrTest.java

@@ -18,9 +18,9 @@
 import com.bazaarvoice.jolt.Chainr;
 import com.bazaarvoice.jolt.JsonUtils;
 import com.bazaarvoice.jolt.chainr.instantiator.GuiceChainrInstantiator;
-import com.bazaarvoice.jolt.chainr.transforms.GuiceTransformMissingInjectAnnotation;
 import com.bazaarvoice.jolt.chainr.transforms.GuiceSpecDrivenTransform;
 import com.bazaarvoice.jolt.chainr.transforms.GuiceTransform;
+import com.bazaarvoice.jolt.chainr.transforms.GuiceTransformMissingInjectAnnotation;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

guice/src/test/java/com/bazaarvoice/jolt/chainr/JoltTestUtil.java

@@ -19,8 +19,6 @@
 import com.bazaarvoice.jolt.JsonUtils;
 import org.testng.Assert;
 
-import java.io.IOException;
-
 public class JoltTestUtil {
 
     private static final Diffy diffy = new Diffy();

jolt-core/src/main/java/com/bazaarvoice/jolt/CardinalityTransform.java

@@ -16,8 +16,8 @@
 package com.bazaarvoice.jolt;
 
 import com.bazaarvoice.jolt.cardinality.CardinalityCompositeSpec;
-import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
+import com.bazaarvoice.jolt.exception.SpecException;
 
 import javax.inject.Inject;
 import java.util.Map;

jolt-core/src/main/java/com/bazaarvoice/jolt/Removr.java

@@ -17,6 +17,7 @@
 
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.removr.spec.RemovrCompositeSpec;
+
 import javax.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;

jolt-core/src/main/java/com/bazaarvoice/jolt/Shiftr.java

@@ -15,9 +15,9 @@
  */
 package com.bazaarvoice.jolt;
 
-import com.bazaarvoice.jolt.exception.SpecException;
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
+import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.shiftr.spec.ShiftrCompositeSpec;
 
 import javax.inject.Inject;

jolt-core/src/main/java/com/bazaarvoice/jolt/Templatr.java

@@ -20,8 +20,8 @@
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.templatr.OpMode;
-import com.bazaarvoice.jolt.templatr.spec.TemplatrCompositeSpec;
 import com.bazaarvoice.jolt.templatr.TemplatrSpecBuilder;
+import com.bazaarvoice.jolt.templatr.spec.TemplatrCompositeSpec;
 
 import java.util.HashMap;
 import java.util.Map;

jolt-core/src/main/java/com/bazaarvoice/jolt/cardinality/CardinalityCompositeSpec.java

@@ -16,12 +16,12 @@
 package com.bazaarvoice.jolt.cardinality;
 
 import com.bazaarvoice.jolt.common.ComputedKeysComparator;
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.pathelement.AmpPathElement;
 import com.bazaarvoice.jolt.common.pathelement.AtPathElement;
-import com.bazaarvoice.jolt.common.tree.MatchedElement;
 import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarPathElement;
+import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
 
 import java.util.ArrayList;

jolt-core/src/main/java/com/bazaarvoice/jolt/cardinality/CardinalityLeafSpec.java

@@ -15,8 +15,8 @@
  */
 package com.bazaarvoice.jolt.cardinality;
 
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
 
 import java.util.ArrayList;

jolt-core/src/main/java/com/bazaarvoice/jolt/cardinality/CardinalitySpec.java

@@ -15,15 +15,15 @@
  */
 package com.bazaarvoice.jolt.cardinality;
 
-import com.bazaarvoice.jolt.common.spec.BaseSpec;
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.pathelement.AtPathElement;
+import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.pathelement.MatchablePathElement;
 import com.bazaarvoice.jolt.common.pathelement.PathElement;
-import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarAllPathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarRegexPathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarSinglePathElement;
+import com.bazaarvoice.jolt.common.spec.BaseSpec;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.utils.StringTools;
 

jolt-core/src/main/java/com/bazaarvoice/jolt/common/PathEvaluatingTraversal.java

@@ -15,9 +15,9 @@
  */
 package com.bazaarvoice.jolt.common;
 
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.pathelement.EvaluatablePathElement;
 import com.bazaarvoice.jolt.common.pathelement.PathElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.traversr.Traversr;
 import com.bazaarvoice.jolt.utils.StringTools;

jolt-core/src/main/java/com/bazaarvoice/jolt/common/pathelement/ArrayPathElement.java

@@ -16,14 +16,14 @@
 package com.bazaarvoice.jolt.common.pathelement;
 
 import com.bazaarvoice.jolt.common.Optional;
-import com.bazaarvoice.jolt.common.tree.ArrayMatchedElement;
-import com.bazaarvoice.jolt.common.tree.MatchedElement;
-import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.common.reference.AmpReference;
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.reference.HashReference;
 import com.bazaarvoice.jolt.common.reference.PathAndGroupReference;
 import com.bazaarvoice.jolt.common.reference.PathReference;
+import com.bazaarvoice.jolt.common.tree.ArrayMatchedElement;
+import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
+import com.bazaarvoice.jolt.exception.SpecException;
 
 public class ArrayPathElement extends BasePathElement implements MatchablePathElement, EvaluatablePathElement {
 

jolt-core/src/main/java/com/bazaarvoice/jolt/common/pathelement/AtPathElement.java

@@ -16,8 +16,8 @@
 package com.bazaarvoice.jolt.common.pathelement;
 
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
-import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
+import com.bazaarvoice.jolt.exception.SpecException;
 
 public class AtPathElement extends BasePathElement implements MatchablePathElement {
     public AtPathElement( String key ) {

jolt-core/src/main/java/com/bazaarvoice/jolt/common/pathelement/TransposePathElement.java

@@ -16,11 +16,11 @@
 package com.bazaarvoice.jolt.common.pathelement;
 
 import com.bazaarvoice.jolt.common.Optional;
+import com.bazaarvoice.jolt.common.TransposeReader;
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
 import com.bazaarvoice.jolt.common.tree.PathStep;
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
-import com.bazaarvoice.jolt.common.TransposeReader;
 import com.bazaarvoice.jolt.utils.StringTools;
 
 /**

jolt-core/src/main/java/com/bazaarvoice/jolt/defaultr/Key.java

@@ -18,8 +18,6 @@
 import com.bazaarvoice.jolt.Defaultr;
 import com.bazaarvoice.jolt.exception.TransformException;
 
-import static com.bazaarvoice.jolt.defaultr.OPS.*;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,6 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static com.bazaarvoice.jolt.defaultr.OPS.OR;
+
 public abstract class Key {
 
     /**

jolt-core/src/main/java/com/bazaarvoice/jolt/removr/spec/RemovrSpec.java

@@ -15,13 +15,13 @@
  */
 package com.bazaarvoice.jolt.removr.spec;
 
+import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.pathelement.MatchablePathElement;
 import com.bazaarvoice.jolt.common.pathelement.PathElement;
-import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
-import com.bazaarvoice.jolt.common.pathelement.StarSinglePathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarAllPathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarDoublePathElement;
 import com.bazaarvoice.jolt.common.pathelement.StarRegexPathElement;
+import com.bazaarvoice.jolt.common.pathelement.StarSinglePathElement;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.utils.StringTools;
 

jolt-core/src/main/java/com/bazaarvoice/jolt/shiftr/ShiftrTraversr.java

@@ -15,13 +15,13 @@
  */
 package com.bazaarvoice.jolt.shiftr;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.bazaarvoice.jolt.common.Optional;
 import com.bazaarvoice.jolt.traversr.SimpleTraversr;
 import com.bazaarvoice.jolt.traversr.traversal.TraversalStep;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Traverser that does not overwrite data.
  */

jolt-core/src/main/java/com/bazaarvoice/jolt/shiftr/spec/ShiftrCompositeSpec.java

@@ -33,8 +33,8 @@
 import com.bazaarvoice.jolt.common.spec.OrderedCompositeSpec;
 import com.bazaarvoice.jolt.common.spec.SpecBuilder;
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
-import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
+import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.shiftr.ShiftrSpecBuilder;
 
 import java.util.ArrayList;

jolt-core/src/main/java/com/bazaarvoice/jolt/shiftr/spec/ShiftrLeafSpec.java

@@ -16,6 +16,7 @@
 package com.bazaarvoice.jolt.shiftr.spec;
 
 import com.bazaarvoice.jolt.common.Optional;
+import com.bazaarvoice.jolt.common.PathEvaluatingTraversal;
 import com.bazaarvoice.jolt.common.TraversalBuilder;
 import com.bazaarvoice.jolt.common.pathelement.AtPathElement;
 import com.bazaarvoice.jolt.common.pathelement.DollarPathElement;
@@ -24,7 +25,6 @@
 import com.bazaarvoice.jolt.common.tree.MatchedElement;
 import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.exception.SpecException;
-import com.bazaarvoice.jolt.common.PathEvaluatingTraversal;
 import com.bazaarvoice.jolt.shiftr.ShiftrWriter;
 
 import java.util.ArrayList;

jolt-core/src/main/java/com/bazaarvoice/jolt/shiftr/spec/ShiftrSpec.java

@@ -15,8 +15,8 @@
  */
 package com.bazaarvoice.jolt.shiftr.spec;
 
-import com.bazaarvoice.jolt.common.pathelement.MatchablePathElement;
 import com.bazaarvoice.jolt.common.PathElementBuilder;
+import com.bazaarvoice.jolt.common.pathelement.MatchablePathElement;
 import com.bazaarvoice.jolt.common.spec.BaseSpec;
 
 /**

jolt-core/src/test/java/com/bazaarvoice/jolt/ChainrTest.java

@@ -15,14 +15,13 @@
  */
 package com.bazaarvoice.jolt;
 
-import com.bazaarvoice.jolt.chainr.transforms.TransformTestResult;
 import com.bazaarvoice.jolt.chainr.spec.ChainrEntry;
+import com.bazaarvoice.jolt.chainr.transforms.ExplodingTestTransform;
 import com.bazaarvoice.jolt.chainr.transforms.GoodTestTransform;
+import com.bazaarvoice.jolt.chainr.transforms.TransformTestResult;
 import com.bazaarvoice.jolt.exception.SpecException;
 import com.bazaarvoice.jolt.exception.TransformException;
-import com.bazaarvoice.jolt.chainr.transforms.ExplodingTestTransform;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

jolt-core/src/test/java/com/bazaarvoice/jolt/chainr/ChainrInitializationTest.java

@@ -28,7 +28,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

jolt-core/src/test/java/com/bazaarvoice/jolt/shiftr/ShiftrWritrTest.java

@@ -16,15 +16,15 @@
 package com.bazaarvoice.jolt.shiftr;
 
 import com.bazaarvoice.jolt.common.PathElementBuilder;
-import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import com.bazaarvoice.jolt.common.pathelement.AmpPathElement;
 import com.bazaarvoice.jolt.common.pathelement.ArrayPathElement;
 import com.bazaarvoice.jolt.common.pathelement.EvaluatablePathElement;
-import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.pathelement.MatchablePathElement;
 import com.bazaarvoice.jolt.common.pathelement.PathElement;
-import com.bazaarvoice.jolt.common.pathelement.LiteralPathElement;
 import com.bazaarvoice.jolt.common.reference.AmpReference;
+import com.bazaarvoice.jolt.common.tree.MatchedElement;
+import com.bazaarvoice.jolt.common.tree.WalkedPath;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

jolt-core/src/test/java/com/bazaarvoice/jolt/utils/JoltUtilsTest.java

@@ -29,7 +29,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;

json-utils/src/main/java/com/bazaarvoice/jolt/JsonUtils.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;

json-utils/src/test/java/com/bazaarvoice/jolt/jsonUtil/testdomain/four/LogicalFilter4.java

@@ -20,7 +20,11 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;