From 9366c56328918728ad86c5bf571bb09113ed9203 Mon Sep 17 00:00:00 2001 From: David Turanski Date: Fri, 26 Aug 2011 15:40:26 -0400 Subject: [PATCH] INT-2075 made changes for the new SGF class names --- docs/src/reference/docbook/gemfire.xml | 18 ++++++++---------- .../GemfireCqInboundChannelAdapterParser.java | 2 +- .../ContinuousQueryMessageProducer.java | 16 ++++++++-------- .../xml/spring-integration-gemfire-2.1.xsd | 6 +++--- .../ContinuousQueryMessageProducerTests.java | 6 +++--- .../CqInboundChannelAdapterTests-context.xml | 6 +++--- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/docs/src/reference/docbook/gemfire.xml b/docs/src/reference/docbook/gemfire.xml index 7beebcd092..acf85d86a9 100644 --- a/docs/src/reference/docbook/gemfire.xml +++ b/docs/src/reference/docbook/gemfire.xml @@ -55,8 +55,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/gemfire Continuous Query Inbound Channel Adapter The cq-inbound-channel-adapter produces messages a channel triggered by a GemFire continuous query or CqEvent event. Spring GemFire introduced - continuous query support in release 1.1, including a QueryListenerContainer which provides a nice abstraction over the GemFire native API. This adapter requires a - reference to a QueryListenerContainer, and creates a listener for a given query and executes the query. The continuous query acts as an event source that will fire whenever its + continuous query support in release 1.1, including a ContinuousQueryListenerContainer which provides a nice abstraction over the GemFire native API. This adapter requires a + reference to a ContinuousQueryListenerContainer, and creates a listener for a given query and executes the query. The continuous query acts as an event source that will fire whenever its result set changes state. GemFire queries are written in OQL and are scoped to the entire cache (not just one region). Additionally, continuous queries require a remote (i.e., running in a separate process or remote host) @@ -74,20 +74,18 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/gemfire - - - - + + ]]> In the above configuration, we are creating a GemFire client cache - (recall a cache server is required for this implementation and its address is configured as a sub-element of the pool), a client region and a QueryListenerContainer - using Spring GemFire. The continuous query inbound channel adapter requires a query-listener-container attribute which contains a reference to the QueryListenerContainer. Optionally, + (recall a cache server is required for this implementation and its address is configured as a sub-element of the pool), a client region and a ContinuousQueryListenerContainer + using Spring GemFire. The continuous query inbound channel adapter requires a cq-listener-container attribute which contains a reference to the ContinuousQueryListenerContainer. Optionally, it accepts an expression attribute which uses SpEL to transform the CqEvent or extract an individual property as needed. The cq-inbound-channel-adapter provides a query-events attribute, containing a comma separated list of event types for which a message will be produced on the input channel. Available event types are CREATED, UPDATED, DESTROYED, REGION_DESTROYED, REGION_INVALIDATED. CREATED and UPDATED are enabled by default. Additional optional attributes include, query-name which provides an optional query name, and diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParser.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParser.java index 1a5bee3ae9..1b5028d813 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParser.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParser.java @@ -32,7 +32,7 @@ public class GemfireCqInboundChannelAdapterParser extends AbstractChannelAdapter private static final String OUTPUT_CHANNEL_PROPERTY = "outputChannel"; - private static final String QUERY_LISTENER_CONTAINER_ATTRIBUTE = "query-listener-container"; + private static final String QUERY_LISTENER_CONTAINER_ATTRIBUTE = "cq-listener-container"; private static final String DURABLE_ATTRIBUTE = "durable"; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java index a45db191c9..c340a3e228 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java @@ -22,9 +22,9 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.data.gemfire.listener.CqQueryDefinition; -import org.springframework.data.gemfire.listener.QueryListener; -import org.springframework.data.gemfire.listener.QueryListenerContainer; +import org.springframework.data.gemfire.listener.ContinuousQueryDefinition; +import org.springframework.data.gemfire.listener.ContinuousQueryListener; +import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; @@ -42,12 +42,12 @@ import com.gemstone.gemfire.cache.query.CqEvent; * @since 2.1 * */ -public class ContinuousQueryMessageProducer extends SpelMessageProducerSupport implements QueryListener { +public class ContinuousQueryMessageProducer extends SpelMessageProducerSupport implements ContinuousQueryListener { private static Log logger = LogFactory.getLog(ContinuousQueryMessageProducer.class); private final String query; - private final QueryListenerContainer queryListenerContainer; + private final ContinuousQueryListenerContainer queryListenerContainer; private volatile String queryName; @@ -62,7 +62,7 @@ public class ContinuousQueryMessageProducer extends SpelMessageProducerSupport i * {@link org.springframework.data.gemfire.listener.QueryListenerContainer} * @param query the query string */ - public ContinuousQueryMessageProducer(QueryListenerContainer queryListenerContainer, String query) { + public ContinuousQueryMessageProducer(ContinuousQueryListenerContainer queryListenerContainer, String query) { Assert.notNull(queryListenerContainer, "'queryListenerContainer' cannot be null"); Assert.notNull(query, "'query' cannot be null"); this.queryListenerContainer = queryListenerContainer; @@ -94,10 +94,10 @@ public class ContinuousQueryMessageProducer extends SpelMessageProducerSupport i protected void onInit() { super.onInit(); if (queryName == null) { - queryListenerContainer.addListener(new CqQueryDefinition(this.query, this, this.durable)); + queryListenerContainer.addListener(new ContinuousQueryDefinition(this.query, this, this.durable)); } else { - queryListenerContainer.addListener(new CqQueryDefinition(this.queryName, this.query, this, this.durable)); + queryListenerContainer.addListener(new ContinuousQueryDefinition(this.queryName, this.query, this, this.durable)); } } diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd index 067ee10ae4..d6ea9db984 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd @@ -69,15 +69,15 @@ - + + type="org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer" /> diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java index 4387b55cf2..7d6ffe9934 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java @@ -17,7 +17,7 @@ import static org.mockito.Mockito.mock; import org.junit.Before; import org.junit.Test; -import org.springframework.data.gemfire.listener.QueryListenerContainer; +import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; @@ -33,7 +33,7 @@ import com.gemstone.gemfire.cache.query.internal.CqQueryImpl; * @since 2.1 */ public class ContinuousQueryMessageProducerTests { - QueryListenerContainer queryListenerContainer; + ContinuousQueryListenerContainer queryListenerContainer; ContinuousQueryMessageProducer cqMessageProducer; @@ -41,7 +41,7 @@ public class ContinuousQueryMessageProducerTests { @Before public void setUp() { - queryListenerContainer = mock(QueryListenerContainer.class); + queryListenerContainer = mock(ContinuousQueryListenerContainer.class); cqMessageProducer = new ContinuousQueryMessageProducer(queryListenerContainer, ""); DirectChannel outputChannel = new DirectChannel(); cqMessageProducer.setOutputChannel(outputChannel); diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests-context.xml index cc429d1124..52bd784ddf 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests-context.xml +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests-context.xml @@ -19,18 +19,18 @@ - + - -