Moving checks for local domains, jids and nodes to the Configuration

class.

Author: abmargb

src/main/java/org/buddycloud/channelserver/ChannelsEngine.java

@@ -7,7 +7,6 @@
 import org.apache.log4j.Logger;
 import org.buddycloud.channelserver.channel.ChannelManagerFactory;
 import org.buddycloud.channelserver.channel.ChannelManagerFactoryImpl;
-import org.buddycloud.channelserver.channel.Conf;
 import org.buddycloud.channelserver.db.DefaultNodeStoreFactoryImpl;
 import org.buddycloud.channelserver.db.NodeStoreFactory;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
@@ -109,8 +108,7 @@ private void setupManagers() throws ComponentException {
 			throw new ComponentException(e);
 		}
 
-		channelManagerFactory = new ChannelManagerFactoryImpl(configuration,
-				nodeStoreFactory);
+		channelManagerFactory = new ChannelManagerFactoryImpl(nodeStoreFactory);
 		federatedQueueManager = new FederatedQueueManager(this,
 				configuration);
 		onlineUsers = new OnlineResourceManager(configuration, channelManagerFactory.create());

src/main/java/org/buddycloud/channelserver/Configuration.java

@@ -11,6 +11,7 @@
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.channel.LocalDomainChecker;
 import org.xmpp.packet.JID;
 
 public class Configuration extends Properties {
@@ -19,6 +20,7 @@ public class Configuration extends Properties {
 	private static final long serialVersionUID = 1L;
 
 	private static final String ARRAY_PROPERTY_SEPARATOR = ";";
+	private static final String INVALID_NODE = "Illegal node format";
 
 	public static final String CONFIGURATION_SERVER_DOMAIN = "server.domain";
 	public static final String CONFIGURATION_SERVER_CHANNELS_DOMAIN = "server.domain.channels";
@@ -95,6 +97,10 @@ public static Configuration getInstance() {
 		}
 		return instance;
 	}
+	
+	public static void reset() {
+		instance = null;
+	}
 
 	public String getProperty(String key) {
 		return conf.getProperty(key);
@@ -112,6 +118,10 @@ public void clear() {
 	public String getProperty(String key, String defaultValue) {
 		return conf.getProperty(key, defaultValue);
 	}
+	
+	public void putProperty(String key, String value) {
+		conf.put(key, value);
+	}
 
 	public void load(InputStream inputStream) throws IOException {
 		conf.load(inputStream);
@@ -199,4 +209,22 @@ public String getComponentPort() {
 	public String getXmppHost() {
 		return this.getProperty(XMPP_HOST, "127.0.0.1");
 	}
+	
+	public boolean isLocalDomain(String domain) {
+		return LocalDomainChecker.isLocal(domain, this);
+	}
+	
+	public boolean isLocalNode(String nodeId) {
+		if (false == nodeId.matches("/user/.+@.+/.+")) {
+			LOGGER.debug("Node " + nodeId + " has an invalid format");
+			throw new IllegalArgumentException(INVALID_NODE);
+		}
+		String domain = new JID(nodeId.split("/")[2]).getDomain();
+		return isLocalDomain(domain);
+	}
+	
+	public boolean isLocalJID(JID jid) {
+		String domain = jid.getDomain();
+		return isLocalDomain(domain);
+	}
 }

src/main/java/org/buddycloud/channelserver/channel/ChannelManager.java

@@ -19,40 +19,6 @@ public interface ChannelManager extends NodeStore {
 	 * @throws NodeStoreException
 	 */
 	void createPersonalChannel(JID ownerJID) throws NodeStoreException;
-
-	/**
-	 * Determines whether the node id given refers to a local node.
-	 * 
-	 * @param nodeId
-	 *            the node id
-	 * @return <code>true</code> if the node appears to be local,
-	 *         <code>false</code> otherwise.
-	 * @throws NodeStoreException
-	 */
-	boolean isLocalNode(String nodeId) throws NodeStoreException;
-
-	/**
-	 * Determines whether the jid refers to a local user.
-	 * 
-	 * @param jid
-	 *            the user's jid
-	 * @return <code>true</code> if the jid appears to be local,
-	 *         <code>false</code> otherwise.
-	 * @throws NodeStoreException
-	 */
-	boolean isLocalJID(JID jid) throws NodeStoreException;
-	
-	/**
-	 * Determines whether the domain is served by this server.
-	 * 
-	 * @param domain
-	 *            the domain name
-	 * @return <code>true</code> if the domain appears to be local,
-	 *         <code>false</code> otherwise.
-	 * @throws NodeStoreException
-	 */
-	boolean isLocalDomain(String domain) throws NodeStoreException;
-
 
 	/**
 	 * Deletes all data from remote nodes

src/main/java/org/buddycloud/channelserver/channel/ChannelManagerFactoryImpl.java

@@ -1,22 +1,18 @@
 package org.buddycloud.channelserver.channel;
 
-import java.util.Properties;
-
 import org.buddycloud.channelserver.db.NodeStoreFactory;
 
 public class ChannelManagerFactoryImpl implements ChannelManagerFactory {
 
-	private final Properties configuration;
 	private final NodeStoreFactory nodeStoreFactory;
 
-	public ChannelManagerFactoryImpl(final Properties configuration, final NodeStoreFactory nodeStoreFactory) {
-		this.configuration = configuration;
+	public ChannelManagerFactoryImpl(final NodeStoreFactory nodeStoreFactory) {
 		this.nodeStoreFactory = nodeStoreFactory;
 	}
 
 	@Override
 	public ChannelManager create() {
-		return new ChannelManagerImpl(nodeStoreFactory.create(), configuration);
+		return new ChannelManagerImpl(nodeStoreFactory.create());
 	}
 
 }

src/main/java/org/buddycloud/channelserver/channel/ChannelManagerImpl.java

@@ -4,9 +4,9 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.db.ClosableIteratorImpl;
 import org.buddycloud.channelserver.db.CloseableIterator;
 import org.buddycloud.channelserver.db.NodeStore;
@@ -28,12 +28,10 @@
 public class ChannelManagerImpl implements ChannelManager {
 
 	private final NodeStore nodeStore;
-	private final Properties configuration;
 
 	private static final Logger logger = Logger
 			.getLogger(ChannelManagerImpl.class);
 
-	private static final String INVALID_NODE = "Illegal node format";
 	private static final String REMOTE_NODE = "Illegal remote node";
 
 	/**
@@ -42,10 +40,8 @@ public class ChannelManagerImpl implements ChannelManager {
 	 * @param nodeStore
 	 *            the backing {@link NodeStore}.
 	 */
-	public ChannelManagerImpl(final NodeStore nodeStore,
-			final Properties configuration) {
+	public ChannelManagerImpl(final NodeStore nodeStore) {
 		this.nodeStore = nodeStore;
-		this.configuration = configuration;
 	}
 
 	@Override
@@ -220,7 +216,7 @@ public Transaction beginTransaction() throws NodeStoreException {
 
 	@Override
 	public void createPersonalChannel(JID owner) throws NodeStoreException {
-		if (false == isLocalJID(owner)) {
+		if (false == Configuration.getInstance().isLocalJID(owner)) {
 			throw new IllegalArgumentException(REMOTE_NODE);
 		}
 		if (!nodeExists(Conf.getPostChannelNodename(owner))) {
@@ -249,27 +245,6 @@ public void createPersonalChannel(JID owner) throws NodeStoreException {
 		}
 	}
 
-	@Override
-	public boolean isLocalDomain(String domain) {
-		return LocalDomainChecker.isLocal(domain, configuration);
-	}
-	
-	@Override
-	public boolean isLocalNode(String nodeId) {
-		if (false == nodeId.matches("/user/.+@.+/.+")) {
-			logger.debug("Node " + nodeId + " has an invalid format");
-			throw new IllegalArgumentException(INVALID_NODE);
-		}
-		String domain = new JID(nodeId.split("/")[2]).getDomain();
-		return isLocalDomain(domain);
-	}
-	
-	@Override
-	public boolean isLocalJID(JID jid) {
-		String domain = jid.getDomain();
-		return isLocalDomain(domain);
-	}
-
 	@Override
 	public void close() throws NodeStoreException {
 		nodeStore.close();

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/discoinfo/DiscoInfoGet.java

@@ -4,6 +4,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.BlockingQueue;
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.channel.node.configuration.field.AccessModel;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
@@ -46,14 +47,14 @@ public void process(IQ reqIQ) throws Exception {
 		node = elm.attributeValue("node");
 		query = result.setChildElement(ELEMENT_NAME,
 				JabberDiscoInfo.NAMESPACE_URI);
-		if (false == channelManager.isLocalJID(requestIq.getFrom())) {
+		if (false == Configuration.getInstance().isLocalJID(requestIq.getFrom())) {
 			result.getElement().addAttribute("remote-server-discover", "false");
 		}
 		if ((node == null) || (true == node.equals(""))) {
 			sendServerDiscoInfo();
 			return;
 		}
-		if (false == channelManager.isLocalNode(node)
+		if (false == Configuration.getInstance().isLocalNode(node)
 				&& (false == channelManager.isCachedNode(node))) {
 			logger.info("Node " + node + " is remote and not cached so "
 					+ "we're going off to get disco#info");
@@ -92,7 +93,7 @@ private void sendNodeConfigurationInformation() throws Exception {
 			value = configuration.get(key);
 			if ((true == key.equals(AccessModel.FIELD_NAME))
 					&& (value.equals(AccessModel.local.toString()))
-					&& (false == channelManager.isLocalJID(requestIq.getFrom()))) {
+					&& (false == Configuration.getInstance().isLocalJID(requestIq.getFrom()))) {
 				value = AccessModel.authorize.toString();
 			}
 			x.addField(key, null, null).addValue(value);

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/mam/MessageArchiveManagement.java

@@ -5,6 +5,7 @@
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.channel.Conf;
 import org.buddycloud.channelserver.db.CloseableIterator;
@@ -59,7 +60,7 @@ public void process(IQ reqIQ) throws Exception {
 		requestIq = reqIQ;
 		reply = IQ.createResultIQ(requestIq);
 
-		if (false == channelManager.isLocalJID(requestIq.getFrom())) {
+		if (false == Configuration.getInstance().isLocalJID(requestIq.getFrom())) {
 			this._sendNotHandledStanza();
 			return;
 		}

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/AffiliationsGet.java

@@ -3,16 +3,15 @@
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessor;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubGet;
 import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
-import org.buddycloud.channelserver.pubsub.model.NodeAffiliation;
 import org.buddycloud.channelserver.pubsub.model.NodeMembership;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
-import org.buddycloud.channelserver.queue.FederatedQueueManager;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
 import org.xmpp.packet.IQ;
@@ -29,11 +28,7 @@ public class AffiliationsGet implements PubSubElementProcessor {
 	private String node;
 	private JID actorJid;
 	private IQ result;
-	private Element resultSetManagement;
 	private String firstItem;
-	private String lastItem;
-	private int totalEntriesCount;
-	private Boolean isOwnerModerator;
 
 	private static final Logger logger = Logger
 			.getLogger(AffiliationsGet.class);
@@ -51,9 +46,8 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 		requestIq = reqIQ;
 		actorJid = actorJID;
 		node = elm.attributeValue("node");
-		resultSetManagement = rsm;
 
-		if (false == channelManager.isLocalJID(requestIq.getFrom())) {
+		if (false == Configuration.getInstance().isLocalJID(requestIq.getFrom())) {
 			result.getElement().addAttribute("remote-server-discover", "false");
 		}
 		String namespace = JabberPubsub.NS_PUBSUB_OWNER;
@@ -82,7 +76,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 
 	private boolean getNodeAffiliations(Element affiliations)
 			throws NodeStoreException, InterruptedException {
-		if (false == channelManager.isLocalNode(node)
+		if (false == Configuration.getInstance().isLocalNode(node)
 				&& (false == channelManager.isCachedNode(node))) {
 			makeRemoteRequest(node.split("/")[2]);
 			return false;
@@ -91,7 +85,7 @@ private boolean getNodeAffiliations(Element affiliations)
 		nodeMemberships = channelManager.getNodeMemberships(node);
 
 		if ((0 == nodeMemberships.size())
-			&& (false == channelManager.isLocalNode(node))) {
+			&& (false == Configuration.getInstance().isLocalNode(node))) {
 			makeRemoteRequest(node.split("/")[2]);
 			return false;
 		}
@@ -111,8 +105,9 @@ private boolean getNodeAffiliations(Element affiliations)
 			logger.trace("Adding affiliation for " + nodeMembership.getUser()
 					+ " affiliation " + nodeMembership.getAffiliation());
 
-			if (null == firstItem) firstItem = nodeMembership.getUser().toString();
-			lastItem = nodeMembership.getUser().toString();
+			if (null == firstItem) {
+				firstItem = nodeMembership.getUser().toString();
+			}
 
 			affiliations
 					.addElement("affiliation")
@@ -132,7 +127,7 @@ private boolean isOwnerModerator() throws NodeStoreException {
 	private boolean getUserMemberships(Element affiliations)
 			throws NodeStoreException, InterruptedException {
 
-		if (false == channelManager.isLocalJID(actorJid)
+		if (false == Configuration.getInstance().isLocalJID(actorJid)
 				&& (false == channelManager.isCachedJID(requestIq.getFrom()))) {
 			makeRemoteRequest(actorJid.getDomain());
 			return false;
@@ -157,7 +152,6 @@ private boolean getUserMemberships(Element affiliations)
 					+ " (no node provided)");
 
 			if (null == firstItem) firstItem = membership.getNodeId();
-			lastItem = membership.getNodeId();
 
 			affiliations
 					.addElement("affiliation")

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/NodeConfigureGet.java

@@ -4,6 +4,7 @@
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.channel.node.configuration.field.AccessModel;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
@@ -52,7 +53,7 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 			return;
 		}
 
-		if (!channelManager.isLocalNode(node) && !channelManager.isCachedNodeConfig(node)) {
+		if (!Configuration.getInstance().isLocalNode(node) && !channelManager.isCachedNodeConfig(node)) {
 			makeRemoteRequest();
 			return;
 		}
@@ -90,7 +91,7 @@ private void getNodeConfiguration() throws Exception {
 			value = nodeConf.get(key);
 			if ((true == key.equals(AccessModel.FIELD_NAME))
 					&& (value.equals(AccessModel.local.toString()))
-					&& (false == channelManager.isLocalJID(actor))) {
+					&& (false == Configuration.getInstance().isLocalJID(actor))) {
 				value = AccessModel.authorize.toString();
 			}
 			x.addField(key, null, null).addValue(value);