This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.pipes-0.0.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit d5b073e15b1df0f78345b17ded763d00a20a3af6 Author: Oliver Lietz <[email protected]> AuthorDate: Sun Oct 2 12:13:09 2016 +0000 move non-extensible pipes to package internal git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1763056 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/pipes/BasePipe.java | 4 +++- .../sling/pipes/{ => internal}/AuthorizablePipe.java | 4 +++- .../apache/sling/pipes/{ => internal}/FilterPipe.java | 4 +++- .../org/apache/sling/pipes/{ => internal}/JsonPipe.java | 4 +++- .../org/apache/sling/pipes/{ => internal}/MovePipe.java | 4 +++- .../sling/pipes/{ => internal}/MultiPropertyPipe.java | 4 +++- .../org/apache/sling/pipes/{ => internal}/NotPipe.java | 4 +++- .../apache/sling/pipes/{ => internal}/ParentPipe.java | 4 +++- .../org/apache/sling/pipes/{ => internal}/PathPipe.java | 17 ++++++++++++----- .../org/apache/sling/pipes/internal/PlumberImpl.java | 12 ------------ .../org/apache/sling/pipes/internal/PlumberServlet.java | 3 --- .../apache/sling/pipes/{ => internal}/RemovePipe.java | 4 +++- .../sling/pipes/{ => internal}/SlingQueryPipe.java | 4 +++- .../apache/sling/pipes/{ => internal}/WritePipe.java | 4 +++- .../apache/sling/pipes/{ => internal}/XPathPipe.java | 4 +++- .../sling/pipes/{ => internal}/FilterPipeTest.java | 14 +++++++++----- .../apache/sling/pipes/{ => internal}/JsonPipeTest.java | 5 +++-- .../apache/sling/pipes/{ => internal}/MovePipeTest.java | 5 +++-- .../pipes/{ => internal}/MultiPropertyPipeTest.java | 4 +++- .../apache/sling/pipes/{ => internal}/NotPipeTest.java | 5 +++-- .../apache/sling/pipes/internal/PlumberServletTest.java | 1 - .../sling/pipes/{ => internal}/RemovePipeTest.java | 8 +++++--- .../sling/pipes/{ => internal}/SlingQueryPipeTest.java | 5 +++-- .../sling/pipes/{ => internal}/WritePipeTest.java | 6 ++++-- 24 files changed, 81 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/apache/sling/pipes/BasePipe.java b/src/main/java/org/apache/sling/pipes/BasePipe.java index a5101da..6c26789 100644 --- a/src/main/java/org/apache/sling/pipes/BasePipe.java +++ b/src/main/java/org/apache/sling/pipes/BasePipe.java @@ -32,7 +32,9 @@ import org.slf4j.LoggerFactory; * provides generic utilities for a pipe */ public class BasePipe implements Pipe { - Logger logger = LoggerFactory.getLogger(BasePipe.class); + + private final Logger logger = LoggerFactory.getLogger(BasePipe.class); + public static final String RESOURCE_TYPE = "slingPipes/base"; public static final String DRYRUN_KEY = "dryRun"; protected static final String DRYRUN_EXPR = "${" + DRYRUN_KEY + "}"; diff --git a/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java b/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java similarity index 98% rename from src/main/java/org/apache/sling/pipes/AuthorizablePipe.java rename to src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java index 1ae7abd..2f06b65 100644 --- a/src/main/java/org/apache/sling/pipes/AuthorizablePipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.commons.lang.StringUtils; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -24,6 +24,8 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.commons.json.JSONArray; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/FilterPipe.java b/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java similarity index 97% rename from src/main/java/org/apache/sling/pipes/FilterPipe.java rename to src/main/java/org/apache/sling/pipes/internal/FilterPipe.java index 5b3a73a..18687be 100644 --- a/src/main/java/org/apache/sling/pipes/FilterPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/JsonPipe.java b/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java similarity index 98% rename from src/main/java/org/apache/sling/pipes/JsonPipe.java rename to src/main/java/org/apache/sling/pipes/internal/JsonPipe.java index a1be066..71653f7 100644 --- a/src/main/java/org/apache/sling/pipes/JsonPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpConnectionManager; @@ -30,6 +30,8 @@ import org.apache.sling.commons.json.JSONArray; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.commons.json.JSONTokener; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/MovePipe.java b/src/main/java/org/apache/sling/pipes/internal/MovePipe.java similarity index 96% rename from src/main/java/org/apache/sling/pipes/MovePipe.java rename to src/main/java/org/apache/sling/pipes/internal/MovePipe.java index 5d4ea09..de952b5 100644 --- a/src/main/java/org/apache/sling/pipes/MovePipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/MovePipe.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java b/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java similarity index 96% rename from src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java rename to src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java index 4c1ae44..d8e671a 100644 --- a/src/main/java/org/apache/sling/pipes/MultiPropertyPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/MultiPropertyPipe.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/NotPipe.java b/src/main/java/org/apache/sling/pipes/internal/NotPipe.java similarity index 92% rename from src/main/java/org/apache/sling/pipes/NotPipe.java rename to src/main/java/org/apache/sling/pipes/internal/NotPipe.java index 74f980e..4d2ff01 100644 --- a/src/main/java/org/apache/sling/pipes/NotPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/NotPipe.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.Plumber; +import org.apache.sling.pipes.ReferencePipe; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/org/apache/sling/pipes/ParentPipe.java b/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java similarity index 92% rename from src/main/java/org/apache/sling/pipes/ParentPipe.java rename to src/main/java/org/apache/sling/pipes/internal/ParentPipe.java index f0ebdfc..43c5bf7 100644 --- a/src/main/java/org/apache/sling/pipes/ParentPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/ParentPipe.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/org/apache/sling/pipes/PathPipe.java b/src/main/java/org/apache/sling/pipes/internal/PathPipe.java similarity index 93% rename from src/main/java/org/apache/sling/pipes/PathPipe.java rename to src/main/java/org/apache/sling/pipes/internal/PathPipe.java index 8bdb8f5..fb993b8 100644 --- a/src/main/java/org/apache/sling/pipes/PathPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/PathPipe.java @@ -14,16 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; -import org.apache.sling.api.resource.Resource; +import java.util.Collections; +import java.util.Iterator; +import java.util.StringTokenizer; import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; -import java.util.Collections; -import java.util.Iterator; -import java.util.StringTokenizer; + +import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * creates or get given expression's path and returns corresponding resource @@ -38,6 +43,8 @@ public class PathPipe extends BasePipe { boolean autosave; + private final Logger logger = LoggerFactory.getLogger(PathPipe.class); + public PathPipe(Plumber plumber, Resource resource) throws Exception { super(plumber, resource); nodeType = properties.get(PN_NODETYPE, "sling:Folder"); diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java index af5c494..d924768 100644 --- a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java +++ b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java @@ -37,23 +37,11 @@ import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.DistributionResponse; import org.apache.sling.distribution.Distributor; import org.apache.sling.distribution.SimpleDistributionRequest; -import org.apache.sling.pipes.AuthorizablePipe; import org.apache.sling.pipes.BasePipe; import org.apache.sling.pipes.ContainerPipe; -import org.apache.sling.pipes.FilterPipe; -import org.apache.sling.pipes.JsonPipe; -import org.apache.sling.pipes.MovePipe; -import org.apache.sling.pipes.MultiPropertyPipe; -import org.apache.sling.pipes.NotPipe; -import org.apache.sling.pipes.ParentPipe; -import org.apache.sling.pipes.PathPipe; import org.apache.sling.pipes.Pipe; import org.apache.sling.pipes.Plumber; import org.apache.sling.pipes.ReferencePipe; -import org.apache.sling.pipes.RemovePipe; -import org.apache.sling.pipes.SlingQueryPipe; -import org.apache.sling.pipes.WritePipe; -import org.apache.sling.pipes.XPathPipe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java b/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java index 711d588..3322421 100644 --- a/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java +++ b/src/main/java/org/apache/sling/pipes/internal/PlumberServlet.java @@ -33,15 +33,12 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.servlets.SlingAllMethodsServlet; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; -import org.apache.sling.pipes.AuthorizablePipe; import org.apache.sling.pipes.BasePipe; import org.apache.sling.pipes.ContainerPipe; import org.apache.sling.pipes.OutputWriter; import org.apache.sling.pipes.Pipe; import org.apache.sling.pipes.PipeBindings; import org.apache.sling.pipes.Plumber; -import org.apache.sling.pipes.SlingQueryPipe; -import org.apache.sling.pipes.WritePipe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/RemovePipe.java b/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java similarity index 97% rename from src/main/java/org/apache/sling/pipes/RemovePipe.java rename to src/main/java/org/apache/sling/pipes/internal/RemovePipe.java index 0ea2e00..22198bb 100644 --- a/src/main/java/org/apache/sling/pipes/RemovePipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/RemovePipe.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java b/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java similarity index 94% rename from src/main/java/org/apache/sling/pipes/SlingQueryPipe.java rename to src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java index 89c239a..69a57fe 100644 --- a/src/main/java/org/apache/sling/pipes/SlingQueryPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/SlingQueryPipe.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.apache.sling.query.SlingQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/WritePipe.java b/src/main/java/org/apache/sling/pipes/internal/WritePipe.java similarity index 98% rename from src/main/java/org/apache/sling/pipes/WritePipe.java rename to src/main/java/org/apache/sling/pipes/internal/WritePipe.java index d12c2c0..06f395c 100644 --- a/src/main/java/org/apache/sling/pipes/WritePipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/WritePipe.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/sling/pipes/XPathPipe.java b/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java similarity index 93% rename from src/main/java/org/apache/sling/pipes/XPathPipe.java rename to src/main/java/org/apache/sling/pipes/internal/XPathPipe.java index 5b7cddf..fd0dd28 100644 --- a/src/main/java/org/apache/sling/pipes/XPathPipe.java +++ b/src/main/java/org/apache/sling/pipes/internal/XPathPipe.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.commons.lang.StringUtils; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.BasePipe; +import org.apache.sling.pipes.Plumber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/apache/sling/pipes/FilterPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java similarity index 94% rename from src/test/java/org/apache/sling/pipes/FilterPipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java index 3a54204..f74a676 100644 --- a/src/test/java/org/apache/sling/pipes/FilterPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/FilterPipeTest.java @@ -14,18 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; + +import java.util.Iterator; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.AbstractPipeTest; +import org.apache.sling.pipes.Pipe; import org.junit.Test; -import java.util.Iterator; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * testing different kind of filters @@ -98,4 +102,4 @@ public class FilterPipeTest extends AbstractPipeTest { assertFalse("output has no resource...", resourceIterator.hasNext()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/JsonPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java similarity index 96% rename from src/test/java/org/apache/sling/pipes/JsonPipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java index 70527a5..b1d5d48 100644 --- a/src/test/java/org/apache/sling/pipes/JsonPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/JsonPipeTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.AbstractPipeTest; import org.junit.Before; import org.junit.Test; @@ -60,4 +61,4 @@ public class JsonPipeTest extends AbstractPipeTest { assertEquals("second resource should be two", "/content/json/array/two", second.getPath()); assertEquals("third resource should be three", "/content/json/array/three", third.getPath()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/MovePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java similarity index 96% rename from src/test/java/org/apache/sling/pipes/MovePipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java index 42e78cd..00ac561 100644 --- a/src/test/java/org/apache/sling/pipes/MovePipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.AbstractPipeTest; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -63,4 +64,4 @@ public class MovePipeTest extends AbstractPipeTest { Assert.assertTrue("new property path should exists", session.propertyExists(PATH_FRUITS + MOVED_NODE_PATH)); Assert.assertFalse("old property path should not", session.propertyExists(PATH_FRUITS + PN_INDEX)); } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java similarity index 95% rename from src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java index 3b29cd6..3e20a3a 100644 --- a/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/MultiPropertyPipeTest.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; +import org.apache.sling.pipes.AbstractPipeTest; +import org.apache.sling.pipes.Pipe; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/pipes/NotPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java similarity index 94% rename from src/test/java/org/apache/sling/pipes/NotPipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java index 11ac4ec..85f2114 100644 --- a/src/test/java/org/apache/sling/pipes/NotPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/NotPipeTest.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; +import org.apache.sling.pipes.AbstractPipeTest; import org.junit.Before; import org.junit.Test; @@ -39,4 +40,4 @@ public class NotPipeTest extends AbstractPipeTest { //not working referred pipe should stream input of the not pipe testOneResource(PATH_PIPE + "/notfailure", PATH_APPLE); } -} \ No newline at end of file +} 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 32f0d9e..41ab5e8 100644 --- a/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/PlumberServletTest.java @@ -35,7 +35,6 @@ import org.apache.sling.pipes.AbstractPipeTest; import org.apache.sling.pipes.BasePipe; import org.apache.sling.pipes.ContainerPipeTest; import org.apache.sling.pipes.OutputWriter; -import org.apache.sling.pipes.WritePipeTest; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/pipes/RemovePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java similarity index 95% rename from src/test/java/org/apache/sling/pipes/RemovePipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java index 7f5a745..5e63bbe 100644 --- a/src/test/java/org/apache/sling/pipes/RemovePipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/RemovePipeTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.AbstractPipeTest; +import org.apache.sling.pipes.Pipe; import org.junit.Before; import org.junit.Test; @@ -30,7 +32,7 @@ import static org.junit.Assert.*; /** * testing removal */ -public class RemovePipeTest extends AbstractPipeTest{ +public class RemovePipeTest extends AbstractPipeTest { @Before public void setUp() throws Exception { @@ -82,4 +84,4 @@ public class RemovePipeTest extends AbstractPipeTest{ assertNotNull("isnota pea should not be removed", isNotAPea); assertFalse("isnota pea color property should not be here", isNotAPea.adaptTo(ValueMap.class).containsKey("color")); } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java b/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java similarity index 93% rename from src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java index 54e9d05..c1287be 100644 --- a/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/SlingQueryPipeTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; +import org.apache.sling.pipes.AbstractPipeTest; import org.junit.Before; import org.junit.Test; @@ -37,4 +38,4 @@ public class SlingQueryPipeTest extends AbstractPipeTest { public void testChildren() throws Exception { assertTrue("this pipe should have an output", getOutput(PATH_PIPE + "/" + NN_SIMPLE).hasNext()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/WritePipeTest.java b/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java similarity index 97% rename from src/test/java/org/apache/sling/pipes/WritePipeTest.java rename to src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java index d102d65..fdb1d79 100644 --- a/src/test/java/org/apache/sling/pipes/WritePipeTest.java +++ b/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.internal; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.pipes.AbstractPipeTest; +import org.apache.sling.pipes.Pipe; import org.junit.Before; import org.junit.Test; @@ -115,4 +117,4 @@ public class WritePipeTest extends AbstractPipeTest { NodeIterator children = appleNode.getNodes(); assertTrue("Apple node should have children", children.hasNext()); } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
