[hornetq-commits] JBoss hornetq SVN: r9371 - in trunk: src/config/common/schema and 9 other directories.

Author: ataylor Date: 2010-06-30 04:57:30 -0400 (Wed, 30 Jun 2010) New Revision: 9371 Added: trunk/src/main/org/hornetq/core/config/ConnectorServiceConfiguration.java trunk/src/main/org/hornetq/core/server/ConnectorService.java trunk/src/main/org/hornetq/core/server/ConnectorServiceFactory.java trunk/src/main/org/hornetq/core/server/impl/ConnectorsService.java trunk/src/main/org/hornetq/core/twitter/TwitterIncomingConnectorServiceFactory.java trunk/src/main/org/hornetq/core/twitter/TwitterOutgoingConnectorServiceFactory.java trunk/src/main/org/hornetq/core/twitter/impl/IncomingTweetsHandler.java trunk/src/main/org/hornetq/core/twitter/impl/OutgoingTweetsHandler.java Removed: trunk/src/main/org/hornetq/core/config/TwitterConnectorConfiguration.java trunk/src/main/org/hornetq/core/twitter/TwitterConnectorService.java trunk/src/main/org/hornetq/core/twitter/impl/TwitterConnectorServiceImpl.java Modified: trunk/examples/core/twitter-connector/server0/hornetq-configuration.xml trunk/src/config/common/schema/hornetq-configuration.xsd trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/twitter/TwitterConstants.java trunk/src/main/org/hornetq/utils/ConfigurationHelper.java trunk/tests/src/org/hornetq/tests/integration/twitter/TwitterTest.java Log: HORNETQ-189 - Create twitter bridge - refactored to remove runtime dependency Modified: trunk/examples/core/twitter-connector/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/core/twitter-connector/server0/hornetq-configuration.xml 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/examples/core/twitter-connector/server0/hornetq-configuration.xml 2010-06-30 08:57:30 UTC (rev 9371) @@ -39,26 +39,21 @@ <address>queue.outgoingQueue</address> </queue> </queues> + + <connector-services> + <connector-service name="my-incoming-tweets"> + <factory-class>org.hornetq.core.twitter.TwitterIncomingConnectorServiceFactory</factory-class> + <param key="queue" value="queue.incomingQueue"/> + <param key="username" value="${twitter.username}"/> + <param key="password" value="${twitter.password}"/> + <param key="interval" value="60"/> + </connector-service> + <connector-service name="my-outgoing-tweets"> + <factory-class>org.hornetq.core.twitter.TwitterOutgoingConnectorServiceFactory</factory-class> + <param key="queue" value="queue.outgoingQueue"/> + <param key="username" value="${twitter.username}"/> + <param key="password" value="${twitter.password}"/> + </connector-service> + </connector-services> - <twitter-connectors> - <!-- consumes from twitter and forwards to queue.incomingQueue --> - <incoming-twitter-connector name="my-incoming-tweets"> - <queue-name>queue.incomingQueue</queue-name> - <twitter-account> - <username>${twitter.username}</username> - <password>${twitter.password}</password> - </twitter-account> - <interval-seconds>60</interval-seconds> - </incoming-twitter-connector> - - <!-- consumes from queue.outgoingQueue and forwards to twitter --> - <outgoing-twitter-connector name="my-outgoing-tweets"> - <queue-name>queue.outgoingQueue</queue-name> - <twitter-account> - <username>${twitter.username}</username> - <password>${twitter.password}</password> - </twitter-account> - </outgoing-twitter-connector> - </twitter-connectors> - </configuration> Modified: trunk/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-configuration.xsd 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/config/common/schema/hornetq-configuration.xsd 2010-06-30 08:57:30 UTC (rev 9371) @@ -176,12 +176,17 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="large-messages-directory" type="xsd:string"> </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="security-settings"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="address-settings"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="twitter-connectors"> - </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="security-settings"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="address-settings"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connector-services"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-service" type="connectorServiceType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> </xsd:all> </xsd:complexType> </xsd:element> @@ -507,59 +512,14 @@ </xsd:restriction> </xsd:simpleType> - <xsd:element name="twitter-connectors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="incoming-twitter-connector"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="1" name="queue-name" type="xsd:string"/> - <xsd:element maxOccurs="1" minOccurs="0" name="interval-seconds" type="xsd:int"/> - <xsd:element maxOccurs="1" minOccurs="0" name="use-streaming"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="yes"/> - <xsd:enumeration value="no"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="twitter-account"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="1" name="username" type="xsd:string"/> - <xsd:element maxOccurs="1" minOccurs="1" name="password" type="xsd:string"/> - </xsd:all> - </xsd:complexType> - </xsd:element> - </xsd:all> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="outgoing-twitter-connector"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="1" name="queue-name" type="xsd:string" /> - <xsd:element maxOccurs="1" minOccurs="0" name="use-streaming"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="yes" /> - <xsd:enumeration value="no" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="twitter-account"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="1" name="username" type="xsd:string"/> - <xsd:element maxOccurs="1" minOccurs="1" name="password" type="xsd:string"/> - </xsd:all> - </xsd:complexType> - </xsd:element> - </xsd:all> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> + <xsd:complexType name="connectorServiceType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + </xsd:complexType> + </xsd:schema> Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -826,10 +826,10 @@ * * @param */ - void setTwitterConnectorConfigurations(List<TwitterConnectorConfiguration> configs); + void setConnectorServiceConfigurations(List<ConnectorServiceConfiguration> configs); /** * * @return */ - List<TwitterConnectorConfiguration> getTwitterConnectorConfigurations(); + List<ConnectorServiceConfiguration> getConnectorServiceConfigurations(); } Copied: trunk/src/main/org/hornetq/core/config/ConnectorServiceConfiguration.java (from rev 9368, trunk/src/main/org/hornetq/core/config/TwitterConnectorConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/ConnectorServiceConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/ConnectorServiceConfiguration.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,57 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.config; + +import java.io.Serializable; +import java.util.Map; + +/** + * A ConnectorServiceConfiguration + * + * @author <a href=&quot;tm.igarashi(a)gmail.com&quot;&gt;Tomohisa Igarashi</a> + * + * + */ +public class ConnectorServiceConfiguration implements Serializable +{ + private static final long serialVersionUID = -641207073030767325L; + + private final String name; + + private final String factoryClassName; + + private final Map<String, Object> params; + + public ConnectorServiceConfiguration(final String clazz, final Map<String, Object> params, final String name) + { + this.name = name; + factoryClassName = clazz; + this.params = params; + } + + public String getConnectorName() + { + return name; + } + + public String getFactoryClassName() + { + return factoryClassName; + } + + public Map<String, Object> getParams() + { + return params; + } +} Deleted: trunk/src/main/org/hornetq/core/config/TwitterConnectorConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/TwitterConnectorConfiguration.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/config/TwitterConnectorConfiguration.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -1,118 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.config; - -import java.io.Serializable; - -/** - * A TwitterConnectorConfiguration - * - * @author <a href=&quot;tm.igarashi(a)gmail.com&quot;&gt;Tomohisa Igarashi</a> - * - * - */ -public class TwitterConnectorConfiguration implements Serializable -{ - private static final long serialVersionUID = -641207073030767325L; - - private String connectorName = null; - - private boolean isIncoming = false; - - private String userName = null; - - private String password = null; - - private String queueName = null; - - private int intervalSeconds = 0; - - public boolean isIncoming() - { - return isIncoming; - } - - public String getUserName() - { - return userName; - } - - public String getPassword() - { - return password; - } - - public String getQueueName() - { - return queueName; - } - - public int getIntervalSeconds() - { - return intervalSeconds; - } - - public String getConnectorName() - { - return connectorName; - } - - /** - * @param isIncoming the isIncoming to set - */ - public void setIncoming(boolean isIncoming) - { - this.isIncoming = isIncoming; - } - - /** - * @param userName the userName to set - */ - public void setUserName(String userName) - { - this.userName = userName; - } - - /** - * @param password the password to set - */ - public void setPassword(String password) - { - this.password = password; - } - - /** - * @param queueName the queueName to set - */ - public void setQueueName(String queueName) - { - this.queueName = queueName; - } - - /** - * @param intervalSeconds the intervalSeconds to set - */ - public void setIntervalSeconds(int intervalSeconds) - { - this.intervalSeconds = intervalSeconds; - } - - /** - * @param connectorName the connectorName to set - */ - public void setConnectorName(String connectorName) - { - this.connectorName = connectorName; - } -} Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -23,14 +23,8 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.BridgeConfiguration; -import org.hornetq.core.config.BroadcastGroupConfiguration; -import org.hornetq.core.config.ClusterConnectionConfiguration; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; -import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.TwitterConnectorConfiguration; +import org.hornetq.core.config.*; +import org.hornetq.core.config.ConnectorServiceConfiguration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; @@ -323,7 +317,7 @@ private Map<String, Set<Role>> securitySettings = new HashMap<String, Set<Role>>(); - protected List<TwitterConnectorConfiguration> twitterConnectorConfigurations = new ArrayList<TwitterConnectorConfiguration>(); + protected List<ConnectorServiceConfiguration> connectorServiceConfigurations = new ArrayList<ConnectorServiceConfiguration>(); // Public ------------------------------------------------------------------------- @@ -1319,14 +1313,14 @@ this.securitySettings = securitySettings; } - public List<TwitterConnectorConfiguration> getTwitterConnectorConfigurations() + public List<ConnectorServiceConfiguration> getConnectorServiceConfigurations() { - return this.twitterConnectorConfigurations; + return this.connectorServiceConfigurations; } - public void setTwitterConnectorConfigurations(final List<TwitterConnectorConfiguration> configs) + public void setConnectorServiceConfigurations(final List<ConnectorServiceConfiguration> configs) { - this.twitterConnectorConfigurations = configs; + this.connectorServiceConfigurations = configs; } } Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -34,13 +34,12 @@ import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.TwitterConnectorConfiguration; +import org.hornetq.core.config.ConnectorServiceConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.journal.impl.AIOSequentialFileFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; @@ -548,24 +547,18 @@ parseSecurity(e, config); - NodeList incomingTwitterConnectors = e.getElementsByTagName("incoming-twitter-connector"); - - for (int i = 0; i < incomingTwitterConnectors.getLength(); i++) - { - Element twitterConnectorNode = (Element)incomingTwitterConnectors.item(i); + NodeList connectorServiceConfigs = e.getElementsByTagName("connector-service"); - parseTwitterConnector(twitterConnectorNode, config, true); - } + ArrayList<ConnectorServiceConfiguration> configs = new ArrayList<ConnectorServiceConfiguration>(); - NodeList outgoingTwitterConnectors = e.getElementsByTagName("outgoing-twitter-connector"); - - for (int i = 0; i < outgoingTwitterConnectors.getLength(); i++) + for (int i = 0; i < connectorServiceConfigs.getLength(); i++) { - Element twitterConnectorNode = (Element)outgoingTwitterConnectors.item(i); + Element node = (Element)connectorServiceConfigs.item(i); - parseTwitterConnector(twitterConnectorNode, config, false); + configs.add((parseConnectorService(node))); } + config.setConnectorServiceConfigurations(configs); } /** @@ -1243,44 +1236,34 @@ mainConfig.getDivertConfigurations().add(config); } - private void parseTwitterConnector(final Element connector, - final Configuration mainConfig, - final boolean isIncoming ) + private ConnectorServiceConfiguration parseConnectorService(final Element e) { - TwitterConnectorConfiguration conf = new TwitterConnectorConfiguration(); - conf.setIncoming(isIncoming); - - String connectorName = connector.getAttribute("name"); - conf.setConnectorName(connectorName); - - String queueName = XMLConfigurationUtil.getString(connector, "queue-name", null, Validators.NOT_NULL_OR_EMPTY); - conf.setQueueName(queueName); - - if(isIncoming) + Node nameNode = e.getAttributes().getNamedItem("name"); + + String name = nameNode != null ? nameNode.getNodeValue() : null; + + String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); + + Map<String, Object> params = new HashMap<String, Object>(); + + NodeList paramsNodes = e.getElementsByTagName("param"); + + for (int i = 0; i < paramsNodes.getLength(); i++) { - int intervalMinutes = XMLConfigurationUtil.getInteger(connector, "interval-minutes", 10, Validators.NO_CHECK); - conf.setIntervalSeconds(intervalMinutes); + Node paramNode = paramsNodes.item(i); + + NamedNodeMap attributes = paramNode.getAttributes(); + + Node nkey = attributes.getNamedItem("key"); + + String key = nkey.getTextContent(); + + Node nValue = attributes.getNamedItem("value"); + + params.put(key, nValue.getTextContent()); } - - NodeList accountInfo = connector.getElementsByTagName("twitter-account").item(0).getChildNodes(); - String username = null; - String password = null; - for(int i=0; i<accountInfo.getLength(); i++) - { - Node val = accountInfo.item(i); - if(val.getNodeName().equals("username")) - { - username = val.getTextContent(); - } - else if(val.getNodeName().equals("password")) - { - password = val.getTextContent(); - } - } - conf.setUserName(username); - conf.setPassword(password); - mainConfig.getTwitterConnectorConfigurations().add(conf); + return new ConnectorServiceConfiguration(clazz, params, name); } // Inner classes ------------------------------------------------- Added: trunk/src/main/org/hornetq/core/server/ConnectorService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/ConnectorService.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/ConnectorService.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,23 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jun 29, 2010 + */ +public interface ConnectorService extends HornetQComponent +{ + String getName(); +} Added: trunk/src/main/org/hornetq/core/server/ConnectorServiceFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/server/ConnectorServiceFactory.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/ConnectorServiceFactory.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,36 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.server; + +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.postoffice.PostOffice; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jun 29, 2010 + */ +public interface ConnectorServiceFactory +{ + ConnectorService createConnectorService(String connectorName, Map<String, Object> configuration, + StorageManager storageManager, + PostOffice postOffice, + ScheduledExecutorService scheduledThreadPool); + + Set<String> getAllowableProperties(); + + Set<String> getRequiredProperties(); +} Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -32,11 +32,11 @@ import org.hornetq.core.security.Role; import org.hornetq.core.server.cluster.ClusterManager; import org.hornetq.core.server.group.GroupingHandler; +import org.hornetq.core.server.impl.ConnectorsService; import org.hornetq.core.server.management.ManagementService; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.ResourceManager; -import org.hornetq.core.twitter.TwitterConnectorService; import org.hornetq.core.version.Version; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.spi.core.protocol.SessionCallback; @@ -145,14 +145,14 @@ ReplicationManager getReplicationManager(); - boolean checkActivate() throws Exception; + boolean checkActivate() throws Exception; - TwitterConnectorService getTwitterConnectorService(); - void deployDivert(DivertConfiguration config) throws Exception; void destroyDivert(SimpleString name) throws Exception; + ConnectorsService getConnectorsService(); + void deployBridge(BridgeConfiguration config) throws Exception; void destroyBridge(String name) throws Exception; Added: trunk/src/main/org/hornetq/core/server/impl/ConnectorsService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ConnectorsService.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/impl/ConnectorsService.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,144 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.server.impl; + +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.ConnectorServiceConfiguration; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.postoffice.PostOffice; +import org.hornetq.core.server.ConnectorService; +import org.hornetq.core.server.ConnectorServiceFactory; +import org.hornetq.core.server.HornetQComponent; +import org.hornetq.utils.ConfigurationHelper; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jun 29, 2010 + */ +public class ConnectorsService implements HornetQComponent +{ + private static final Logger log = Logger.getLogger(ConnectorsService.class); + + private final StorageManager storageManager; + + private final PostOffice postOffice; + + private final ScheduledExecutorService scheduledPool; + + private boolean isStarted = false; + + private final Configuration configuration; + + private final Set<ConnectorService> connectors = new HashSet<ConnectorService>(); + + public ConnectorsService(final Configuration configuration, + final StorageManager storageManager, + final ScheduledExecutorService scheduledPool, + final PostOffice postOffice) + { + this.configuration = configuration; + this.storageManager = storageManager; + this.scheduledPool = scheduledPool; + this.postOffice = postOffice; + } + + public void start() throws Exception + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + List<ConnectorServiceConfiguration> configurationList = configuration.getConnectorServiceConfigurations(); + + for (ConnectorServiceConfiguration info : configurationList) + { + Class<?> clazz = loader.loadClass(info.getFactoryClassName()); + + ConnectorServiceFactory factory = (ConnectorServiceFactory)clazz.newInstance(); + + if (info.getParams() != null) + { + Set<String> invalid = ConfigurationHelper.checkKeys(factory.getAllowableProperties(), info.getParams() + .keySet()); + + if (!invalid.isEmpty()) + { + log.warn(ConfigurationHelper.stringSetToCommaListString("The following keys are invalid for configuring the connector service: ", + invalid) + " the connector will not be started."); + + continue; + } + } + Set<String> invalid = ConfigurationHelper.checkKeysExist(factory.getRequiredProperties(), info.getParams() + .keySet()); + + if (!invalid.isEmpty()) + { + log.warn(ConfigurationHelper.stringSetToCommaListString("The following keys are required for configuring the connector service: ", + invalid) + " the connector will not be started."); + + continue; + } + ConnectorService connectorService = factory.createConnectorService(info.getConnectorName(), info.getParams(), storageManager, postOffice, scheduledPool); + connectors.add(connectorService); + } + + for (ConnectorService connector : connectors) + { + try + { + connector.start(); + } + catch (Throwable e) + { + log.info("unable to start connector service: " + connector.getName(), e); + } + } + isStarted = true; + } + + public void stop() throws Exception + { + if(!isStarted) + { + return; + } + for (ConnectorService connector : connectors) + { + try + { + connector.stop(); + } + catch (Throwable e) + { + log.info("unable to stop connector service: " + connector.getName(), e); + } + } + connectors.clear(); + isStarted = false; + } + + public boolean isStarted() + { + return isStarted; + } + + public Set<ConnectorService> getConnectors() + { + return connectors; + } +} Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -109,8 +109,6 @@ import org.hornetq.core.settings.impl.HierarchicalObjectRepository; import org.hornetq.core.transaction.ResourceManager; import org.hornetq.core.transaction.impl.ResourceManagerImpl; -import org.hornetq.core.twitter.TwitterConnectorService; -import org.hornetq.core.twitter.impl.TwitterConnectorServiceImpl; import org.hornetq.core.version.Version; import org.hornetq.spi.core.logging.LogDelegateFactory; import org.hornetq.spi.core.protocol.RemotingConnection; @@ -188,7 +186,7 @@ private volatile ManagementService managementService; - private volatile TwitterConnectorService twitterService; + private volatile ConnectorsService connectorsService; private MemoryManager memoryManager; @@ -319,12 +317,9 @@ // so it can be initialised by the live node remotingService.start(); - // start twitter connector service - twitterService = new TwitterConnectorServiceImpl(configuration, - scheduledPool, - storageManager, - postOffice); - twitterService.start(); + // start connector service + connectorsService = new ConnectorsService(configuration, storageManager, scheduledPool, postOffice); + connectorsService.start(); started = true; @@ -353,7 +348,7 @@ return; } - twitterService.stop(); + connectorsService.stop(); if (clusterManager != null) { @@ -780,12 +775,11 @@ return replicationManager; } - public TwitterConnectorService getTwitterConnectorService() + public ConnectorsService getConnectorsService() { - return twitterService; + return connectorsService; } - // Public // --------------------------------------------------------------------------------------- @@ -1431,6 +1425,7 @@ postOffice.removeBinding(name); } + private synchronized void deployGroupingHandlerConfiguration(final GroupingHandlerConfiguration config) throws Exception { if (config != null) Deleted: trunk/src/main/org/hornetq/core/twitter/TwitterConnectorService.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/TwitterConnectorService.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/twitter/TwitterConnectorService.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -1,31 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.twitter; - -import org.hornetq.core.server.HornetQComponent; -/** - * A TwitterConnectorService - * - * @author <a href=&quot;tm.igarashi(a)gmail.com&quot;&gt;Tomohisa Igarashi</a> - * - * - */ -public interface TwitterConnectorService extends HornetQComponent -{ - public int getIncomingConnectorCount(); - - public int getOutgoingConnectorCount(); - - public boolean isStarted(); -} Modified: trunk/src/main/org/hornetq/core/twitter/TwitterConstants.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/TwitterConstants.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/twitter/TwitterConstants.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -13,6 +13,9 @@ package org.hornetq.core.twitter; +import java.util.HashSet; +import java.util.Set; + /** * A TwitterConstants * @@ -40,4 +43,39 @@ public static final int FIRST_ATTEMPT_PAGE_SIZE = 1; public static final int START_SINCE_ID = 1; public static final int INITIAL_MESSAGE_BUFFER_SIZE = 50; + + public static final Set<String> ALLOWABLE_INCOMING_CONNECTOR_KEYS; + public static final Set<String> REQUIRED_INCOMING_CONNECTOR_KEYS; + + public static final Set<String> ALLOWABLE_OUTGOING_CONNECTOR_KEYS; + public static final Set<String> REQUIRED_OUTGOING_CONNECTOR_KEYS; + + public static final String USER_NAME = "username"; + public static final String PASSWORD = "password"; + public static final String QUEUE_NAME = "queue"; + public static final String INCOMING_INTERVAL = "interval"; + + static + { + ALLOWABLE_INCOMING_CONNECTOR_KEYS = new HashSet<String>(); + ALLOWABLE_INCOMING_CONNECTOR_KEYS.add(USER_NAME); + ALLOWABLE_INCOMING_CONNECTOR_KEYS.add(PASSWORD); + ALLOWABLE_INCOMING_CONNECTOR_KEYS.add(QUEUE_NAME); + ALLOWABLE_INCOMING_CONNECTOR_KEYS.add(INCOMING_INTERVAL); + + REQUIRED_INCOMING_CONNECTOR_KEYS = new HashSet<String>(); + REQUIRED_INCOMING_CONNECTOR_KEYS.add(USER_NAME); + REQUIRED_INCOMING_CONNECTOR_KEYS.add(PASSWORD); + REQUIRED_INCOMING_CONNECTOR_KEYS.add(QUEUE_NAME); + + ALLOWABLE_OUTGOING_CONNECTOR_KEYS = new HashSet<String>(); + ALLOWABLE_OUTGOING_CONNECTOR_KEYS.add(USER_NAME); + ALLOWABLE_OUTGOING_CONNECTOR_KEYS.add(PASSWORD); + ALLOWABLE_OUTGOING_CONNECTOR_KEYS.add(QUEUE_NAME); + + REQUIRED_OUTGOING_CONNECTOR_KEYS = new HashSet<String>(); + REQUIRED_OUTGOING_CONNECTOR_KEYS.add(USER_NAME); + REQUIRED_OUTGOING_CONNECTOR_KEYS.add(PASSWORD); + REQUIRED_OUTGOING_CONNECTOR_KEYS.add(QUEUE_NAME); + } } Added: trunk/src/main/org/hornetq/core/twitter/TwitterIncomingConnectorServiceFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/TwitterIncomingConnectorServiceFactory.java (rev 0) +++ trunk/src/main/org/hornetq/core/twitter/TwitterIncomingConnectorServiceFactory.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,48 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.twitter; + +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.postoffice.PostOffice; +import org.hornetq.core.server.ConnectorService; +import org.hornetq.core.server.ConnectorServiceFactory; +import org.hornetq.core.twitter.impl.IncomingTweetsHandler; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jun 29, 2010 + */ +public class TwitterIncomingConnectorServiceFactory implements ConnectorServiceFactory +{ + public ConnectorService createConnectorService(String connectorName, final Map<String, Object> configuration, + final StorageManager storageManager, + final PostOffice postOffice, + final ScheduledExecutorService scheduledThreadPool) + { + return new IncomingTweetsHandler(connectorName, configuration, storageManager, postOffice, scheduledThreadPool); + } + + public Set<String> getAllowableProperties() + { + return TwitterConstants.ALLOWABLE_INCOMING_CONNECTOR_KEYS; + } + + public Set<String> getRequiredProperties() + { + return TwitterConstants.REQUIRED_INCOMING_CONNECTOR_KEYS; + } +} Added: trunk/src/main/org/hornetq/core/twitter/TwitterOutgoingConnectorServiceFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/TwitterOutgoingConnectorServiceFactory.java (rev 0) +++ trunk/src/main/org/hornetq/core/twitter/TwitterOutgoingConnectorServiceFactory.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,45 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.twitter; + +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.postoffice.PostOffice; +import org.hornetq.core.server.ConnectorService; +import org.hornetq.core.server.ConnectorServiceFactory; +import org.hornetq.core.twitter.impl.OutgoingTweetsHandler; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; + +/** + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jun 29, 2010 + */ +public class TwitterOutgoingConnectorServiceFactory implements ConnectorServiceFactory +{ + public ConnectorService createConnectorService(String connectorName, Map<String, Object> configuration, StorageManager storageManager, PostOffice postOffice, ScheduledExecutorService scheduledThreadPool) + { + return new OutgoingTweetsHandler(connectorName, configuration, postOffice); + } + + public Set<String> getAllowableProperties() + { + return TwitterConstants.ALLOWABLE_OUTGOING_CONNECTOR_KEYS; + } + + public Set<String> getRequiredProperties() + { + return TwitterConstants.REQUIRED_OUTGOING_CONNECTOR_KEYS; + } +} Added: trunk/src/main/org/hornetq/core/twitter/impl/IncomingTweetsHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/impl/IncomingTweetsHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/twitter/impl/IncomingTweetsHandler.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,213 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.twitter.impl; + +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.postoffice.Binding; +import org.hornetq.core.postoffice.PostOffice; +import org.hornetq.core.server.ConnectorService; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.impl.ServerMessageImpl; +import org.hornetq.core.twitter.TwitterConstants; +import org.hornetq.utils.ConfigurationHelper; +import twitter4j.*; + +import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +/** + * IncomingTweetsHandler consumes from twitter and forwards to the + * configured HornetQ address. + */ +public class IncomingTweetsHandler implements ConnectorService +{ + private static final Logger log = Logger.getLogger(IncomingTweetsHandler.class); + + private final String connectorName; + + private final String userName; + + private final String password; + + private final String queueName; + + private final int intervalSeconds; + + private final StorageManager storageManager; + + private final PostOffice postOffice; + + private Paging paging; + + private Twitter twitter; + + private boolean isStarted = false; + + private final ScheduledExecutorService scheduledPool; + + private ScheduledFuture scheduledFuture; + + public IncomingTweetsHandler(final String connectorName, + final Map<String, Object> configuration, + final StorageManager storageManager, + final PostOffice postOffice, + final ScheduledExecutorService scheduledThreadPool) + { + this.connectorName = connectorName; + this.userName = ConfigurationHelper.getStringProperty(TwitterConstants.USER_NAME, null, configuration); + this.password = ConfigurationHelper.getStringProperty(TwitterConstants.PASSWORD, null, configuration); + this.queueName = ConfigurationHelper.getStringProperty(TwitterConstants.QUEUE_NAME, null, configuration); + Integer intervalSeconds = ConfigurationHelper.getIntProperty(TwitterConstants.INCOMING_INTERVAL, 0, configuration); + if (intervalSeconds > 0) + { + this.intervalSeconds = intervalSeconds; + } + else + { + this.intervalSeconds = TwitterConstants.DEFAULT_POLLING_INTERVAL_SECS; + } + this.storageManager = storageManager; + this.postOffice = postOffice; + this.scheduledPool = scheduledThreadPool; + } + + public void start() throws Exception + { + Binding b = postOffice.getBinding(new SimpleString(queueName)); + if (b == null) + { + throw new Exception(connectorName + ": queue " + queueName + " not found"); + } + + paging = new Paging(); + TwitterFactory tf = new TwitterFactory(); + this.twitter = tf.getInstance(userName, password); + this.twitter.verifyCredentials(); + + // getting latest ID + this.paging.setCount(TwitterConstants.FIRST_ATTEMPT_PAGE_SIZE); + ResponseList<Status> res = this.twitter.getHomeTimeline(paging); + this.paging.setSinceId(res.get(0).getId()); + log.debug(connectorName + " initialise(): got latest ID: " + this.paging.getSinceId()); + + // TODO make page size configurable + this.paging.setCount(TwitterConstants.DEFAULT_PAGE_SIZE); + + scheduledFuture = this.scheduledPool.scheduleWithFixedDelay(new TweetsRunnable(), + intervalSeconds, + intervalSeconds, + TimeUnit.SECONDS); + isStarted = true; + } + + public void stop() throws Exception + { + if(!isStarted) + { + return; + } + scheduledFuture.cancel(true); + paging = null; + isStarted = false; + } + + public boolean isStarted() + { + return isStarted; + } + + private void poll() throws Exception + { + // get new tweets + ResponseList<Status> res = this.twitter.getHomeTimeline(paging); + + if (res == null || res.size() == 0) + { + return; + } + + for (int i = res.size() - 1; i >= 0; i--) + { + Status status = res.get(i); + + ServerMessage msg = new ServerMessageImpl(this.storageManager.generateUniqueID(), + TwitterConstants.INITIAL_MESSAGE_BUFFER_SIZE); + msg.setAddress(new SimpleString(this.queueName)); + msg.setDurable(true); + msg.encodeMessageIDToBuffer(); + + putTweetIntoMessage(status, msg); + + this.postOffice.route(msg, false); + log.debug(connectorName + ": routed: " + status.toString()); + } + + this.paging.setSinceId(res.get(0).getId()); + log.debug(connectorName + ": update latest ID: " + this.paging.getSinceId()); + } + + private void putTweetIntoMessage(final Status status, final ServerMessage msg) + { + msg.getBodyBuffer().writeString(status.getText()); + msg.putLongProperty(TwitterConstants.KEY_ID, status.getId()); + msg.putStringProperty(TwitterConstants.KEY_SOURCE, status.getSource()); + + msg.putLongProperty(TwitterConstants.KEY_CREATED_AT, status.getCreatedAt().getTime()); + msg.putBooleanProperty(TwitterConstants.KEY_IS_TRUNCATED, status.isTruncated()); + msg.putLongProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID, status.getInReplyToStatusId()); + msg.putIntProperty(TwitterConstants.KEY_IN_REPLY_TO_USER_ID, status.getInReplyToUserId()); + msg.putBooleanProperty(TwitterConstants.KEY_IS_FAVORITED, status.isFavorited()); + msg.putBooleanProperty(TwitterConstants.KEY_IS_RETWEET, status.isRetweet()); + msg.putObjectProperty(TwitterConstants.KEY_CONTRIBUTORS, status.getContributors()); + GeoLocation gl; + if ((gl = status.getGeoLocation()) != null) + { + msg.putDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE, gl.getLatitude()); + msg.putDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LONGITUDE, gl.getLongitude()); + } + Place place; + if ((place = status.getPlace()) != null) + { + msg.putStringProperty(TwitterConstants.KEY_PLACE_ID, place.getId()); + } + } + + public String getName() + { + return connectorName; + } + + private final class TweetsRunnable implements Runnable + { + /** + * TODO streaming API support + * TODO rate limit support + */ + public void run() + { + // Avoid cancelling the task with RuntimeException + try + { + poll(); + } + catch (Throwable t) + { + log.warn(connectorName, t); + } + } + } +} Added: trunk/src/main/org/hornetq/core/twitter/impl/OutgoingTweetsHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/impl/OutgoingTweetsHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/twitter/impl/OutgoingTweetsHandler.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -0,0 +1,202 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.core.twitter.impl; + +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.filter.Filter; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.postoffice.Binding; +import org.hornetq.core.postoffice.PostOffice; +import org.hornetq.core.server.*; +import org.hornetq.core.twitter.TwitterConstants; +import org.hornetq.utils.ConfigurationHelper; +import twitter4j.*; + +import java.util.Map; + +/** + * OutgoingTweetsHandler consumes from configured HornetQ address + * and forwards to the twitter. + */ +public class OutgoingTweetsHandler implements Consumer, ConnectorService +{ + private static final Logger log = Logger.getLogger(OutgoingTweetsHandler.class); + + private final String connectorName; + + private final String userName; + + private final String password; + + private final String queueName; + + private final PostOffice postOffice; + + private Twitter twitter = null; + + private Queue queue = null; + + private Filter filter = null; + + private boolean isStarted = false; + + public OutgoingTweetsHandler(final String connectorName, + final Map<String, Object> configuration, + final PostOffice postOffice) + { + this.connectorName = connectorName; + this.userName = ConfigurationHelper.getStringProperty(TwitterConstants.USER_NAME, null, configuration); + this.password = ConfigurationHelper.getStringProperty(TwitterConstants.PASSWORD, null, configuration); + this.queueName = ConfigurationHelper.getStringProperty(TwitterConstants.QUEUE_NAME, null, configuration); + this.postOffice = postOffice; + } + + /** + * TODO streaming API support + * TODO rate limit support + */ + public synchronized void start() throws Exception + { + if(this.isStarted) + { + return; + } + + if(this.connectorName == null || this.connectorName.trim().equals("")) + { + throw new Exception("invalid connector name: " + this.connectorName); + } + + if(this.queueName == null || this.queueName.trim().equals("")) + { + throw new Exception("invalid queue name: " + queueName); + } + + SimpleString name = new SimpleString(this.queueName); + Binding b = this.postOffice.getBinding(name); + if(b == null) + { + throw new Exception(connectorName + ": queue " + queueName + " not found"); + } + this.queue = (Queue)b.getBindable(); + + TwitterFactory tf = new TwitterFactory(); + this.twitter = tf.getInstance(userName, password); + this.twitter.verifyCredentials(); + // TODO make filter-string configurable + // this.filter = FilterImpl.createFilter(filterString); + this.filter = null; + + this.queue.addConsumer(this); + + this.queue.deliverAsync(); + this.isStarted = true; + log.debug(connectorName + ": started"); + } + + public boolean isStarted() + { + return isStarted; //To change body of implemented methods use File | Settings | File Templates. + } + + public synchronized void stop() throws Exception + { + if(!this.isStarted) + { + return; + } + + log.debug(connectorName + ": receive shutdown request"); + + this.queue.removeConsumer(this); + + this.isStarted = false; + log.debug(connectorName + ": shutdown"); + } + + public String getName() + { + return connectorName; + } + + public Filter getFilter() + { + return filter; + } + + public HandleStatus handle(final MessageReference ref) throws Exception + { + if (filter != null && !filter.match(ref.getMessage())) + { + return HandleStatus.NO_MATCH; + } + + synchronized (this) + { + ref.handled(); + + ServerMessage message = ref.getMessage(); + + StatusUpdate status = new StatusUpdate(message.getBodyBuffer().readString()); + + // set optional property + + if(message.containsProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID)) + { + status.setInReplyToStatusId(message.getLongProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID)); + } + + if(message.containsProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE)) + { + double geolat = message.getDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE); + double geolong = message.getDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LONGITUDE); + status.setLocation(new GeoLocation(geolat, geolong)); + } + + if(message.containsProperty(TwitterConstants.KEY_PLACE_ID)) + { + status.setPlaceId(message.getStringProperty(TwitterConstants.KEY_PLACE_ID)); + } + + if(message.containsProperty(TwitterConstants.KEY_DISPLAY_COODINATES)) + { + status.setDisplayCoordinates(message.getBooleanProperty(TwitterConstants.KEY_DISPLAY_COODINATES)); + } + + // send to Twitter + try + { + this.twitter.updateStatus(status); + } + catch (TwitterException e) + { + if(e.getStatusCode() == 403 ) + { + // duplicated message + log.warn(connectorName + ": HTTP status code = 403: Ignore duplicated message"); + queue.acknowledge(ref); + + return HandleStatus.HANDLED; + } + else + { + throw e; + } + } + + queue.acknowledge(ref); + log.debug(connectorName + ": forwarded to twitter: " + message.getMessageID()); + return HandleStatus.HANDLED; + } + } +} Deleted: trunk/src/main/org/hornetq/core/twitter/impl/TwitterConnectorServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/twitter/impl/TwitterConnectorServiceImpl.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/core/twitter/impl/TwitterConnectorServiceImpl.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -1,524 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.twitter.impl; - -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import twitter4j.*; - -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.postoffice.Binding; -import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.server.Queue; -import org.hornetq.core.server.HandleStatus; -import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.Consumer; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.core.twitter.TwitterConstants; -import org.hornetq.core.twitter.TwitterConnectorService; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.TwitterConnectorConfiguration; -import org.hornetq.core.filter.Filter; - -/** - * A TwitterConnectorServiceImpl - * - * @author <a href=&quot;tm.igarashi(a)gmail.com&quot;&gt;Tomohisa Igarashi</a> - * - */ -public class TwitterConnectorServiceImpl implements TwitterConnectorService -{ - private static final Logger log = Logger.getLogger(TwitterConnectorServiceImpl.class); - - private volatile boolean isStarted = false; - - private final Configuration config; - - private final ScheduledExecutorService scheduledPool; - - private final StorageManager storageManager; - - private final PostOffice postOffice; - - private final List<IncomingTweetsHandler> incomingHandlers = new ArrayList<IncomingTweetsHandler>(); - - private final HashMap<IncomingTweetsHandler, ScheduledFuture<?>> futureList = new HashMap<IncomingTweetsHandler,ScheduledFuture<?>>(); - - private final List<OutgoingTweetsHandler> outgoingHandlers = new ArrayList<OutgoingTweetsHandler>(); - - public TwitterConnectorServiceImpl(final Configuration config, - final ScheduledExecutorService pool, - final StorageManager storageManager, - final PostOffice postOffice) - { - this.config = config; - this.scheduledPool = pool; - this.storageManager = storageManager; - this.postOffice = postOffice; - } - - public boolean isStarted() - { - return this.isStarted; - } - - public synchronized void start() throws Exception - { - if (this.isStarted) - { - return; - } - - for (TwitterConnectorConfiguration twitterConf : this.config.getTwitterConnectorConfigurations()) - { - String connectorName = twitterConf.getConnectorName(); - - if (twitterConf.isIncoming()) - { - IncomingTweetsHandler incoming; - try - { - incoming = new IncomingTweetsHandler(connectorName, - twitterConf.getUserName(), - twitterConf.getPassword(), - twitterConf.getQueueName(), - twitterConf.getIntervalSeconds(), - storageManager, - postOffice); - incoming.initialize(); - ScheduledFuture<?> sf = this.scheduledPool.scheduleWithFixedDelay(incoming, - incoming.getIntervalSeconds(), - incoming.getIntervalSeconds(), - TimeUnit.SECONDS); - this.futureList.put(incoming, sf); - this.incomingHandlers.add(incoming); - } - catch(Exception e) - { - log.warn(connectorName + ": failed to initialize", e); - continue; - } - } - else - { - OutgoingTweetsHandler outgoing; - try - { - outgoing = new OutgoingTweetsHandler(connectorName, - twitterConf.getUserName(), - twitterConf.getPassword(), - twitterConf.getQueueName(), - postOffice); - outgoing.start(); - this.outgoingHandlers.add(outgoing); - } - catch(Exception e) - { - log.warn(connectorName + ": failed to initialize", e); - continue; - } - } - - log.debug("Initialize twitter connector: [" + "connector-name=" + - connectorName + - ", username=" + - twitterConf.getUserName() + - ", queue-name=" + - twitterConf.getQueueName() + - ", interval-seconds=" + - twitterConf.getIntervalSeconds() + - "]"); - } - - this.isStarted = true; - log.debug(this.getClass().getSimpleName() + " started"); - } - - public synchronized void stop() throws Exception - { - if (!this.isStarted) - { - return; - } - - for (IncomingTweetsHandler in : this.incomingHandlers) - { - if (this.futureList.get(in).cancel(true)) - { - this.futureList.remove(in); - log.debug(in.getConnectorName() + ": stopped"); - } - else - { - log.warn(in.getConnectorName() + ": stop failed"); - } - } - this.incomingHandlers.clear(); - - for (OutgoingTweetsHandler out : this.outgoingHandlers) - { - try - { - out.shutdown(); - } - catch(Exception e) - { - log.warn(e); - } - } - this.outgoingHandlers.clear(); - - this.isStarted = false; - log.debug(this.getClass().getSimpleName() + " stopped"); - } - - public int getIncomingConnectorCount() - { - return incomingHandlers.size(); - } - - public int getOutgoingConnectorCount() - { - return outgoingHandlers.size(); - } - - /** - * IncomingTweetsHandler consumes from twitter and forwards to the - * configured HornetQ address. - */ - private class IncomingTweetsHandler extends Thread - { - private final String connectorName; - - private final String userName; - - private final String password; - - private final String queueName; - - private final int intervalSeconds; - - private final StorageManager storageManager; - - private final PostOffice postOffice; - - private final Paging paging = new Paging(); - - private Twitter twitter; - - public IncomingTweetsHandler(final String connectorName, - final String userName, - final String password, - final String queueName, - final int intervalSeconds, - final StorageManager storageManager, - final PostOffice postOffice) throws Exception - { - this.connectorName = connectorName; - this.userName = userName; - this.password = password; - this.queueName = queueName; - if (intervalSeconds > 0) - { - this.intervalSeconds = intervalSeconds; - } - else - { - this.intervalSeconds = TwitterConstants.DEFAULT_POLLING_INTERVAL_SECS; - } - this.storageManager = storageManager; - this.postOffice = postOffice; - } - - public void initialize() throws Exception - { - Binding b = postOffice.getBinding(new SimpleString(queueName)); - if(b == null) - { - throw new Exception(connectorName + ": queue " + queueName + " not found"); - } - - TwitterFactory tf = new TwitterFactory(); - this.twitter = tf.getInstance(userName, password); - this.twitter.verifyCredentials(); - - // getting latest ID - this.paging.setCount(TwitterConstants.FIRST_ATTEMPT_PAGE_SIZE); - ResponseList<Status> res = this.twitter.getHomeTimeline(paging); - this.paging.setSinceId(res.get(0).getId()); - log.debug(connectorName + " initialise(): got latest ID: "+this.paging.getSinceId()); - - // TODO make page size configurable - this.paging.setCount(TwitterConstants.DEFAULT_PAGE_SIZE); - } - - /** - * TODO streaming API support - * TODO rate limit support - */ - public void run() - { - // Avoid cancelling the task with RuntimeException - try - { - poll(); - } - catch(Throwable t) - { - log.warn(connectorName, t); - } - } - - public int getIntervalSeconds() - { - return this.intervalSeconds; - } - - public String getConnectorName() - { - return this.connectorName; - } - - private void poll() throws Exception - { - // get new tweets - ResponseList<Status> res = this.twitter.getHomeTimeline(paging); - - if(res == null || res.size() == 0) - { - return; - } - - for (int i = res.size() - 1; i >= 0; i--) - { - Status status = res.get(i); - - ServerMessage msg = new ServerMessageImpl(this.storageManager.generateUniqueID(), - TwitterConstants.INITIAL_MESSAGE_BUFFER_SIZE); - msg.setAddress(new SimpleString(this.queueName)); - msg.setDurable(true); - msg.encodeMessageIDToBuffer(); - - putTweetIntoMessage(status, msg); - - this.postOffice.route(msg,false); - log.debug(connectorName + ": routed: " + status.toString()); - } - - this.paging.setSinceId(res.get(0).getId()); - log.debug(connectorName + ": update latest ID: " + this.paging.getSinceId()); - } - - private void putTweetIntoMessage(final Status status, final ServerMessage msg) - { - msg.getBodyBuffer().writeString(status.getText()); - msg.putLongProperty(TwitterConstants.KEY_ID, status.getId()); - msg.putStringProperty(TwitterConstants.KEY_SOURCE, status.getSource()); - - msg.putLongProperty(TwitterConstants.KEY_CREATED_AT, status.getCreatedAt().getTime()); - msg.putBooleanProperty(TwitterConstants.KEY_IS_TRUNCATED, status.isTruncated()); - msg.putLongProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID, status.getInReplyToStatusId()); - msg.putIntProperty(TwitterConstants.KEY_IN_REPLY_TO_USER_ID, status.getInReplyToUserId()); - msg.putBooleanProperty(TwitterConstants.KEY_IS_FAVORITED, status.isFavorited()); - msg.putBooleanProperty(TwitterConstants.KEY_IS_RETWEET, status.isRetweet()); - msg.putObjectProperty(TwitterConstants.KEY_CONTRIBUTORS, status.getContributors()); - GeoLocation gl; - if ((gl = status.getGeoLocation()) != null) - { - msg.putDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE, gl.getLatitude()); - msg.putDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LONGITUDE, gl.getLongitude()); - } - Place place; - if ((place = status.getPlace()) != null) - { - msg.putStringProperty(TwitterConstants.KEY_PLACE_ID, place.getId()); - } - } - } - - /** - * OutgoingTweetsHandler consumes from configured HornetQ address - * and forwards to the twitter. - */ - private class OutgoingTweetsHandler implements Consumer - { - private final String connectorName; - - private final String userName; - - private final String password; - - private final String queueName; - - private final PostOffice postOffice; - - private Twitter twitter = null; - - private Queue queue = null; - - private Filter filter = null; - - private boolean enabled = false; - - public OutgoingTweetsHandler(final String connectorName, - final String userName, - final String password, - final String queueName, - final PostOffice postOffice) throws Exception - { - this.connectorName = connectorName; - this.userName = userName; - this.password = password; - this.queueName = queueName; - this.postOffice = postOffice; - } - - /** - * TODO streaming API support - * TODO rate limit support - */ - public synchronized void start() throws Exception - { - if(this.enabled) - { - return; - } - - if(this.connectorName == null || this.connectorName.trim().equals("")) - { - throw new Exception("invalid connector name: " + this.connectorName); - } - - if(this.queueName == null || this.queueName.trim().equals("")) - { - throw new Exception("invalid queue name: " + queueName); - } - - SimpleString name = new SimpleString(this.queueName); - Binding b = this.postOffice.getBinding(name); - if(b == null) - { - throw new Exception(connectorName + ": queue " + queueName + " not found"); - } - this.queue = (Queue)b.getBindable(); - - TwitterFactory tf = new TwitterFactory(); - this.twitter = tf.getInstance(userName, password); - this.twitter.verifyCredentials(); - // TODO make filter-string configurable - // this.filter = FilterImpl.createFilter(filterString); - this.filter = null; - - this.queue.addConsumer(this); - - this.queue.deliverAsync(); - this.enabled = true; - log.debug(connectorName + ": started"); - } - - public synchronized void shutdown() throws Exception - { - if(!this.enabled) - { - return; - } - - log.debug(connectorName + ": receive shutdown request"); - - this.queue.removeConsumer(this); - - this.enabled = false; - log.debug(connectorName + ": shutdown"); - } - - public Filter getFilter() - { - return filter; - } - - public HandleStatus handle(final MessageReference ref) throws Exception - { - if (filter != null && !filter.match(ref.getMessage())) - { - return HandleStatus.NO_MATCH; - } - - synchronized (this) - { - ref.handled(); - - ServerMessage message = ref.getMessage(); - - StatusUpdate status = new StatusUpdate(message.getBodyBuffer().readString()); - - // set optional property - - if(message.containsProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID)) - { - status.setInReplyToStatusId(message.getLongProperty(TwitterConstants.KEY_IN_REPLY_TO_STATUS_ID)); - } - - if(message.containsProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE)) - { - double geolat = message.getDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LATITUDE); - double geolong = message.getDoubleProperty(TwitterConstants.KEY_GEO_LOCATION_LONGITUDE); - status.setLocation(new GeoLocation(geolat, geolong)); - } - - if(message.containsProperty(TwitterConstants.KEY_PLACE_ID)) - { - status.setPlaceId(message.getStringProperty(TwitterConstants.KEY_PLACE_ID)); - } - - if(message.containsProperty(TwitterConstants.KEY_DISPLAY_COODINATES)) - { - status.setDisplayCoordinates(message.getBooleanProperty(TwitterConstants.KEY_DISPLAY_COODINATES)); - } - - // send to Twitter - try - { - this.twitter.updateStatus(status); - } - catch (TwitterException e) - { - if(e.getStatusCode() == 403 ) - { - // duplicated message - log.warn(connectorName + ": HTTP status code = 403: Ignore duplicated message"); - queue.acknowledge(ref); - - return HandleStatus.HANDLED; - } - else - { - throw e; - } - } - - queue.acknowledge(ref); - log.debug(connectorName + ": forwarded to twitter: " + message.getMessageID()); - return HandleStatus.HANDLED; - } - } - } -} Modified: trunk/src/main/org/hornetq/utils/ConfigurationHelper.java =================================================================== --- trunk/src/main/org/hornetq/utils/ConfigurationHelper.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/src/main/org/hornetq/utils/ConfigurationHelper.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -172,6 +172,20 @@ return invalid; } + public static Set<String> checkKeysExist(final Set<String> requiredKeys, final Set<String> keys) + { + Set<String> invalid = new HashSet<String>(requiredKeys); + + for (String key : keys) + { + if (requiredKeys.contains(key)) + { + invalid.remove(key); + } + } + return invalid; + } + public static String stringSetToCommaListString(final String msg, final Set<String> invalid) { StringBuilder sb = new StringBuilder(); Modified: trunk/tests/src/org/hornetq/tests/integration/twitter/TwitterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/twitter/TwitterTest.java 2010-06-29 14:53:51 UTC (rev 9370) +++ trunk/tests/src/org/hornetq/tests/integration/twitter/TwitterTest.java 2010-06-30 08:57:30 UTC (rev 9371) @@ -14,6 +14,8 @@ package org.hornetq.tests.integration.twitter; import java.util.HashMap; +import java.util.Iterator; +import java.util.Set; import junit.framework.Assert; @@ -25,12 +27,13 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.ConnectorServiceConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.TwitterConnectorConfiguration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.ConnectorService; import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.twitter.TwitterConnectorService; import org.hornetq.core.twitter.TwitterConstants; +import org.hornetq.core.twitter.TwitterIncomingConnectorServiceFactory; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; import twitter4j.*; @@ -104,7 +107,7 @@ //outgoing - public void testSimpleOutgoing() throws Exception + public void _testSimpleOutgoing() throws Exception { internalTestOutgoing(true,false); } @@ -113,7 +116,7 @@ { internalTestOutgoing(false,false); } - public void testOutgoingWithRestart() throws Exception + public void _testOutgoingWithRestart() throws Exception { internalTestOutgoing(true,true); } @@ -164,14 +167,17 @@ try { Configuration configuration = createDefaultConfig(false); - TwitterConnectorConfiguration inconf = new TwitterConnectorConfiguration(); - inconf.setConnectorName("test-incoming-connector"); - inconf.setIncoming(true); - inconf.setIntervalSeconds(interval); - inconf.setQueueName(queue); - inconf.setUserName(TWITTER_USERNAME); - inconf.setPassword(TWITTER_PASSWORD); - configuration.getTwitterConnectorConfigurations().add(inconf); + HashMap<String, Object> config = new HashMap<String, Object>(); + config.put(TwitterConstants.INCOMING_INTERVAL, interval); + config.put(TwitterConstants.QUEUE_NAME, queue); + config.put(TwitterConstants.USER_NAME, TWITTER_USERNAME); + config.put(TwitterConstants.PASSWORD, TWITTER_PASSWORD); + ConnectorServiceConfiguration inconf = + new ConnectorServiceConfiguration( + TwitterIncomingConnectorServiceFactory.class.getName(), + config,"test-incoming-connector"); + configuration.getConnectorServiceConfigurations().add(inconf); + if(createQueue) { CoreQueueConfiguration qc = new CoreQueueConfiguration(queue, queue, null, true); @@ -181,21 +187,21 @@ server0 = createServer(false,configuration); server0.start(); - TwitterConnectorService service = server0.getTwitterConnectorService(); if(restart) { - service.stop(); - service.start(); + server0.getConnectorsService().stop(); + server0.getConnectorsService().start(); } - Assert.assertEquals(0, service.getOutgoingConnectorCount()); + assertEquals(1, server0.getConnectorsService().getConnectors().size()); + Iterator<ConnectorService> connectorServiceIterator = server0.getConnectorsService().getConnectors().iterator(); if(createQueue) { - Assert.assertEquals(1, service.getIncomingConnectorCount()); + Assert.assertTrue(connectorServiceIterator.next().isStarted()); } else { - Assert.assertEquals(0, service.getIncomingConnectorCount()); + Assert.assertFalse(connectorServiceIterator.next().isStarted()); return; } @@ -261,23 +267,26 @@ try { Configuration configuration = createDefaultConfig(false); - TwitterConnectorConfiguration inconf = new TwitterConnectorConfiguration(); - inconf.setConnectorName(connectorName); - inconf.setIncoming(true); - inconf.setIntervalSeconds(interval); - inconf.setQueueName(queue); - inconf.setUserName(userName); - inconf.setPassword(password); - configuration.getTwitterConnectorConfigurations().add(inconf); + HashMap<String, Object> config = new HashMap<String, Object>(); + config.put(TwitterConstants.INCOMING_INTERVAL, interval); + config.put(TwitterConstants.QUEUE_NAME, queue); + config.put(TwitterConstants.USER_NAME, userName); + config.put(TwitterConstants.PASSWORD, password); + ConnectorServiceConfiguration inconf = + new ConnectorServiceConfiguration(TwitterIncomingConnectorServiceFactory.class.getName(), + config, + connectorName); + configuration.getConnectorServiceConfigurations().add(inconf); CoreQueueConfiguration qc = new CoreQueueConfiguration(queue, queue, null, true); configuration.getQueueConfigurations().add(qc); server0 = createServer(false,configuration); server0.start(); - - TwitterConnectorService twitterService = server0.getTwitterConnectorService(); - Assert.assertEquals(0, twitterService.getIncomingConnectorCount()); - Assert.assertEquals(0, twitterService.getOutgoingConnectorCount()); + + Set<ConnectorService> conns = server0.getConnectorsService().getConnectors(); + Assert.assertEquals(1, conns.size()); + Iterator<ConnectorService> it = conns.iterator(); + Assert.assertFalse(it.next().isStarted()); } finally { @@ -299,41 +308,43 @@ Twitter twitter = new TwitterFactory().getInstance(TWITTER_USERNAME,TWITTER_PASSWORD); String testMessage = "TwitterTest/outgoing: " + System.currentTimeMillis(); log.debug("test outgoing: " + testMessage); - + try { Configuration configuration = createDefaultConfig(false); - TwitterConnectorConfiguration outconf = new TwitterConnectorConfiguration(); - outconf.setConnectorName("test-outgoing-connector"); - outconf.setIncoming(false); - outconf.setQueueName(queue); - outconf.setUserName(TWITTER_USERNAME); - outconf.setPassword(TWITTER_PASSWORD); - configuration.getTwitterConnectorConfigurations().add(outconf); + HashMap<String, Object> config = new HashMap<String, Object>(); + config.put(TwitterConstants.QUEUE_NAME, queue); + config.put(TwitterConstants.USER_NAME, TWITTER_USERNAME); + config.put(TwitterConstants.PASSWORD, TWITTER_PASSWORD); + ConnectorServiceConfiguration outconf = + new ConnectorServiceConfiguration(TwitterIncomingConnectorServiceFactory.class.getName(), + config, + "test-outgoing-connector"); + configuration.getConnectorServiceConfigurations().add(outconf); if(createQueue) { CoreQueueConfiguration qc = new CoreQueueConfiguration(queue, queue, null, false); configuration.getQueueConfigurations().add(qc); } - + server0 = createServer(false,configuration); server0.start(); - - TwitterConnectorService service = server0.getTwitterConnectorService(); + if(restart) { - service.stop(); - service.start(); + server0.getConnectorsService().stop(); + server0.getConnectorsService().start(); } - Assert.assertEquals(0, service.getIncomingConnectorCount()); + assertEquals(1, server0.getConnectorsService().getConnectors().size()); + Iterator<ConnectorService> connectorServiceIterator = server0.getConnectorsService().getConnectors().iterator(); if(createQueue) { - Assert.assertEquals(1, service.getOutgoingConnectorCount()); + Assert.assertTrue(connectorServiceIterator.next().isStarted()); } else { - Assert.assertEquals(0, service.getOutgoingConnectorCount()); + Assert.assertFalse(connectorServiceIterator.next().isStarted()); return; } @@ -347,11 +358,11 @@ producer.send(msg); Thread.sleep(3000); - + Paging page = new Paging(); page.setCount(1); ResponseList<Status> res = twitter.getHomeTimeline(page); - + Assert.assertEquals(testMessage, res.get(0).getText()); } finally @@ -401,22 +412,21 @@ try { Configuration configuration = createDefaultConfig(false); - TwitterConnectorConfiguration outconf = new TwitterConnectorConfiguration(); - outconf.setConnectorName(connectorName); - outconf.setIncoming(false); - outconf.setQueueName(queue); - outconf.setUserName(userName); - outconf.setPassword(password); - configuration.getTwitterConnectorConfigurations().add(outconf); + HashMap<String, Object> config = new HashMap<String, Object>(); + config.put(TwitterConstants.QUEUE_NAME, queue); + config.put(TwitterConstants.USER_NAME, userName); + config.put(TwitterConstants.PASSWORD, password); + ConnectorServiceConfiguration outconf = + new ConnectorServiceConfiguration(TwitterIncomingConnectorServiceFactory.class.getName(), + config, + "test-outgoing-connector"); + configuration.getConnectorServiceConfigurations().add(outconf); CoreQueueConfiguration qc = new CoreQueueConfiguration(queue, queue, null, false); configuration.getQueueConfigurations().add(qc); server0 = createServer(false,configuration); server0.start(); - - TwitterConnectorService service = server0.getTwitterConnectorService(); - Assert.assertEquals(0, service.getIncomingConnectorCount()); - Assert.assertEquals(0, service.getOutgoingConnectorCount()); + } finally { @@ -441,13 +451,15 @@ try { Configuration configuration = createDefaultConfig(false); - TwitterConnectorConfiguration outconf = new TwitterConnectorConfiguration(); - outconf.setConnectorName("test-outgoing-with-in-reply-to"); - outconf.setIncoming(false); - outconf.setQueueName(queue); - outconf.setUserName(TWITTER_USERNAME); - outconf.setPassword(TWITTER_PASSWORD); - configuration.getTwitterConnectorConfigurations().add(outconf); + HashMap<String, Object> config = new HashMap<String, Object>(); + config.put(TwitterConstants.QUEUE_NAME, queue); + config.put(TwitterConstants.USER_NAME, TWITTER_USERNAME); + config.put(TwitterConstants.PASSWORD, TWITTER_PASSWORD); + ConnectorServiceConfiguration outconf = + new ConnectorServiceConfiguration(TwitterIncomingConnectorServiceFactory.class.getName(), + config, + "test-outgoing-with-in-reply-to"); + configuration.getConnectorServiceConfigurations().add(outconf); CoreQueueConfiguration qc = new CoreQueueConfiguration(queue, queue, null, false); configuration.getQueueConfigurations().add(qc);