Spring/spring-integration-extensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INTEXT-15: Rename the xq-datasource attribute to data-source

Browse Source
This commit is contained in:
Amol Nayak
2012-08-21 23:03:46 +05:30
parent 0d61dc2da3
commit 9fe993b4bd
29 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-xquery/README.md
View File

@@ -89,11 +89,11 @@ The value or the expression to find the value for these named parameters is spec
input-channel="xpathRouterOne"
xquery="'Hello World'"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
<int-xquery:xquery-parameter name="name" ref="name"/>
</int-xquery:xquery-router>
The above config now specifies the *xquery* attribute to specify the query. It additionally has the *converter* and the *xq-datasource* attributes. The *converter* holds a reference to the bean which implements the `org.springframework.integration.xml.DefaultXmlPayloadConverter` interface. By default it uses `org.springframework.integration.xml.DefaultXmlPayloadConverter` Please note that this interface and the implementation is from **spring-integration-xml** project. The *xq-datasource* attribute holds a reference to a bean that implements the `javax.xml.xquery.XQDataSource` interface. By default it will use `net.sf.saxon.xqj.SaxonXQDataSource` implementation.
The above config now specifies the *xquery* attribute to specify the query. It additionally has the *converter* and the *data-source* attributes. The *converter* holds a reference to the bean which implements the `org.springframework.integration.xml.DefaultXmlPayloadConverter` interface. By default it uses `org.springframework.integration.xml.DefaultXmlPayloadConverter` Please note that this interface and the implementation is from **spring-integration-xml** project. The *data-source* attribute holds a reference to a bean that implements the `javax.xml.xquery.XQDataSource` interface. By default it will use `net.sf.saxon.xqj.SaxonXQDataSource` implementation.
#### With **xquery-file-resource** attribute
@@ -101,7 +101,7 @@ The above config now specifies the *xquery* attribute to specify the query. It a
input-channel="xpathRouterOne"
xquery-file-resource="org/springframework/integration/xquery/XQuery.xq"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
<int-xquery:xquery-parameter name="name" expression="headers['name']"/>
<int-xquery:xquery-parameter name="class" value="1"/>
</int-xquery:xquery-router>
@@ -145,7 +145,7 @@ Similar to routers, transformers too support accepting the xquery as a child sub
output-channel="output"
xquery="'Hello World'"
converter="converter"
xq-datasource="xqDs"
data-source="xqDs"
format-output="true">
</int-xquery:xquery-transformer>
@@ -158,7 +158,7 @@ An additional attibute *format-output* is mentioned, the value could be *true* o
output-channel="output"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQueryTransform.xq"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
</int-xquery:xquery-transformer>
###Credits

3
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/IntegrationXQueryNamespaceHandler.java
View File

@@ -21,7 +21,8 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
* The namespace handler for the "int-xquery" namespace
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class IntegrationXQueryNamespaceHandler extends

7
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryParserUtils.java
View File

@@ -40,15 +40,16 @@ import org.w3c.dom.NodeList;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryParserUtils {
public final class XQueryParserUtils {
private XQueryParserUtils() {
//prevent instantiation
throw new AssertionError("Cannot instantiate a utility class");
}
/**
@@ -59,7 +60,7 @@ public class XQueryParserUtils {
public static final AbstractBeanDefinition getXQueryExecutor(Element element) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XQueryExecutor.class);
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "converter");
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "xq-datasource","xQDataSource");
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "data-source","xQDataSource");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "format-output");
setXQueryInBuilder(element, builder);
//lets get the parameter nodes

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryRouterParser.java
View File

@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryRouterParser extends AbstractRouterParser {

3
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParser.java
View File

@@ -28,7 +28,8 @@ import org.w3c.dom.Node;
* The parser for the XQuery transformer component
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class XQueryTransformerParser extends AbstractTransformerParser {

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/core/XQueryExecutor.java
View File

@@ -61,7 +61,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryExecutor implements InitializingBean,BeanClassLoaderAware {

3
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/router/XQueryRouter.java
View File

@@ -28,7 +28,8 @@ import org.springframework.util.Assert;
* to which the message will be routed
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class XQueryRouter extends AbstractMappingMessageRouter {

7
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/AbstractXQueryResultMapper.java
View File

@@ -48,10 +48,8 @@ import java.math.BigInteger;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.xquery.XQException;
@@ -65,7 +63,8 @@ import org.w3c.dom.Node;
/**
* The absract base class for {@link XQueryResultMapper} implementations
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public abstract class AbstractXQueryResultMapper<T> implements XQueryResultMapper<T> {
@@ -258,8 +257,6 @@ public abstract class AbstractXQueryResultMapper<T> implements XQueryResultMappe
/**Transforms the given {@link Node} to a String
* @param n
* @return
* @throws TransformerConfigurationException
* @throws TransformerFactoryConfigurationError
* @throws TransformerException
*/
protected String transformNodeToString(Node n)

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/BooleanResultMapper.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class BooleanResultMapper extends AbstractXQueryResultMapper<Boolean> {

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NodeResultMapper.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class NodeResultMapper extends AbstractXQueryResultMapper<Node> {

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NumberResultMapper.java
View File

@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class NumberResultMapper extends AbstractXQueryResultMapper<Number> {

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/StringResultMapper.java
View File

@@ -29,7 +29,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class StringResultMapper extends AbstractXQueryResultMapper<String> {

3
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryParameter.java
View File

@@ -28,7 +28,8 @@ import org.springframework.util.StringUtils;
* instance
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class XQueryParameter {

3
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryResultMapper.java
View File

@@ -24,7 +24,8 @@ import javax.xml.xquery.XQResultSequence;
* returned by XQuery execution to a List of the specified type
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public interface XQueryResultMapper<T> {

4
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryUtils.java
View File

@@ -34,10 +34,10 @@ import org.springframework.util.Assert;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryUtils {
public final class XQueryUtils {
private static final Log logger = LogFactory.getLog(XQueryUtils.class);

2
spring-integration-xquery/src/main/java/org/springframework/integration/xquery/transformer/XQueryTransformer.java
View File

@@ -41,7 +41,7 @@ import org.w3c.dom.Node;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
@SuppressWarnings("rawtypes")

4
spring-integration-xquery/src/main/resources/META-INF/spring.schemas
View File

@@ -1,2 +1,2 @@
http\://www.springframework.org/schema/integration/xquery/spring-integration-xquery-2.2.xsd=org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd
http\://www.springframework.org/schema/integration/xquery/spring-integration-xquery.xsd=org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd
http\://www.springframework.org/schema/integration/xquery/spring-integration-xquery-1.0.xsd=org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd
http\://www.springframework.org/schema/integration/xquery/spring-integration-xquery.xsd=org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd

7
spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd → spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd
View File

@@ -53,7 +53,7 @@
the xquery components
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="xq-datasource" type="xsd:string"
<xsd:attribute name="data-source" type="xsd:string"
use="optional">
<xsd:annotation>
<xsd:documentation>
@@ -63,6 +63,11 @@
provided, then the default
implementation will be used.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.xml.xquery.XQDataSource" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="xquery-file-resource" type="xsd:string"

3
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/DummyXmlPayloadConverter.java
View File

@@ -25,7 +25,8 @@ import org.w3c.dom.Node;
* The Dummy Xml payload converter class that would be used for parser tests
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class DummyXmlPayloadConverter implements XmlPayloadConverter {

2
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/config/xml/XQueryRouterParserTests.java
View File

@@ -38,7 +38,7 @@ import org.springframework.integration.xquery.support.XQueryParameter;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryRouterParserTests {

2
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests.java
View File

@@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
@ContextConfiguration

3
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/core/AbstractXQueryExecutorTests.java
View File

@@ -46,7 +46,8 @@ import org.w3c.dom.Node;
* The base test class for the XQueryExecutor tests
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public abstract class AbstractXQueryExecutorTests {

2
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/core/SaxonXQueryExecutorTests.java
View File

@@ -22,7 +22,7 @@ package org.springframework.integration.xquery.core;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class SaxonXQueryExecutorTests extends AbstractXQueryExecutorTests {

2
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/core/SednaXQueryExecutorTests.java
View File

@@ -42,7 +42,7 @@ import net.xqj.sedna.SednaXQDataSource;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class SednaXQueryExecutorTests extends AbstractXQueryExecutorTests {

3
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/router/XQueryRouterTests.java
View File

@@ -29,7 +29,8 @@ import org.springframework.integration.xquery.core.XQueryExecutor;
* The Test class for the XQuery router
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class XQueryRouterTests {

2
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/support/XQueryParameterTests.java
View File

@@ -31,7 +31,7 @@ import org.springframework.integration.test.util.TestUtils;
*
* @author Amol Nayak
*
* @since 2.2
* @since 1.0
*
*/
public class XQueryParameterTests {

3
spring-integration-xquery/src/test/java/org/springframework/integration/xquery/transformer/XQueryTransformerTests.java
View File

@@ -34,7 +34,8 @@ import org.w3c.dom.Node;
* The Test class for the {@link XQueryTransformer} class
*
* @author Amol Nayak
* @since 2.2
*
* @since 1.0
*
*/
public class XQueryTransformerTests {

6
spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryRouterParserTests-context.xml
View File

@@ -28,7 +28,7 @@
input-channel="xpathRouterOne"
xquery="'Hello World'"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
<int-xquery:xquery-parameter name="name" ref="name"/>
</int-xquery:xquery-router>
@@ -36,7 +36,7 @@
input-channel="xpathRouterOne"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQuery.xq"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
<int-xquery:xquery-parameter name="name" expression="headers['name']"/>
<int-xquery:xquery-parameter name="class" value="1"/>
</int-xquery:xquery-router>
@@ -47,7 +47,7 @@
input-channel="xpathRouterOne"
xquery-file-resource="org/springframework/integration/xquery/XQuery.xq"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
<int-xquery:xquery-parameter name="name" expression="headers['name']"/>
<int-xquery:xquery-parameter name="class" value="1"/>
</int-xquery:xquery-router>

10
spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests-context.xml
View File

@@ -33,7 +33,7 @@
output-channel="output"
xquery="'Hello World'"
converter="converter"
xq-datasource="xqDs"
data-source="xqDs"
format-output="true">
</int-xquery:xquery-transformer>
@@ -42,7 +42,7 @@
output-channel="output"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQueryTransform.xq"
converter="converter"
xq-datasource="xqDs">
data-source="xqDs">
</int-xquery:xquery-transformer>
<int-xquery:xquery-transformer id="booleanResultTypeTransformer"
@@ -50,21 +50,21 @@
output-channel="output"
result-type="java.lang.Boolean"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQueryTransform.xq"
xq-datasource="xqDs"/>
data-source="xqDs"/>
<int-xquery:xquery-transformer id="stringResultTypeTransformer"
input-channel="stringResultTypeTransformerIP"
output-channel="output"
result-type="string"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQueryTransform.xq"
xq-datasource="xqDs"/>
data-source="xqDs"/>
<int-xquery:xquery-transformer id="customXQueryResultMapper"
input-channel="stringResultTypeTransformerIP"
output-channel="output"
xquery-result-mapper="xqueryResultMapper"
xquery-file-resource="classpath:org/springframework/integration/xquery/XQueryTransform.xq"
xq-datasource="xqDs"/>
data-source="xqDs"/>
<bean id="converter" class="org.springframework.integration.xquery.DummyXmlPayloadConverter"/>