diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/CycleDetectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/CycleDetectorTests.java index 06b8122114..f36be852ca 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/CycleDetectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/CycleDetectorTests.java @@ -50,7 +50,7 @@ public class CycleDetectorTests { CycleDetector builder = new CycleDetector(); builder.detectCycle(parent, "org.springframework.integration.transformer"); // should not throw an exception, however if you remove additional package from - // the above method there is a cycle in the domain model + // the above method there is a cycle in the domain core } @Test diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingController.java index 4dafe5a78c..77129a0367 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingController.java @@ -36,7 +36,7 @@ import org.springframework.web.servlet.mvc.Controller; * The {@link #setViewName(String) viewName} will be passed into the ModelAndView return value. *

* This endpoint will have request/reply behavior by default. That can be overridden by passing false to - * the constructor. In the request/reply case, the model map will be passed to the view, and it will contain either the + * the constructor. In the request/reply case, the core map will be passed to the view, and it will contain either the * reply Message or payload depending on the value of {@link #extractReplyPayload} (true by default, meaning just the * payload). The corresponding key in the map is determined by the {@link #replyKey} property (with a default of * "reply"). @@ -76,7 +76,7 @@ public class HttpRequestHandlingController extends HttpRequestHandlingEndpointSu } /** - * Specify the key to be used when adding the reply Message or payload to the model map (will be payload only unless + * Specify the key to be used when adding the reply Message or payload to the core map (will be payload only unless * the value of {@link HttpRequestHandlingController#setExtractReplyPayload(boolean)} is false). The * default key is "reply". */ @@ -85,7 +85,7 @@ public class HttpRequestHandlingController extends HttpRequestHandlingEndpointSu } /** - * The key used to expose {@link Errors} in the model, in the case that message handling fails. Defaults to + * The key used to expose {@link Errors} in the core, in the case that message handling fails. Defaults to * "errors". * @param errorsKey the key value to set */ diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java similarity index 92% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java index 5f8d48c739..e339bc4683 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageInboundEndpointParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundDirectMessageEndpointParser.java @@ -23,10 +23,10 @@ import org.w3c.dom.Element; import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE; -public class DirectMessageInboundEndpointParser extends AbstractSingleBeanDefinitionParser { +public class InboundDirectMessageEndpointParser extends AbstractSingleBeanDefinitionParser { @Override protected String getBeanClassName(Element element) { - return BASE_PACKAGE + ".InboundDirectMessageStatusEndpoint"; + return BASE_PACKAGE + ".inbound.InboundDirectMessageEndpoint"; } @Override diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java similarity index 92% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java index 51f14c46d2..4c78b027c7 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/MentionInboundEndpointParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundMentionEndpointParser.java @@ -23,10 +23,10 @@ import org.w3c.dom.Element; import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE; -public class MentionInboundEndpointParser extends AbstractSingleBeanDefinitionParser { +public class InboundMentionEndpointParser extends AbstractSingleBeanDefinitionParser { @Override protected String getBeanClassName(Element element) { - return BASE_PACKAGE + ".InboundMentionStatusEndpoint"; + return BASE_PACKAGE + ".inbound.InboundMentionEndpoint"; } @Override diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java similarity index 91% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java index 9432db6a15..6ec7b91f92 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusInboundEndpointParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/InboundTimelineUpdateEndpointParser.java @@ -23,10 +23,10 @@ import org.w3c.dom.Element; import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE; -public class UpdatedStatusInboundEndpointParser extends AbstractSingleBeanDefinitionParser { +public class InboundTimelineUpdateEndpointParser extends AbstractSingleBeanDefinitionParser { @Override protected String getBeanClassName(Element element) { - return BASE_PACKAGE +".InboundUpdatedStatusEndpoint" ; + return BASE_PACKAGE +".inbound.InboundTimelineUpdateEndpoint" ; } @Override diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java similarity index 91% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java index 5aa1b60c99..fdc211b4fb 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/DirectMessageOutboundEndpointParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundDirectMessageEndpointParser.java @@ -23,10 +23,11 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.w3c.dom.Element; import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE; -public class DirectMessageOutboundEndpointParser extends AbstractOutboundChannelAdapterParser { +public class OutboundDirectMessageEndpointParser extends AbstractOutboundChannelAdapterParser { @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( BASE_PACKAGE + ".OutboundDirectMessageStatusMessageHandler" ); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( + BASE_PACKAGE + ".outbound.OutboundDirectMessageMessageHandler" ); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "twitter-connection", "configuration"); return builder.getBeanDefinition(); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java similarity index 86% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java index 4ecbfff925..84a2e5486c 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/UpdatedStatusOutboundEndpointParser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/OutboundUpdatedStatusEndpointParser.java @@ -24,12 +24,19 @@ import org.w3c.dom.Element; import static org.springframework.integration.twitter.config.TwitterNamespaceHandler.BASE_PACKAGE; -public class UpdatedStatusOutboundEndpointParser extends AbstractOutboundChannelAdapterParser { +/** + * + * this outbound adapter updates the twitter status for an account + * + * @author Josh Long + * @since 2.0 + */ +public class OutboundUpdatedStatusEndpointParser extends AbstractOutboundChannelAdapterParser { @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition( - BASE_PACKAGE + ".OutboundUpdatedStatusMessageHandler" ); + BASE_PACKAGE + ".outbound.OutboundTimelineUpdateMessageHandler" ); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java index 7f17afe1c3..578a92f1c9 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterNamespaceHandler.java @@ -36,13 +36,13 @@ public class TwitterNamespaceHandler extends org.springframework.beans.factory.x registerBeanDefinitionParser("twitter-connection", new ConnectionParser()); // inbound - registerBeanDefinitionParser("inbound-update-channel-adapter", new UpdatedStatusInboundEndpointParser()); - registerBeanDefinitionParser("inbound-dm-channel-adapter", new DirectMessageInboundEndpointParser()); - registerBeanDefinitionParser("inbound-mention-channel-adapter", new MentionInboundEndpointParser()); + registerBeanDefinitionParser("inbound-update-channel-adapter", new InboundTimelineUpdateEndpointParser()); + registerBeanDefinitionParser("inbound-dm-channel-adapter", new InboundDirectMessageEndpointParser()); + registerBeanDefinitionParser("inbound-mention-channel-adapter", new InboundMentionEndpointParser()); // outbound - registerBeanDefinitionParser("outbound-update-channel-adapter", new UpdatedStatusOutboundEndpointParser()); - registerBeanDefinitionParser("outbound-dm-channel-adapter", new DirectMessageOutboundEndpointParser()); + registerBeanDefinitionParser("outbound-update-channel-adapter", new OutboundUpdatedStatusEndpointParser()); + registerBeanDefinitionParser("outbound-dm-channel-adapter", new OutboundDirectMessageEndpointParser()); } public static void configureTwitterConnection(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/DirectMessage.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/DirectMessage.java similarity index 93% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/DirectMessage.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/DirectMessage.java index 71c975f249..eb2180ba26 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/DirectMessage.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/DirectMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core; import java.util.Date; @@ -23,6 +23,7 @@ import java.util.Date; * these are messages sent privately to a user. * * @author Josh Long + * @since 2.0 */ public interface DirectMessage { int getId(); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/GeoLocation.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/GeoLocation.java similarity index 92% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/GeoLocation.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/GeoLocation.java index d325c2e447..cea362fb69 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/GeoLocation.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/GeoLocation.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core; /** * interface for geo location records * * @author Josh Long + * @since 2.0 * */ public interface GeoLocation { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Status.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Status.java similarity index 94% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Status.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Status.java index 7cb9f6604d..097685b54a 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Status.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Status.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core; import java.util.Date; @@ -23,6 +23,7 @@ import java.util.Date; * * * @author Josh Long + * @since 2.0 */ public interface Status { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/TwitterHeaders.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java similarity index 95% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/TwitterHeaders.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java index 08c1fad0ae..21c6afb1d5 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/TwitterHeaders.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.core; /** diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/User.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/User.java similarity index 94% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/User.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/User.java index c8a927a059..c43047c3ae 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/User.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/User.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core; /** * describes the user producing or receiving messages * * @author Josh Long + * @since 2.0 */ public interface User { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jDirectMessage.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jDirectMessage.java similarity index 89% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jDirectMessage.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jDirectMessage.java index f172fcd50d..985db37bee 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jDirectMessage.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jDirectMessage.java @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core.twitter; +import org.springframework.integration.twitter.core.User; import twitter4j.DirectMessage; import java.util.Date; /** - * implementation of the {@link org.springframework.integration.twitter.model.DirectMessage} interface + * implementation of the {@link org.springframework.integration.twitter.core.DirectMessage} interface * that wraps, and works with, a {@link twitter4j.DirectMessage} instance. * * @author Josh Long + * @since 2.0 */ -public class Twitter4jDirectMessage implements org.springframework.integration.twitter.model.DirectMessage { +public class Twitter4jDirectMessage implements org.springframework.integration.twitter.core.DirectMessage { private DirectMessage directMessage; public Twitter4jDirectMessage(DirectMessage directMessage) { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jGeoLocation.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jGeoLocation.java similarity index 90% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jGeoLocation.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jGeoLocation.java index 8c7ed1108b..576ef9972f 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jGeoLocation.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jGeoLocation.java @@ -13,12 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core.twitter; + +import org.springframework.integration.twitter.core.GeoLocation; /** * Implements a notion of GeoLocation that forwards calls to {@link twitter4j.GeoLocation} instance * * @author Josh Long + * @since 2.0 */ public class Twitter4jGeoLocation implements GeoLocation { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jStatus.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jStatus.java similarity index 89% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jStatus.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jStatus.java index 5de0d327d3..cc38c55f39 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jStatus.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jStatus.java @@ -13,16 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core.twitter; + +import org.springframework.integration.twitter.core.Status; +import org.springframework.integration.twitter.core.User; import java.util.Date; /** * - * An implemention o the {@link org.springframework.integration.twitter.model.Status} interface that + * An implemention o the {@link org.springframework.integration.twitter.core.Status} interface that * forwards requests to a {@link twitter4j.Status} implementation * * @author Josh Long + * @since 2.0 */ public class Twitter4jStatus implements Status { private twitter4j.Status status; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jUser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jUser.java similarity index 94% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jUser.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jUser.java index e85e17f0d9..10cbf8bbbc 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/model/Twitter4jUser.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/twitter/Twitter4jUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter.model; +package org.springframework.integration.twitter.core.twitter; import twitter4j.User; @@ -24,8 +24,9 @@ import java.net.URL; * implementation of the User interfce to represent Users in a Twitter application * * @author Josh Long + * @since 2.0 */ -public class Twitter4jUser implements org.springframework.integration.twitter.model.User { +public class Twitter4jUser implements org.springframework.integration.twitter.core.User { private twitter4j.User user; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java similarity index 96% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java index 45f512445b..eff55d2954 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterEndpointSupport.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.inbound; import org.apache.commons.lang.exception.ExceptionUtils; @@ -42,7 +42,7 @@ import java.util.concurrent.ThreadFactory; /** * There are a lot of operations that are common to receiving the various types of messages when using the * Twitter API, and this class abstracts most of them for you. Implementers must take note of - * {@link org.springframework.integration.twitter.AbstractInboundTwitterEndpointSupport#runAsAPIRateLimitsPermit(org.springframework.integration.twitter.AbstractInboundTwitterEndpointSupport.ApiCallback)} + * {@link AbstractInboundTwitterEndpointSupport#runAsAPIRateLimitsPermit(AbstractInboundTwitterEndpointSupport.ApiCallback)} * which will invoke the instance of {@link AbstractInboundTwitterEndpointSupport.ApiCallback} when the * rate-limit API deems that its OK to do so. This class handles keeping tabs on that and on spacing out requests * as required. diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterStatusEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterStatusEndpointSupport.java similarity index 90% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterStatusEndpointSupport.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterStatusEndpointSupport.java index 6b365ae75f..3d34694675 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractInboundTwitterStatusEndpointSupport.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterStatusEndpointSupport.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; -import org.springframework.integration.twitter.model.Status; -import org.springframework.integration.twitter.model.Twitter4jStatus; +package org.springframework.integration.twitter.inbound; +import org.springframework.integration.twitter.core.Status; +import org.springframework.integration.twitter.core.twitter.Twitter4jStatus; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundDirectMessageStatusEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java similarity index 83% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundDirectMessageStatusEndpoint.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java index b04d671400..a8207796a1 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundDirectMessageStatusEndpoint.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundDirectMessageEndpoint.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.inbound; -import org.springframework.integration.twitter.model.DirectMessage; -import org.springframework.integration.twitter.model.Twitter4jDirectMessage; +import org.springframework.integration.twitter.core.DirectMessage; +import org.springframework.integration.twitter.core.twitter.Twitter4jDirectMessage; import twitter4j.Paging; import twitter4j.Twitter; @@ -31,7 +31,7 @@ import java.util.List; * * @author Josh Long */ -public class InboundDirectMessageStatusEndpoint extends AbstractInboundTwitterEndpointSupport { +public class InboundDirectMessageEndpoint extends AbstractInboundTwitterEndpointSupport { private Comparator dmComparator = new Comparator() { public int compare(DirectMessage directMessage, DirectMessage directMessage1) { @@ -64,8 +64,8 @@ public class InboundDirectMessageStatusEndpoint extends AbstractInboundTwitterEn @Override protected void beginPolling() throws Exception { - this.runAsAPIRateLimitsPermit(new ApiCallback() { - public void run(InboundDirectMessageStatusEndpoint t, Twitter twitter) + this.runAsAPIRateLimitsPermit(new ApiCallback() { + public void run(InboundDirectMessageEndpoint t, Twitter twitter) throws Exception { List dms = !hasMarkedStatus() ? t.twitter.getDirectMessages() : t.twitter.getDirectMessages(new Paging(t.getMarkerId())); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundMentionStatusEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java similarity index 79% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundMentionStatusEndpoint.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java index 83883fdf48..848985493f 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundMentionStatusEndpoint.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundMentionEndpoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.inbound; import twitter4j.Paging; import twitter4j.Twitter; @@ -26,7 +26,7 @@ import java.util.List; * * @author Josh Long */ -public class InboundMentionStatusEndpoint extends AbstractInboundTwitterStatusEndpointSupport { +public class InboundMentionEndpoint extends AbstractInboundTwitterStatusEndpointSupport { @Override public String getComponentType() { @@ -35,9 +35,9 @@ public class InboundMentionStatusEndpoint extends AbstractInboundTwitterStatusEn @Override protected void beginPolling() throws Exception { - this.runAsAPIRateLimitsPermit(new ApiCallback() { + this.runAsAPIRateLimitsPermit(new ApiCallback() { - public void run(InboundMentionStatusEndpoint ctx, Twitter twitter) throws Exception { + public void run(InboundMentionEndpoint ctx, Twitter twitter) throws Exception { List stats = (!hasMarkedStatus()) ? twitter.getMentions() : twitter.getMentions(new Paging(ctx.getMarkerId())); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundUpdatedStatusEndpoint.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java similarity index 80% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundUpdatedStatusEndpoint.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java index 6e3cdb6ab5..6c48baf289 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/InboundUpdatedStatusEndpoint.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/InboundTimelineUpdateEndpoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.inbound; import twitter4j.Paging; import twitter4j.Twitter; @@ -26,7 +26,7 @@ import twitter4j.Twitter; * @author Josh Long * @since 2.0 */ -public class InboundUpdatedStatusEndpoint extends AbstractInboundTwitterStatusEndpointSupport { +public class InboundTimelineUpdateEndpoint extends AbstractInboundTwitterStatusEndpointSupport { @Override public String getComponentType() { @@ -35,8 +35,8 @@ public class InboundUpdatedStatusEndpoint extends AbstractInboundTwitterStatusEn @Override protected void beginPolling() throws Exception { - this.runAsAPIRateLimitsPermit(new ApiCallback() { - public void run(InboundUpdatedStatusEndpoint t, Twitter twitter) + this.runAsAPIRateLimitsPermit(new ApiCallback() { + public void run(InboundTimelineUpdateEndpoint t, Twitter twitter) throws Exception { forwardAll( fromTwitter4jStatuses(!t.hasMarkedStatus() ? twitter.getFriendsTimeline() : diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java index 70bbf7a821..35f312d74a 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java @@ -27,7 +27,6 @@ import twitter4j.http.AccessToken; */ public interface AccessTokenInitialRequestProcessListener { - String openUrlAndReturnPin(String urlToOpen) throws Exception; void persistReturnedAccessToken(AccessToken accessToken) throws Exception; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractOutboundTwitterEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/AbstractOutboundTwitterEndpointSupport.java similarity index 90% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractOutboundTwitterEndpointSupport.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/AbstractOutboundTwitterEndpointSupport.java index ebe9b2233e..1e652773f7 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/AbstractOutboundTwitterEndpointSupport.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/AbstractOutboundTwitterEndpointSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.outbound; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.twitter.oauth.OAuthConfiguration; @@ -30,7 +30,7 @@ import twitter4j.Twitter; public abstract class AbstractOutboundTwitterEndpointSupport extends AbstractMessageHandler { protected volatile OAuthConfiguration configuration; protected volatile Twitter twitter; - protected final StatusUpdateOptboundMessageMapper statusUpdateSupport = new StatusUpdateOptboundMessageMapper(); + protected final OutboundStatusUpdateMessageMapper supportStatusUpdate = new OutboundStatusUpdateMessageMapper(); public void setConfiguration(OAuthConfiguration configuration) { this.configuration = configuration; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java similarity index 87% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java index 91e0014df2..8c1d7e53d8 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundDirectMessageStatusMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandler.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.outbound; import org.springframework.integration.Message; +import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.util.Assert; import twitter4j.TwitterException; @@ -25,11 +26,11 @@ import twitter4j.TwitterException; * Simple adapter to support sending outbound direct messages ("DM"s) using twitter * * @author Josh Long - * @see org.springframework.integration.twitter.TwitterHeaders + * @see org.springframework.integration.twitter.core.TwitterHeaders * @see twitter4j.Twitter * @since 2.0 */ -public class OutboundDirectMessageStatusMessageHandler extends AbstractOutboundTwitterEndpointSupport { +public class OutboundDirectMessageMessageHandler extends AbstractOutboundTwitterEndpointSupport { @Override protected void handleMessageInternal(Message message) throws Exception { diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/StatusUpdateOptboundMessageMapper.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundStatusUpdateMessageMapper.java similarity index 80% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/StatusUpdateOptboundMessageMapper.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundStatusUpdateMessageMapper.java index 15ea67b265..9ad5f7a470 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/StatusUpdateOptboundMessageMapper.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundStatusUpdateMessageMapper.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.outbound; import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.mapping.OutboundMessageMapper; -import org.springframework.integration.twitter.model.Twitter4jGeoLocation; +import org.springframework.integration.twitter.core.TwitterHeaders; +import org.springframework.integration.twitter.core.twitter.Twitter4jGeoLocation; import org.springframework.util.StringUtils; import twitter4j.StatusUpdate; @@ -28,18 +29,18 @@ import twitter4j.StatusUpdate; * * @author Josh Long * @see twitter4j.StatusUpdate - * @see org.springframework.integration.twitter.TwitterHeaders + * @see org.springframework.integration.twitter.core.TwitterHeaders * @since 2.0 */ -public class StatusUpdateOptboundMessageMapper implements OutboundMessageMapper { +public class OutboundStatusUpdateMessageMapper implements OutboundMessageMapper { /** - * convenient, interf-ace-oriented way of obtaining a reference to a {@link org.springframework.integration.twitter.model.Twitter4jGeoLocation} + * convenient, interface-oriented way of obtaining a reference to a {@link org.springframework.integration.twitter.core.twitter.Twitter4jGeoLocation} * * @param lat the latitude * @param lon the longitude - * @return a {@link org.springframework.integration.twitter.model.GeoLocation} instance + * @return a {@link org.springframework.integration.twitter.core.GeoLocation} instance */ - public org.springframework.integration.twitter.model.GeoLocation fromLatitudeLongitudePair(double lat, double lon) { + public org.springframework.integration.twitter.core.GeoLocation fromLatitudeLongitudePair(double lat, double lon) { return new Twitter4jGeoLocation(lat, lon); } @@ -78,7 +79,7 @@ public class StatusUpdateOptboundMessageMapper implements OutboundMessageMapper< if (message.getHeaders().containsKey(TwitterHeaders.TWITTER_GEOLOCATION)) { - org.springframework.integration.twitter.model.GeoLocation geoLocation = (org.springframework.integration.twitter.model.GeoLocation) message.getHeaders() + org.springframework.integration.twitter.core.GeoLocation geoLocation = (org.springframework.integration.twitter.core.GeoLocation) message.getHeaders() .get(TwitterHeaders.TWITTER_GEOLOCATION); twitter4j.GeoLocation gl = null; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundUpdatedStatusMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java similarity index 84% rename from spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundUpdatedStatusMessageHandler.java rename to spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java index cd2f5a6c3d..5e77773d72 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/OutboundUpdatedStatusMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/OutboundTimelineUpdateMessageHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.twitter; +package org.springframework.integration.twitter.outbound; import org.springframework.integration.Message; import org.springframework.util.Assert; @@ -27,10 +27,10 @@ import twitter4j.StatusUpdate; * @author Josh Long * @since 2.0 */ -public class OutboundUpdatedStatusMessageHandler extends AbstractOutboundTwitterEndpointSupport { +public class OutboundTimelineUpdateMessageHandler extends AbstractOutboundTwitterEndpointSupport { @Override protected void handleMessageInternal(Message message) throws Exception { - StatusUpdate statusUpdate = this.statusUpdateSupport.fromMessage(message); + StatusUpdate statusUpdate = this.supportStatusUpdate.fromMessage(message); Assert.notNull(statusUpdate, "couldn't send message, unable to build a StatusUpdate instance correctly"); this.twitter.updateStatus(statusUpdate); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java index a55fb942b2..4434cd913a 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java @@ -23,7 +23,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.twitter.model.Twitter4jGeoLocation; +import org.springframework.integration.twitter.core.twitter.Twitter4jGeoLocation; +import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; import org.springframework.util.Assert; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace.java index 385b99c2c0..cb324536cc 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace.java @@ -23,7 +23,8 @@ import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.twitter.model.Twitter4jGeoLocation; +import org.springframework.integration.twitter.core.twitter.Twitter4jGeoLocation; +import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TwitterAnnouncer.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TwitterAnnouncer.java index 79be70167f..1a56a5a95b 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TwitterAnnouncer.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TwitterAnnouncer.java @@ -1,7 +1,7 @@ package org.springframework.integration.twitter; -import org.springframework.integration.twitter.model.DirectMessage; -import org.springframework.integration.twitter.model.Status; +import org.springframework.integration.twitter.core.DirectMessage; +import org.springframework.integration.twitter.core.Status; import org.springframework.stereotype.Component;