[sling-org-apache-sling-pipes] branch master updated: minor sonar fixes

[npeltier]

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 7bf5f65  minor sonar fixes
7bf5f65 is described below

commit 7bf5f65097d52891a37f502a647c84f83a685d56
Author: Nicolas Peltier <npelt...@apache.org>
AuthorDate: Wed Mar 31 12:47:19 2021 +0200

    minor sonar fixes
---
 src/main/java/org/apache/sling/pipes/PipeBindings.java     | 4 ++--
 src/test/java/org/apache/sling/pipes/PipeBindingsTest.java | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/pipes/PipeBindings.java 
b/src/main/java/org/apache/sling/pipes/PipeBindings.java
index 52c9c1d..ebcaa78 100644
--- a/src/main/java/org/apache/sling/pipes/PipeBindings.java
+++ b/src/main/java/org/apache/sling/pipes/PipeBindings.java
@@ -82,7 +82,7 @@ public class PipeBindings {
 
     Map<String, String> nameBindings = new HashMap<>();
 
-    Map<String, Map> caconfigBindings = new HashMap<>();
+    Map<String, Map<String, Object>> caconfigBindings = new HashMap<>();
 
     Map<String, Resource> outputResources = new HashMap<>();
 
@@ -166,7 +166,7 @@ public class PipeBindings {
             }
             if (is != null) {
                 try {
-                    engine.eval(new InputStreamReader(is), scriptContext);
+                    getEngine().eval(new InputStreamReader(is), scriptContext);
                 } catch (Exception e) {
                     log.error("Add script: unable to evaluate script {}", 
path, e);
                 }
diff --git a/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java 
b/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
index 5b18e2c..f6529ef 100644
--- a/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
+++ b/src/test/java/org/apache/sling/pipes/PipeBindingsTest.java
@@ -20,7 +20,6 @@ import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.caconfig.MockContextAwareConfig;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;
@@ -118,7 +117,6 @@ public class PipeBindingsTest extends AbstractPipeTest {
     }
 
     @Test
-    @Ignore
     public void testAdditionalScript() throws Exception {
         context.load().binaryFile("/testSum.js", "/content/test/testSum.js");
         Resource resource = 
context.resourceResolver().getResource(MOREBINDINGS);
@@ -133,9 +131,9 @@ public class PipeBindingsTest extends AbstractPipeTest {
         Iterator<Resource> output = pipe.getOutput();
         output.next();
         PipeBindings bindings = pipe.getBindings();
-        assertEquals("first name binding should be apple", 
bindings.instantiateExpression("${name.dummyParent}"), "apple");
+        assertEquals("first name binding should be apple", "apple", 
bindings.instantiateExpression("${name.dummyParent}"));
         output.next();
-        assertEquals("second name binding should be banana", 
bindings.instantiateExpression("${name.dummyParent}"), "banana");
+        assertEquals("second name binding should be banana", "banana", 
bindings.instantiateExpression("${name.dummyParent}"));
     }
 
     @Test