You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/31 12:00:32 UTC
svn commit: r1440905 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/language/xpath/
camel-core/src/main/java/org/apache/camel/support/
camel-core/src/test/java/org/apache/camel/language/
camel-core/src/test/resources/ components/camel-sax...
Author: davsclaus
Date: Thu Jan 31 11:00:31 2013
New Revision: 1440905
URL: http://svn.apache.org/viewvc?rev=1440905&view=rev
Log:
CAMEL-4629: Languages can now load script from external resource, such as file or classpath.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathResourceTest.java
- copied, changed from r1440898, camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleResourceTest.java
camel/trunk/camel-core/src/test/resources/myxpath.txt (with props)
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java (with props)
camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/LanguageSupport.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java?rev=1440905&r1=1440904&r2=1440905&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java Thu Jan 31 11:00:31 2013
@@ -20,27 +20,30 @@ import javax.xml.namespace.QName;
import javax.xml.xpath.XPathFactory;
import org.apache.camel.Expression;
-import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
import org.apache.camel.builder.xml.XPathBuilder;
-import org.apache.camel.spi.Language;
+import org.apache.camel.support.LanguageSupport;
/**
* XPath language.
*/
-public class XPathLanguage implements Language, IsSingleton {
+public class XPathLanguage extends LanguageSupport {
private QName resultType;
private XPathFactory xpathFactory;
private Boolean useSaxon;
private String objectModelUri;
public Predicate createPredicate(String expression) {
+ expression = loadResource(expression);
+
XPathBuilder builder = XPathBuilder.xpath(expression);
configureBuilder(builder);
return builder;
}
public Expression createExpression(String expression) {
+ expression = loadResource(expression);
+
XPathBuilder builder = XPathBuilder.xpath(expression);
configureBuilder(builder);
return builder;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/support/LanguageSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/LanguageSupport.java?rev=1440905&r1=1440904&r2=1440905&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/support/LanguageSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/LanguageSupport.java Thu Jan 31 11:00:31 2013
@@ -31,6 +31,8 @@ import org.apache.camel.util.ResourceHel
*/
public abstract class LanguageSupport implements Language, IsSingleton, CamelContextAware {
+ public static final String RESOURCE = "resource:";
+
private CamelContext camelContext;
public CamelContext getCamelContext() {
@@ -58,8 +60,8 @@ public abstract class LanguageSupport im
* @throws ExpressionIllegalSyntaxException is thrown if error loading the resource
*/
protected String loadResource(String expression) throws ExpressionIllegalSyntaxException {
- if (camelContext != null && expression.startsWith("resource:")) {
- String uri = expression.substring(9);
+ if (camelContext != null && expression.startsWith(RESOURCE)) {
+ String uri = expression.substring(RESOURCE.length());
InputStream is = null;
try {
is = ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext.getClassResolver(), uri);
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathResourceTest.java (from r1440898, camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleResourceTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathResourceTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathResourceTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleResourceTest.java&r1=1440898&r2=1440905&rev=1440905&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleResourceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathResourceTest.java Thu Jan 31 11:00:31 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.language.simple;
+package org.apache.camel.language;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -23,13 +23,13 @@ import org.junit.Test;
/**
*
*/
-public class SimpleResourceTest extends ContextTestSupport {
+public class XPathResourceTest extends ContextTestSupport {
@Test
- public void testSimpleResource() throws Exception {
- getMockEndpoint("mock:result").expectedBodiesReceived("The name is Camel");
+ public void testXPathResource() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("James");
- template.sendBody("direct:start", "Camel");
+ template.sendBody("direct:start", "<person><name>James</name><city>London</city></person>");
assertMockEndpointsSatisfied();
}
@@ -40,7 +40,7 @@ public class SimpleResourceTest extends
@Override
public void configure() throws Exception {
from("direct:start")
- .transform().simple("resource:classpath:mysimple.txt")
+ .transform().xpath("resource:classpath:myxpath.txt")
.to("mock:result");
}
};
Added: camel/trunk/camel-core/src/test/resources/myxpath.txt
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/myxpath.txt?rev=1440905&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/resources/myxpath.txt (added)
+++ camel/trunk/camel-core/src/test/resources/myxpath.txt Thu Jan 31 11:00:31 2013
@@ -0,0 +1 @@
+/person/name/text()
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/test/resources/myxpath.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/resources/myxpath.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java?rev=1440905&r1=1440904&r2=1440905&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java Thu Jan 31 11:00:31 2013
@@ -18,18 +18,20 @@ package org.apache.camel.component.xquer
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.spi.Language;
+import org.apache.camel.support.LanguageSupport;
/**
* @version
*/
-public class XQueryLanguage implements Language {
+public class XQueryLanguage extends LanguageSupport {
public Predicate createPredicate(String expression) {
+ expression = loadResource(expression);
return XQueryBuilder.xquery(expression);
}
public Expression createExpression(String expression) {
+ expression = loadResource(expression);
return XQueryBuilder.xquery(expression);
}
}
Added: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java?rev=1440905&view=auto
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java (added)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java Thu Jan 31 11:00:31 2013
@@ -0,0 +1,48 @@
+/**
+ * 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.builder.saxon;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class XQueryResourceTest extends CamelTestSupport {
+
+ @Test
+ public void testXPathResource() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("London");
+
+ template.sendBody("direct:start", "<person name='James' city='London'/>");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .transform().xquery("resource:classpath:myxquery.txt", String.class)
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt?rev=1440905&view=auto
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt (added)
+++ camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt Thu Jan 31 11:00:31 2013
@@ -0,0 +1 @@
+/person/@city
\ No newline at end of file
Propchange: camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-saxon/src/test/resources/myxquery.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain