Author: npeltier
Date: Thu Jul 13 18:58:29 2017
New Revision: 1801865
URL: http://svn.apache.org/viewvc?rev=1801865&view=rev
Log:
SLING-7008 remove private package import
Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1801865&r1=1801864&r2=1801865&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Jul 13 18:58:29 2017
@@ -55,7 +55,6 @@
<instructions>
<Import-Package>
org.apache.sling.distribution;resolution:=optional,
- org.apache.sling.query;version=3.0.0,
*
</Import-Package>
<Embed-Dependency>
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java?rev=1801865&r1=1801864&r2=1801865&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
(original)
+++
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PathPipe.java
Thu Jul 13 18:58:29 2017
@@ -24,7 +24,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.pipes.BasePipe;
import org.apache.sling.pipes.Plumber;
-import org.apache.sling.query.util.IteratorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +70,7 @@ public class PathPipe extends BasePipe {
String expression = getExpr();
try {
String path = expression.startsWith(SLASH) ? expression :
getInput().getPath() + SLASH + expression;
- output =
IteratorUtils.singleElementIterator(ResourceUtil.getOrCreateResource(resolver,
path, resourceType, intermediateType, autosave));
+ output =
Collections.singleton(ResourceUtil.getOrCreateResource(resolver, path,
resourceType, intermediateType, autosave)).iterator();
} catch (PersistenceException e){
logger.error ("Not able to create path {}", expression, e);
}