From 9fe993b4bd621fc7096b3847f4ceadfa5f305d69 Mon Sep 17 00:00:00 2001 From: Amol Nayak Date: Tue, 21 Aug 2012 23:03:46 +0530 Subject: [PATCH] INTEXT-15: Rename the xq-datasource attribute to data-source --- spring-integration-xquery/README.md | 10 +++++----- .../config/xml/IntegrationXQueryNamespaceHandler.java | 3 ++- .../xquery/config/xml/XQueryParserUtils.java | 7 ++++--- .../xquery/config/xml/XQueryRouterParser.java | 2 +- .../xquery/config/xml/XQueryTransformerParser.java | 3 ++- .../integration/xquery/core/XQueryExecutor.java | 2 +- .../integration/xquery/router/XQueryRouter.java | 3 ++- .../xquery/support/AbstractXQueryResultMapper.java | 7 ++----- .../xquery/support/BooleanResultMapper.java | 2 +- .../integration/xquery/support/NodeResultMapper.java | 2 +- .../integration/xquery/support/NumberResultMapper.java | 2 +- .../integration/xquery/support/StringResultMapper.java | 2 +- .../integration/xquery/support/XQueryParameter.java | 3 ++- .../integration/xquery/support/XQueryResultMapper.java | 3 ++- .../integration/xquery/support/XQueryUtils.java | 4 ++-- .../xquery/transformer/XQueryTransformer.java | 2 +- .../src/main/resources/META-INF/spring.schemas | 4 ++-- ...query-2.2.xsd => spring-integration-xquery-1.0.xsd} | 7 ++++++- .../integration/xquery/DummyXmlPayloadConverter.java | 3 ++- .../xquery/config/xml/XQueryRouterParserTests.java | 2 +- .../config/xml/XQueryTransformerParserTests.java | 2 +- .../xquery/core/AbstractXQueryExecutorTests.java | 3 ++- .../xquery/core/SaxonXQueryExecutorTests.java | 2 +- .../xquery/core/SednaXQueryExecutorTests.java | 2 +- .../integration/xquery/router/XQueryRouterTests.java | 3 ++- .../xquery/support/XQueryParameterTests.java | 2 +- .../xquery/transformer/XQueryTransformerTests.java | 3 ++- .../config/xml/XQueryRouterParserTests-context.xml | 6 +++--- .../xml/XQueryTransformerParserTests-context.xml | 10 +++++----- 29 files changed, 59 insertions(+), 47 deletions(-) rename spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/{spring-integration-xquery-2.2.xsd => spring-integration-xquery-1.0.xsd} (97%) diff --git a/spring-integration-xquery/README.md b/spring-integration-xquery/README.md index 63827e8..d5fe536 100644 --- a/spring-integration-xquery/README.md +++ b/spring-integration-xquery/README.md @@ -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"> -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"> @@ -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"> @@ -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"> ###Credits diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/IntegrationXQueryNamespaceHandler.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/IntegrationXQueryNamespaceHandler.java index 6eeaac5..50972be 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/IntegrationXQueryNamespaceHandler.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/IntegrationXQueryNamespaceHandler.java @@ -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 diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryParserUtils.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryParserUtils.java index d13549a..f907ae7 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryParserUtils.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryParserUtils.java @@ -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 diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryRouterParser.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryRouterParser.java index d1bb16b..c22267f 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryRouterParser.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryRouterParser.java @@ -28,7 +28,7 @@ import org.w3c.dom.Element; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class XQueryRouterParser extends AbstractRouterParser { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParser.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParser.java index f3438cb..332266b 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParser.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/config/xml/XQueryTransformerParser.java @@ -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 { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/core/XQueryExecutor.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/core/XQueryExecutor.java index 8427364..c00bbe6 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/core/XQueryExecutor.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/core/XQueryExecutor.java @@ -61,7 +61,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class XQueryExecutor implements InitializingBean,BeanClassLoaderAware { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/router/XQueryRouter.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/router/XQueryRouter.java index d05397a..95fb1ba 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/router/XQueryRouter.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/router/XQueryRouter.java @@ -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 { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/AbstractXQueryResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/AbstractXQueryResultMapper.java index 463147a..f8de1e0 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/AbstractXQueryResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/AbstractXQueryResultMapper.java @@ -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 implements XQueryResultMapper { @@ -258,8 +257,6 @@ public abstract class AbstractXQueryResultMapper implements XQueryResultMappe /**Transforms the given {@link Node} to a String * @param n * @return - * @throws TransformerConfigurationException - * @throws TransformerFactoryConfigurationError * @throws TransformerException */ protected String transformNodeToString(Node n) diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/BooleanResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/BooleanResultMapper.java index e6be943..a025c6a 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/BooleanResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/BooleanResultMapper.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class BooleanResultMapper extends AbstractXQueryResultMapper { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NodeResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NodeResultMapper.java index 8c38f0b..f9d03a2 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NodeResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NodeResultMapper.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class NodeResultMapper extends AbstractXQueryResultMapper { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NumberResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NumberResultMapper.java index 960c5b5..35070bd 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NumberResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/NumberResultMapper.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class NumberResultMapper extends AbstractXQueryResultMapper { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/StringResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/StringResultMapper.java index 6014dfa..a2ed944 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/StringResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/StringResultMapper.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ public class StringResultMapper extends AbstractXQueryResultMapper { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryParameter.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryParameter.java index 191669c..d5a87bd 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryParameter.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryParameter.java @@ -28,7 +28,8 @@ import org.springframework.util.StringUtils; * instance * * @author Amol Nayak - * @since 2.2 + * + * @since 1.0 * */ public class XQueryParameter { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryResultMapper.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryResultMapper.java index 948a8ee..43925f5 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryResultMapper.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryResultMapper.java @@ -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 { diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryUtils.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryUtils.java index 56a8d4d..ed43e2f 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryUtils.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/support/XQueryUtils.java @@ -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); diff --git a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/transformer/XQueryTransformer.java b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/transformer/XQueryTransformer.java index f648f4a..55ee854 100644 --- a/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/transformer/XQueryTransformer.java +++ b/spring-integration-xquery/src/main/java/org/springframework/integration/xquery/transformer/XQueryTransformer.java @@ -41,7 +41,7 @@ import org.w3c.dom.Node; * * @author Amol Nayak * - * @since 2.2 + * @since 1.0 * */ @SuppressWarnings("rawtypes") diff --git a/spring-integration-xquery/src/main/resources/META-INF/spring.schemas b/spring-integration-xquery/src/main/resources/META-INF/spring.schemas index 5826a10..395fdc3 100644 --- a/spring-integration-xquery/src/main/resources/META-INF/spring.schemas +++ b/spring-integration-xquery/src/main/resources/META-INF/spring.schemas @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd b/spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd similarity index 97% rename from spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd rename to spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd index f90a7b9..a6be492 100644 --- a/spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-2.2.xsd +++ b/spring-integration-xquery/src/main/resources/org/springframework/integration/xquery/config/spring-integration-xquery-1.0.xsd @@ -53,7 +53,7 @@ the xquery components - @@ -63,6 +63,11 @@ provided, then the default implementation will be used. + + + + + + data-source="xqDs"> @@ -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"> @@ -47,7 +47,7 @@ input-channel="xpathRouterOne" xquery-file-resource="org/springframework/integration/xquery/XQuery.xq" converter="converter" - xq-datasource="xqDs"> + data-source="xqDs"> diff --git a/spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests-context.xml b/spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests-context.xml index b01e16e..451db30 100644 --- a/spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests-context.xml +++ b/spring-integration-xquery/src/test/resources/org/springframework/integration/xquery/config/xml/XQueryTransformerParserTests-context.xml @@ -33,7 +33,7 @@ output-channel="output" xquery="'Hello World'" converter="converter" - xq-datasource="xqDs" + data-source="xqDs" format-output="true"> @@ -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"> + data-source="xqDs"/> + data-source="xqDs"/> + data-source="xqDs"/>