You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by np...@apache.org on 2018/09/14 10:08:07 UTC
[sling-org-apache-sling-pipes] branch master updated: optimize
imports
This is an automated email from the ASF dual-hosted git repository.
npeltier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
The following commit(s) were added to refs/heads/master by this push:
new 94f484e optimize imports
94f484e is described below
commit 94f484e307ff7137537dea7957964c8324396d9d
Author: Nicolas Peltier <pe...@gmail.com>
AuthorDate: Fri Sep 14 12:07:54 2018 +0200
optimize imports
---
.../sling/pipes/AbstractInputStreamPipe.java | 1 -
.../java/org/apache/sling/pipes/PipeBuilder.java | 2 +-
.../apache/sling/pipes/internal/ContainerPipe.java | 2 +-
.../org/apache/sling/pipes/internal/CsvWriter.java | 2 --
.../apache/sling/pipes/internal/JsonWriter.java | 3 --
.../apache/sling/pipes/internal/ManifoldPipe.java | 16 +++++------
.../sling/pipes/internal/MultiPropertyPipe.java | 1 -
.../sling/pipes/internal/PipeBuilderImpl.java | 3 +-
.../org/apache/sling/pipes/internal/XPathPipe.java | 1 -
.../sling/pipes/internal/inputstream/CsvPipe.java | 1 -
.../slingquery/AbstractSlingQueryPipe.java | 1 +
.../org/apache/sling/pipes/AbstractPipeTest.java | 16 +++++------
.../org/apache/sling/pipes/ContainerPipeTest.java | 14 ++++-----
.../org/apache/sling/pipes/ManifoldPipeTest.java | 13 ++++-----
.../org/apache/sling/pipes/PipeBindingsTest.java | 16 +++++------
.../org/apache/sling/pipes/PipeBuilderTest.java | 1 -
.../org/apache/sling/pipes/dummies/DummyNull.java | 6 ++--
.../apache/sling/pipes/dummies/DummySearch.java | 11 ++++----
.../sling/pipes/internal/GogoCommandsTest.java | 4 ++-
.../apache/sling/pipes/internal/MovePipeTest.java | 7 ++---
.../pipes/internal/MultiPropertyPipeTest.java | 12 ++++----
.../apache/sling/pipes/internal/NotPipeTest.java | 4 +--
.../sling/pipes/internal/PackagePipeTest.java | 3 +-
.../apache/sling/pipes/internal/PathPipeTest.java | 5 +++-
.../sling/pipes/internal/PlumberServletTest.java | 33 +++++++++++-----------
.../sling/pipes/internal/RemovePipeTest.java | 17 ++++++-----
.../sling/pipes/internal/TraversePipeTest.java | 3 +-
.../apache/sling/pipes/internal/WritePipeTest.java | 25 ++++++++--------
.../pipes/internal/inputstream/CsvPipeTest.java | 2 +-
.../pipes/internal/inputstream/JsonPipeTest.java | 12 ++++----
.../pipes/internal/inputstream/RegexpPipeTest.java | 4 ++-
.../internal/slingquery/ChildrenPipeTest.java | 4 +--
.../org/apache/sling/pipes/it/PipeModelIT.java | 1 -
.../apache/sling/pipes/it/PipesTestSupport.java | 4 +--
.../apache/sling/pipes/it/PlumberServletIT.java | 6 ++--
.../apache/sling/pipes/models/PipeModelTest.java | 4 ++-
36 files changed, 126 insertions(+), 134 deletions(-)
diff --git a/src/main/java/org/apache/sling/pipes/AbstractInputStreamPipe.java b/src/main/java/org/apache/sling/pipes/AbstractInputStreamPipe.java
index 0150a3b..fe43cee 100644
--- a/src/main/java/org/apache/sling/pipes/AbstractInputStreamPipe.java
+++ b/src/main/java/org/apache/sling/pipes/AbstractInputStreamPipe.java
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
diff --git a/src/main/java/org/apache/sling/pipes/PipeBuilder.java b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
index f73e0c1..3388c4c 100644
--- a/src/main/java/org/apache/sling/pipes/PipeBuilder.java
+++ b/src/main/java/org/apache/sling/pipes/PipeBuilder.java
@@ -18,6 +18,7 @@ package org.apache.sling.pipes;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.event.jobs.Job;
+import org.apache.sling.pipes.internal.ACLPipe;
import org.apache.sling.pipes.internal.AuthorizablePipe;
import org.apache.sling.pipes.internal.FilterPipe;
import org.apache.sling.pipes.internal.MovePipe;
@@ -30,7 +31,6 @@ import org.apache.sling.pipes.internal.RemovePipe;
import org.apache.sling.pipes.internal.TraversePipe;
import org.apache.sling.pipes.internal.WritePipe;
import org.apache.sling.pipes.internal.XPathPipe;
-import org.apache.sling.pipes.internal.ACLPipe;
import org.apache.sling.pipes.internal.inputstream.CsvPipe;
import org.apache.sling.pipes.internal.inputstream.JsonPipe;
import org.apache.sling.pipes.internal.inputstream.RegexpPipe;
diff --git a/src/main/java/org/apache/sling/pipes/internal/ContainerPipe.java b/src/main/java/org/apache/sling/pipes/internal/ContainerPipe.java
index 2224a0c..2aff482 100644
--- a/src/main/java/org/apache/sling/pipes/internal/ContainerPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/ContainerPipe.java
@@ -17,10 +17,10 @@
package org.apache.sling.pipes.internal;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.pipes.SuperPipe;
import org.apache.sling.pipes.Pipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
+import org.apache.sling.pipes.SuperPipe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/pipes/internal/CsvWriter.java b/src/main/java/org/apache/sling/pipes/internal/CsvWriter.java
index 46a3b76..c7913c8 100644
--- a/src/main/java/org/apache/sling/pipes/internal/CsvWriter.java
+++ b/src/main/java/org/apache/sling/pipes/internal/CsvWriter.java
@@ -16,7 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -28,7 +27,6 @@ import org.slf4j.LoggerFactory;
import javax.script.ScriptException;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/src/main/java/org/apache/sling/pipes/internal/JsonWriter.java b/src/main/java/org/apache/sling/pipes/internal/JsonWriter.java
index 822956a..6fe064d 100644
--- a/src/main/java/org/apache/sling/pipes/internal/JsonWriter.java
+++ b/src/main/java/org/apache/sling/pipes/internal/JsonWriter.java
@@ -25,13 +25,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.json.Json;
-import javax.json.JsonArray;
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
import javax.script.ScriptException;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
/**
diff --git a/src/main/java/org/apache/sling/pipes/internal/ManifoldPipe.java b/src/main/java/org/apache/sling/pipes/internal/ManifoldPipe.java
index b11ae2b..db54f0d 100644
--- a/src/main/java/org/apache/sling/pipes/internal/ManifoldPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/ManifoldPipe.java
@@ -16,14 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.NonExistingResource;
@@ -37,6 +29,14 @@ import org.apache.sling.pipes.SuperPipe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
/**
* This pipe executes the pipes it has in its configuration, in sequence or parallel;
* the output of the children pipes is merged;
diff --git a/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java b/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
index 57590b7..416d0fc 100644
--- a/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.Value;
-import javax.script.ScriptException;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
diff --git a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
index 5e3cf7f..72ce599 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
@@ -50,10 +50,9 @@ import java.util.UUID;
import static org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_FOLDER;
import static org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_ORDERED_FOLDER;
import static org.apache.sling.jcr.resource.JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY;
-import static org.apache.sling.pipes.internal.ManifoldPipe.PN_NUM_THREADS;
-
import static org.apache.sling.pipes.internal.CommandUtil.checkArguments;
import static org.apache.sling.pipes.internal.CommandUtil.writeToMap;
+import static org.apache.sling.pipes.internal.ManifoldPipe.PN_NUM_THREADS;
/**
* Implementation of the PipeBuilder interface
*/
diff --git a/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java b/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
index 80f77ba..baa35cb 100644
--- a/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java
@@ -25,7 +25,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.jcr.query.Query;
-import javax.script.ScriptException;
import java.util.Iterator;
/**
diff --git a/src/main/java/org/apache/sling/pipes/internal/inputstream/CsvPipe.java b/src/main/java/org/apache/sling/pipes/internal/inputstream/CsvPipe.java
index 5201999..bc72e6c 100644
--- a/src/main/java/org/apache/sling/pipes/internal/inputstream/CsvPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/inputstream/CsvPipe.java
@@ -25,7 +25,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/org/apache/sling/pipes/internal/slingquery/AbstractSlingQueryPipe.java b/src/main/java/org/apache/sling/pipes/internal/slingquery/AbstractSlingQueryPipe.java
index 421630f..b10396f 100644
--- a/src/main/java/org/apache/sling/pipes/internal/slingquery/AbstractSlingQueryPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/slingquery/AbstractSlingQueryPipe.java
@@ -21,6 +21,7 @@ import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
import org.apache.sling.query.SlingQuery;
+
import java.util.Iterator;
/**
diff --git a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
index 01932af..0355604 100644
--- a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
@@ -16,14 +16,6 @@
*/
package org.apache.sling.pipes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.Iterator;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.dummies.DummyNull;
@@ -34,6 +26,14 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* this abstract class for pipes implements a plumber with all registered pipes, plus some test ones, and give some paths,
* it also provides a testing Sling Context, with some content.
diff --git a/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java b/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
index 7337cd2..8af9021 100644
--- a/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
@@ -16,13 +16,6 @@
*/
package org.apache.sling.pipes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-
import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
@@ -30,6 +23,13 @@ import org.apache.sling.pipes.internal.ContainerPipe;
import org.junit.Before;
import org.junit.Test;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* testing container with dummy child pipes
*/
diff --git a/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java b/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
index 047cc83..c1d959e 100644
--- a/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/ManifoldPipeTest.java
@@ -16,20 +16,19 @@
*/
package org.apache.sling.pipes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeNotNull;
-
-import java.util.Iterator;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeNotNull;
+
/**
* testing executor with dummy child pipes
*/
diff --git a/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java b/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
index 864812c..83ceb8e 100644
--- a/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
+++ b/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
@@ -16,21 +16,19 @@
*/
package org.apache.sling.pipes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.apache.sling.api.resource.PersistenceException;
+import org.apache.sling.api.resource.Resource;
+import org.junit.Before;
+import org.junit.Test;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.script.ScriptException;
-
-import org.apache.sling.api.resource.PersistenceException;
-import org.apache.sling.api.resource.Resource;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
/**
* testing binding's expressions instanciations
diff --git a/src/test/java/org/apache/sling/pipes/PipeBuilderTest.java b/src/test/java/org/apache/sling/pipes/PipeBuilderTest.java
index 80b5924..428b9dd 100644
--- a/src/test/java/org/apache/sling/pipes/PipeBuilderTest.java
+++ b/src/test/java/org/apache/sling/pipes/PipeBuilderTest.java
@@ -21,7 +21,6 @@ import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.pipes.internal.JsonUtil;
import org.junit.Test;
-import javax.json.JsonArray;
import javax.json.JsonObject;
import java.util.Arrays;
import java.util.Collection;
diff --git a/src/test/java/org/apache/sling/pipes/dummies/DummyNull.java b/src/test/java/org/apache/sling/pipes/dummies/DummyNull.java
index edcfba3..496bb94 100644
--- a/src/test/java/org/apache/sling/pipes/dummies/DummyNull.java
+++ b/src/test/java/org/apache/sling/pipes/dummies/DummyNull.java
@@ -16,14 +16,14 @@
*/
package org.apache.sling.pipes.dummies;
-import java.util.Collections;
-import java.util.Iterator;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
+import java.util.Collections;
+import java.util.Iterator;
+
/**
* this pipe has nothing in output
*/
diff --git a/src/test/java/org/apache/sling/pipes/dummies/DummySearch.java b/src/test/java/org/apache/sling/pipes/dummies/DummySearch.java
index 84e5f80..176ec93 100644
--- a/src/test/java/org/apache/sling/pipes/dummies/DummySearch.java
+++ b/src/test/java/org/apache/sling/pipes/dummies/DummySearch.java
@@ -16,17 +16,16 @@
*/
package org.apache.sling.pipes.dummies;
-import java.util.Collections;
-import java.util.Iterator;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.PipeBindings;
import org.apache.sling.pipes.Plumber;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import java.util.Collections;
+import java.util.Iterator;
+
/**
* dummy search reads its conf node subpipes and returns them.
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/GogoCommandsTest.java b/src/test/java/org/apache/sling/pipes/internal/GogoCommandsTest.java
index 350c400..b8fe57b 100644
--- a/src/test/java/org/apache/sling/pipes/internal/GogoCommandsTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/GogoCommandsTest.java
@@ -30,7 +30,9 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class GogoCommandsTest extends AbstractPipeTest {
diff --git a/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
index 6d60967..a6cba2f 100644
--- a/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import java.util.Iterator;
-
-import javax.jcr.Session;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
@@ -28,6 +24,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import javax.jcr.Session;
+import java.util.Iterator;
+
/**
* testing moving nodes & properties
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
index 210eb44..b3eae16 100644
--- a/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java
@@ -16,12 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Iterator;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
@@ -29,6 +23,12 @@ import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
/**
* testing normal case of MV Property Pipe
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
index 2501623..85f2114 100644
--- a/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java
@@ -17,12 +17,12 @@
package org.apache.sling.pipes.internal;
-import static org.junit.Assert.assertFalse;
-
import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+
public class NotPipeTest extends AbstractPipeTest {
@Before
diff --git a/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
index 8f5c246..ae27948 100644
--- a/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/PackagePipeTest.java
@@ -25,7 +25,8 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@Ignore
public class PackagePipeTest extends AbstractPipeTest {
diff --git a/src/test/java/org/apache/sling/pipes/internal/PathPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/PathPipeTest.java
index f9628e6..7693c27 100644
--- a/src/test/java/org/apache/sling/pipes/internal/PathPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/PathPipeTest.java
@@ -27,7 +27,10 @@ import org.junit.Test;
import javax.jcr.Node;
import static org.apache.sling.jcr.resource.JcrResourceConstants.NT_SLING_FOLDER;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* Testing path pipe using pipe builder
diff --git a/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java b/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
index b3abf9a..31639dc 100644
--- a/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java
@@ -16,23 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.servlet.ServletException;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -48,6 +31,22 @@ import org.apache.sling.pipes.OutputWriter;
import org.junit.Before;
import org.junit.Test;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.servlet.ServletException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* testing the servlet logic (parameters & output)
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
index 9b0611e..e174a8f 100644
--- a/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java
@@ -16,15 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-
-import javax.jcr.Node;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
@@ -33,6 +24,14 @@ import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
+import javax.jcr.Node;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* testing removal
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java
index 8c85e52..c22030f 100644
--- a/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java
@@ -30,7 +30,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
/**
* Testing traverse pipes and its different configurations on the same resource tree
diff --git a/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
index 4ee6ee8..45bbf1d 100644
--- a/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
@@ -16,19 +16,6 @@
*/
package org.apache.sling.pipes.internal;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-
import org.apache.commons.collections.IteratorUtils;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
@@ -40,6 +27,18 @@ import org.apache.sling.pipes.Pipe;
import org.junit.Before;
import org.junit.Test;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* test write
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/inputstream/CsvPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/inputstream/CsvPipeTest.java
index 39a189c..1f32459 100644
--- a/src/test/java/org/apache/sling/pipes/internal/inputstream/CsvPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/inputstream/CsvPipeTest.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
/**
* testing csv pipe
diff --git a/src/test/java/org/apache/sling/pipes/internal/inputstream/JsonPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/inputstream/JsonPipeTest.java
index c5ad5b9..e3e44c8 100644
--- a/src/test/java/org/apache/sling/pipes/internal/inputstream/JsonPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/inputstream/JsonPipeTest.java
@@ -16,12 +16,6 @@
*/
package org.apache.sling.pipes.internal.inputstream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
@@ -29,6 +23,12 @@ import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* testing json pipe with anonymous yahoo meteo API
*/
diff --git a/src/test/java/org/apache/sling/pipes/internal/inputstream/RegexpPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/inputstream/RegexpPipeTest.java
index 7c156b9..3476e4f 100644
--- a/src/test/java/org/apache/sling/pipes/internal/inputstream/RegexpPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/inputstream/RegexpPipeTest.java
@@ -28,7 +28,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class RegexpPipeTest extends AbstractPipeTest {
@Test
diff --git a/src/test/java/org/apache/sling/pipes/internal/slingquery/ChildrenPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/slingquery/ChildrenPipeTest.java
index 291d6e8..c554ab3 100644
--- a/src/test/java/org/apache/sling/pipes/internal/slingquery/ChildrenPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/slingquery/ChildrenPipeTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.sling.pipes.internal.slingquery;
-import static org.junit.Assert.assertTrue;
-
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.pipes.AbstractPipeTest;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/**
* test the sling query pipe
*/
diff --git a/src/test/java/org/apache/sling/pipes/it/PipeModelIT.java b/src/test/java/org/apache/sling/pipes/it/PipeModelIT.java
index a597840..6507c8b 100644
--- a/src/test/java/org/apache/sling/pipes/it/PipeModelIT.java
+++ b/src/test/java/org/apache/sling/pipes/it/PipeModelIT.java
@@ -28,7 +28,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
index 92c1f48..117d402 100644
--- a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
+++ b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.pipes.it;
-import javax.inject.Inject;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
@@ -34,6 +32,8 @@ import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.util.Filter;
+import javax.inject.Inject;
+
import static org.apache.sling.testing.paxexam.SlingOptions.slingCommonsHtml;
import static org.apache.sling.testing.paxexam.SlingOptions.slingDistribution;
import static org.apache.sling.testing.paxexam.SlingOptions.slingEvent;
diff --git a/src/test/java/org/apache/sling/pipes/it/PlumberServletIT.java b/src/test/java/org/apache/sling/pipes/it/PlumberServletIT.java
index b223425..2abdd4b 100644
--- a/src/test/java/org/apache/sling/pipes/it/PlumberServletIT.java
+++ b/src/test/java/org/apache/sling/pipes/it/PlumberServletIT.java
@@ -16,9 +16,6 @@
*/
package org.apache.sling.pipes.it;
-import java.io.IOException;
-import java.util.ArrayList;
-
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.jsoup.Jsoup;
@@ -30,6 +27,9 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/sling/pipes/models/PipeModelTest.java b/src/test/java/org/apache/sling/pipes/models/PipeModelTest.java
index 98d4621..3111073 100644
--- a/src/test/java/org/apache/sling/pipes/models/PipeModelTest.java
+++ b/src/test/java/org/apache/sling/pipes/models/PipeModelTest.java
@@ -27,7 +27,9 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Testing model initialisation