[camel] 02/02: CAMEL-15122: camel-jslt - providing custom object filtering

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2265a4e6e85cca33b9a44a84f1050761fd13fcf0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 28 06:08:44 2020 +0200

    CAMEL-15122: camel-jslt - providing custom object filtering
---
 .../org/apache/camel/component/jslt/JsltComponent.java  | 17 ++++++++---------
 .../org/apache/camel/component/jslt/JsltEndpoint.java   |  6 ++----
 .../camel/component/jslt/JsltObjectFilterTest.java      |  9 ++++-----
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git 
a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltComponent.java
 
b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltComponent.java
index 3a42457..5b96060 100644
--- 
a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltComponent.java
+++ 
b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltComponent.java
@@ -19,15 +19,14 @@ package org.apache.camel.component.jslt;
 import java.util.Collection;
 import java.util.Map;
 
+import com.schibsted.spt.data.jslt.Function;
+import com.schibsted.spt.data.jslt.filters.JsonFilter;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.support.ResourceHelper;
 
-import com.schibsted.spt.data.jslt.Function;
-import com.schibsted.spt.data.jslt.filters.JsonFilter;
-
 @Component("jslt")
 public class JsltComponent extends DefaultComponent {
 
@@ -59,13 +58,13 @@ public class JsltComponent extends DefaultComponent {
         return answer;
     }
 
-    /**
-     * JSLT can be extended by plugging in functions written in Java.
-     */
     public Collection<Function> getFunctions() {
         return functions;
     }
 
+    /**
+     * JSLT can be extended by plugging in functions written in Java.
+     */
     public void setFunctions(Collection<Function> functions) {
         this.functions = functions;
     }
@@ -84,13 +83,13 @@ public class JsltComponent extends DefaultComponent {
         this.allowTemplateFromHeader = allowTemplateFromHeader;
     }
 
-    /**
-    * JSLT can be extended by plugging in a custom jslt object filter
-    */
     public JsonFilter getObjectFilter() {
         return objectFilter;
     }
 
+    /**
+     * JSLT can be extended by plugging in a custom jslt object filter
+     */
     public void setObjectFilter(JsonFilter objectFilter) {
         this.objectFilter = objectFilter;
     }
diff --git 
a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
 
b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
index 15cecdb..a64bfae 100644
--- 
a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
+++ 
b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.jslt;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -39,6 +38,7 @@ import org.apache.camel.ValidationException;
 import org.apache.camel.component.ResourceEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -103,9 +103,7 @@ public class JsltEndpoint extends ResourceEndpoint {
                 }
                 this.transform = parser.compile();
             } finally {
-                if(stream != null){
-                    stream.close();
-                }
+                IOHelper.close(stream);
             }
         }
         return transform;
diff --git 
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
 
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
index 46b1275..fc4f7a3 100644
--- 
a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
+++ 
b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltObjectFilterTest.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.component.jslt;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
-
 import com.schibsted.spt.data.jslt.Expression;
 import com.schibsted.spt.data.jslt.Parser;
 import com.schibsted.spt.data.jslt.filters.JsltJsonFilter;
 import com.schibsted.spt.data.jslt.filters.JsonFilter;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.ResourceHelper;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
 import org.junit.Test;