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 591ecbd SLING-11278 switch to commons collections 4 (#16)
591ecbd is described below
commit 591ecbd3674e4b258f5cd211e660ceb1a1477425
Author: Stefan Seifert <[email protected]>
AuthorDate: Wed May 4 11:34:50 2022 +0200
SLING-11278 switch to commons collections 4 (#16)
---
pom.xml | 18 ++++++------------
.../org/apache/sling/pipes/internal/FilterPipe.java | 2 +-
.../org/apache/sling/pipes/internal/PackagePipe.java | 2 +-
.../org/apache/sling/pipes/internal/PlumberImpl.java | 2 +-
.../org/apache/sling/pipes/internal/TraversePipe.java | 2 +-
.../sling/pipes/internal/inputstream/JsonPipe.java | 5 +++--
.../org/apache/sling/pipes/internal/MovePipeTest.java | 2 +-
.../apache/sling/pipes/internal/TraversePipeTest.java | 2 +-
.../org/apache/sling/pipes/internal/WritePipeTest.java | 2 +-
.../sling/pipes/internal/inputstream/CsvPipeTest.java | 2 +-
.../pipes/internal/inputstream/RegexpPipeTest.java | 2 +-
.../java/org/apache/sling/pipes/it/PipeBuilderIT.java | 2 +-
.../org/apache/sling/pipes/it/PipesTestSupport.java | 3 +++
13 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5969637..fcd747e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,9 +212,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -272,13 +272,13 @@
</dependency>
<dependency>
<artifactId>org.apache.sling.caconfig.api</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<groupId>org.apache.sling</groupId>
<scope>provided</scope>
</dependency>
<dependency>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
- <version>1.4.10</version>
+ <version>1.5.0</version>
<groupId>org.apache.sling</groupId>
<scope>provided</scope>
</dependency>
@@ -411,13 +411,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
<scope>test</scope>
- <version>1.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.4.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
b/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
index 2526b71..3becf9c 100644
--- a/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/FilterPipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.pipes.BasePipe;
diff --git a/src/main/java/org/apache/sling/pipes/internal/PackagePipe.java
b/src/main/java/org/apache/sling/pipes/internal/PackagePipe.java
index 50afd86..c96ebba 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PackagePipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PackagePipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
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 3860212..d85e39b 100644
--- a/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
+++ b/src/main/java/org/apache/sling/pipes/internal/PlumberImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.SlingHttpServletRequest;
diff --git a/src/main/java/org/apache/sling/pipes/internal/TraversePipe.java
b/src/main/java/org/apache/sling/pipes/internal/TraversePipe.java
index 2795c94..7410a66 100644
--- a/src/main/java/org/apache/sling/pipes/internal/TraversePipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/TraversePipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.pipes.BasePipe;
diff --git
a/src/main/java/org/apache/sling/pipes/internal/inputstream/JsonPipe.java
b/src/main/java/org/apache/sling/pipes/internal/inputstream/JsonPipe.java
index d7ce8a4..6268ec7 100644
--- a/src/main/java/org/apache/sling/pipes/internal/inputstream/JsonPipe.java
+++ b/src/main/java/org/apache/sling/pipes/internal/inputstream/JsonPipe.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal.inputstream;
-import org.apache.commons.collections.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
@@ -93,6 +93,7 @@ public class JsonPipe extends AbstractInputStreamPipe {
* @return input resource of the pipe, can be reouputed N times in case
output json binding is an array of
* N element (output binding would be here each time the Nth element of
the array)
*/
+ @Override
public Iterator<Resource> getOutput(InputStream is) {
Iterator<Resource> output = EMPTY_ITERATOR;
Iterator<Resource> inputSingletonIterator =
Collections.singleton(getInput()).iterator();
@@ -134,7 +135,7 @@ public class JsonPipe extends AbstractInputStreamPipe {
jsonValues = json.getValueType() == ValueType.ARRAY ?
((JsonArray)
json).stream().map(JsonUtil::unbox).collect(Collectors.toList()):
((JsonObject) json).entrySet().stream()
- .map(e -> new DefaultKeyValue(e.getKey(),
+ .map(e -> new
DefaultKeyValue<String,Collection<Object>>(e.getKey(),
JsonUtil.unbox(e.getValue()))).collect(Collectors.toList());
internal = jsonValues.iterator();
this.inputResource = inputResource;
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 907b29f..c831f62 100644
--- a/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/MovePipeTest.java
@@ -19,7 +19,7 @@ package org.apache.sling.pipes.internal;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
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 c22030f..3bd3b61 100644
--- a/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/TraversePipeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
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 9db23a4..6ab798f 100644
--- a/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/internal/WritePipeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
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 43e28f5..a29fdbb 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
@@ -17,7 +17,7 @@
package org.apache.sling.pipes.internal.inputstream;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
import org.apache.sling.pipes.ExecutionResult;
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 79dc17b..26b79b7 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
@@ -16,7 +16,7 @@
*/
package org.apache.sling.pipes.internal.inputstream;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.AbstractPipeTest;
import org.apache.sling.pipes.Pipe;
diff --git a/src/test/java/org/apache/sling/pipes/it/PipeBuilderIT.java
b/src/test/java/org/apache/sling/pipes/it/PipeBuilderIT.java
index dc897a8..e5a699d 100644
--- a/src/test/java/org/apache/sling/pipes/it/PipeBuilderIT.java
+++ b/src/test/java/org/apache/sling/pipes/it/PipeBuilderIT.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class PipeBuilderIT extends PipesTestSupport {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PlumberTestIT.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(PipeBuilderIT.class);
@Test
public void traverseTest() throws Exception {
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 a0be1cd..0996f6d 100644
--- a/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
+++ b/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
@@ -97,6 +97,9 @@ public abstract class PipesTestSupport extends TestSupport {
mavenBundle().groupId("com.google.code.gson").artifactId("gson").versionAsInProject(),
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
+
mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").versionAsInProject(),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.caconfig.api").versionAsInProject(),
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.caconfig.impl").versionAsInProject(),
junitBundles()
);
}
