You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/01/17 11:41:30 UTC
[camel] branch camel-3.11.x updated (35cef2c -> 2d69ae7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 35cef2c Regen for commit 97c8c96b847fb952835505aff91a7fb5f5dbcaa6 (#6747)
new 29b2b09 CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
new 2d69ae7 CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java | 3 ++-
.../component/jslt/{JsltBasicTest.java => JsltFileSourceTest.java} | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
copy components/camel-jslt/src/test/java/org/apache/camel/component/jslt/{JsltBasicTest.java => JsltFileSourceTest.java} (95%)
[camel] 01/02: CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29b2b09a470ede35e239828767eafc09e3154763
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 17 12:35:55 2022 +0100
CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
---
.../src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 afdd670..1c16e01 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
@@ -43,6 +43,7 @@ import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -101,7 +102,7 @@ public class JsltEndpoint extends ResourceEndpoint {
if (jsltStringFromHeader != null) {
parser = new Parser(new StringReader(jsltStringFromHeader)).withSource("<inline>");
} else {
- stream = JsltEndpoint.class.getClassLoader().getResourceAsStream(getResourceUri());
+ stream = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext(), getResourceUri());
if (stream == null) {
throw new JsltException("Cannot load resource '" + getResourceUri() + "': not found");
}
[camel] 02/02: CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2d69ae7274a677ec7de14ead9146651f5c6498dc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 17 12:36:08 2022 +0100
CAMEL-17485 - Camel-JSLT: Currently it could only load resources from classpath
---
.../camel/component/jslt/JsltFileSourceTest.java | 109 +++++++++++++++++++++
1 file changed, 109 insertions(+)
diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java
new file mode 100644
index 0000000..9a67145
--- /dev/null
+++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFileSourceTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jslt;
+
+import java.util.Collections;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.ResourceHelper;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit test based on the JSLT demo playground default values.
+ */
+public class JsltFileSourceTest extends CamelTestSupport {
+
+ @Test
+ public void testJsltAsInputStream() throws Exception {
+ getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+ getMockEndpoint("mock:result").expectedBodiesReceived(
+ IOHelper.loadText(
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/output.json"))
+ .trim() // Remove the last newline added by IOHelper.loadText()
+ );
+
+ sendBody("direct://start",
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/input.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testInvalidBody() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ //type integer is not allowed
+ sendBody("direct://start", 4);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testJsltAsText() throws Exception {
+ getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+ getMockEndpoint("mock:result").expectedBodiesReceived(
+ IOHelper.loadText(
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/output.json"))
+ .trim() // Remove the last newline added by IOHelper.loadText()
+ );
+
+ sendBody("direct://start",
+ IOHelper.loadText(ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/input.json")));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testJsltAsInputStreamPrettyPrint() throws Exception {
+ getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+ getMockEndpoint("mock:result").expectedBodiesReceived(
+ IOHelper.loadText(
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/outputPrettyPrint.json"))
+ .trim() // Remove the last newline added by IOHelper.loadText()
+ );
+
+ sendBody("direct://startPrettyPrint",
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context, "org/apache/camel/component/jslt/demoPlayground/input.json"),
+ Collections.singletonMap(JsltConstants.HEADER_JSLT_RESOURCE_URI,
+ "org/apache/camel/component/jslt/demoPlayground/transformation.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct://start")
+ .to("jslt:file:src/test/resources/org/apache/camel/component/jslt/demoPlayground/transformation.json")
+ .to("mock:result");
+
+ from("direct://startPrettyPrint")
+ .to("jslt:dummy?prettyPrint=true&allowTemplateFromHeader=true")
+ .to("mock:result");
+ }
+ };
+ }
+}