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 21469665aecab1977be0f226bc2713337855cbbe Author: Oliver Lietz <[email protected]> AuthorDate: Thu Sep 29 18:32:41 2016 +0000 move DefaultOutputWriter and PlumberServlet to package impl git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1762824 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/pipes/BasePipe.java | 12 +++++----- .../org/apache/sling/pipes/impl/CustomWriter.java | 7 +++--- .../pipes/{ => impl}/DefaultOutputWriter.java | 10 ++++---- .../sling/pipes/{ => impl}/PlumberServlet.java | 28 ++++++++++++++-------- .../org/apache/sling/pipes/AbstractPipeTest.java | 7 +++--- .../sling/pipes/{ => impl}/PlumberServletTest.java | 21 +++++++++------- 6 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/apache/sling/pipes/BasePipe.java b/src/main/java/org/apache/sling/pipes/BasePipe.java index e256daf..a5101da 100644 --- a/src/main/java/org/apache/sling/pipes/BasePipe.java +++ b/src/main/java/org/apache/sling/pipes/BasePipe.java @@ -16,6 +16,11 @@ */ package org.apache.sling.pipes; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + import org.apache.commons.lang.StringUtils; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; @@ -23,18 +28,13 @@ import org.apache.sling.api.resource.ValueMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - /** * provides generic utilities for a pipe */ public class BasePipe implements Pipe { Logger logger = LoggerFactory.getLogger(BasePipe.class); public static final String RESOURCE_TYPE = "slingPipes/base"; - protected static final String DRYRUN_KEY = "dryRun"; + public static final String DRYRUN_KEY = "dryRun"; protected static final String DRYRUN_EXPR = "${" + DRYRUN_KEY + "}"; protected ResourceResolver resolver; diff --git a/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java b/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java index dfa35a9..de556a2 100644 --- a/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java +++ b/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java @@ -16,15 +16,14 @@ */ package org.apache.sling.pipes.impl; +import java.util.HashMap; +import java.util.Map; + import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.commons.json.JSONException; import org.apache.sling.pipes.BasePipe; -import org.apache.sling.pipes.DefaultOutputWriter; - -import java.util.HashMap; -import java.util.Map; /** * writes current resource, dubbing a given child resource "writer" property/value pairs, allowing expressions diff --git a/src/main/java/org/apache/sling/pipes/DefaultOutputWriter.java b/src/main/java/org/apache/sling/pipes/impl/DefaultOutputWriter.java similarity index 94% rename from src/main/java/org/apache/sling/pipes/DefaultOutputWriter.java rename to src/main/java/org/apache/sling/pipes/impl/DefaultOutputWriter.java index b743899..c1c9460 100644 --- a/src/main/java/org/apache/sling/pipes/DefaultOutputWriter.java +++ b/src/main/java/org/apache/sling/pipes/impl/DefaultOutputWriter.java @@ -14,15 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.impl; + +import java.io.IOException; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.resource.Resource; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.io.JSONWriter; - -import java.io.IOException; +import org.apache.sling.pipes.OutputWriter; +import org.apache.sling.pipes.Pipe; /** * default output writer with size and output resources' path @@ -60,4 +62,4 @@ public class DefaultOutputWriter implements OutputWriter { writer.key(KEY_SIZE).value(size); writer.endObject(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/apache/sling/pipes/PlumberServlet.java b/src/main/java/org/apache/sling/pipes/impl/PlumberServlet.java similarity index 93% rename from src/main/java/org/apache/sling/pipes/PlumberServlet.java rename to src/main/java/org/apache/sling/pipes/impl/PlumberServlet.java index b1529b6..55b6c60 100644 --- a/src/main/java/org/apache/sling/pipes/PlumberServlet.java +++ b/src/main/java/org/apache/sling/pipes/impl/PlumberServlet.java @@ -14,7 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.pipes; +package org.apache.sling.pipes.impl; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import javax.servlet.ServletException; import org.apache.commons.lang.StringUtils; import org.apache.felix.scr.annotations.Reference; @@ -26,17 +33,18 @@ 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.impl.CustomJsonWriter; -import org.apache.sling.pipes.impl.CustomWriter; +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; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - /** * Servlet executing plumber for a pipe path given as 'path' parameter, * it can also be launched against a container pipe resource directly (no need for path parameter) @@ -137,4 +145,4 @@ public class PlumberServlet extends SlingAllMethodsServlet { } return null; } -} \ No newline at end of file +} diff --git a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java index 5aab25d..072b34b 100644 --- a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java +++ b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java @@ -16,6 +16,8 @@ */ package org.apache.sling.pipes; +import java.util.Iterator; + import org.apache.sling.api.resource.Resource; import org.apache.sling.pipes.dummies.DummyNull; import org.apache.sling.pipes.dummies.DummySearch; @@ -25,8 +27,6 @@ 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; @@ -44,7 +44,8 @@ public class AbstractPipeTest { protected static final String NN_SIMPLE = "simple"; protected static final String NN_COMPLEX = "complex"; protected static final String PN_INDEX = "/index"; - Plumber plumber; + + protected Plumber plumber; @Rule public SlingContext context = new SlingContext(ResourceResolverType.JCR_MOCK); diff --git a/src/test/java/org/apache/sling/pipes/PlumberServletTest.java b/src/test/java/org/apache/sling/pipes/impl/PlumberServletTest.java similarity index 96% rename from src/test/java/org/apache/sling/pipes/PlumberServletTest.java rename to src/test/java/org/apache/sling/pipes/impl/PlumberServletTest.java index 01fb83f..a11f7fc 100644 --- a/src/test/java/org/apache/sling/pipes/PlumberServletTest.java +++ b/src/test/java/org/apache/sling/pipes/impl/PlumberServletTest.java @@ -14,7 +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.impl; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; + +import javax.servlet.ServletException; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; @@ -25,15 +31,14 @@ import org.apache.sling.api.resource.ValueMap; 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.pipes.impl.CustomWriter; +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; -import javax.servlet.ServletException; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -44,7 +49,7 @@ import static org.mockito.Mockito.when; /** * testing the servlet logic (parameters & output) */ -public class PlumberServletTest extends AbstractPipeTest { +public class PlumberServletTest extends AbstractPipeTest { String containersPath = PATH_PIPE + "/" + "containers"; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
