More refactoring. Fixes federated disco#info issue.

Author: abmargb

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

@@ -2,18 +2,17 @@
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import org.buddycloud.channelserver.channel.node.configuration.Helper;
+
 import org.apache.log4j.Logger;
 import org.buddycloud.channelserver.channel.ChannelManager;
+import org.buddycloud.channelserver.channel.node.configuration.Helper;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
 import org.buddycloud.channelserver.packetprocessor.PacketProcessor;
 import org.buddycloud.channelserver.queue.FederatedQueueManager;
 import org.buddycloud.channelserver.queue.UnknownFederatedPacketException;
 import org.dom4j.Element;
 import org.xmpp.component.ComponentException;
 import org.xmpp.packet.IQ;
-import org.xmpp.packet.Packet;
 
 public class DiscoResult implements PacketProcessor<IQ> {
 
@@ -36,7 +35,8 @@ public void process(IQ reqIQ) throws Exception {
 		requestIq = reqIQ;
 		node = requestIq.getElement().element("query")
 				.attributeValue("node");
-		if (null == node) {
+		if (federatedQueueManager.isFederatedDiscoInfoRequest(
+				reqIQ.getID())) {
 			federatedRequest();
 			return;
 		}
@@ -48,10 +48,11 @@ public void process(IQ reqIQ) throws Exception {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void federatedRequest() throws ComponentException {
 		List<Element> identities = requestIq.getChildElement().elements(
 				"identity");
-		federatedQueueManager.processInfoResponses(requestIq.getFrom(),
+		federatedQueueManager.processDiscoInfoResponse(requestIq.getFrom(),
 				requestIq.getID(), identities);
 	}
 

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/discoitems/DiscoResult.java

@@ -33,6 +33,6 @@ public DiscoResult(BlockingQueue<Packet> outQueue,
 	public void process(IQ reqIQ) throws Exception {
 	    this.requestIq = reqIQ;
 	    List<Element> items = requestIq.getChildElement().elements("item");
-	    federatedQueueManager.sendInfoRequests(requestIq.getFrom(), items);
+	    federatedQueueManager.processDiscoItemsResponse(requestIq.getFrom(), items);
 	}
 }

src/main/java/org/buddycloud/channelserver/queue/FederatedQueueManager.java

@@ -64,6 +64,8 @@ private int getId() {
 
 	public void process(Packet packet) throws ComponentException {
 
+		logger.debug("Packet payload " + packet.toXML() + " going to federation.");
+		
 		String to = packet.getTo().toString();
 
 		String uniqueId = generateUniqueId(packet);
@@ -140,7 +142,7 @@ private void discoverRemoteChannelServer(String remoteDomain, String id)
 		remoteChannelDiscoveryStatus.put(remoteDomain, DISCO_ITEMS);
 	}
 
-	public void sendInfoRequests(JID from, List<Element> items)
+	public void processDiscoItemsResponse(JID from, List<Element> items)
 			throws ComponentException {
 
 		for (Element item : items) {
@@ -170,11 +172,15 @@ public void sendInfoRequests(JID from, List<Element> items)
 		remoteChannelDiscoveryStatus.put(from.toString(), DISCO_INFO);
 	}
 
+	public boolean isFederatedDiscoInfoRequest(String packetId) {
+		return remoteServerInfoRequestIds.containsKey(packetId);
+	}
+	
 	private void setDiscoveredServer(String server, String handler) {
 		discoveredServers.put(server, handler);
 	}
 
-	public void processInfoResponses(JID from, String id,
+	public void processDiscoInfoResponse(JID from, String id,
 			List<Element> identities) throws ComponentException {
 		String originatingServer = remoteServerInfoRequestIds.get(id);
 		if (originatingServer == null) {

src/test/java/org/buddycloud/channelserver/packetHandler/iq/namespace/discoinfo/DiscoResultTest.java

@@ -44,7 +44,7 @@ public void testPassingThroughServerDiscoInfoResultStanzaHandsOffToDoServerDisco
 		discoResult.process(result);
 
 		Mockito.verify(federatedQueueManager, Mockito.times(1))
-				.processInfoResponses(Mockito.any(JID.class),
+				.processDiscoInfoResponse(Mockito.any(JID.class),
 						Mockito.anyString(), Mockito.anyList());
 	}
 }

src/test/java/org/buddycloud/channelserver/queue/FederatedQueueManagerTest.java

@@ -76,7 +76,7 @@ public void testResponseToDiscoItemsRequestResultsInDiscoInfoRequests()
 		ArrayList<Element> items = new ArrayList<Element>();
 		items.add(item);
 
-		queueManager.sendInfoRequests(new JID("capulet.lit"), items);
+		queueManager.processDiscoItemsResponse(new JID("capulet.lit"), items);
 
 		Assert.assertEquals(1, channelsEngine.size());
 		Packet discoInfoRequest = channelsEngine.poll();
@@ -107,11 +107,11 @@ public void testNotProvidingChannelServerInItemsResponseResultsInErrorStanazaRet
 		item.addAttribute("jid", "channels.capulet.lit");
 		ArrayList<Element> items = new ArrayList<Element>();
 		items.add(item);
-		queueManager.sendInfoRequests(new JID("capulet.lit"), items);
+		queueManager.processDiscoItemsResponse(new JID("capulet.lit"), items);
 		channelsEngine.poll();
 
 		// Response to disco#info with no identities
-		queueManager.processInfoResponses(new JID("channels.capulter.lit"),
+		queueManager.processDiscoInfoResponse(new JID("channels.capulter.lit"),
 				channelsEngine.poll().getID(), new ArrayList<Element>());
 
 		// Expect error response to original packet
@@ -150,7 +150,7 @@ public void testPassingChannelServerIdentifierViaItemsResultsInQueuedPacketSendi
 		item.addAttribute("name", "buddycloud-server");
 		ArrayList<Element> items = new ArrayList<Element>();
 		items.add(item);
-		queueManager.sendInfoRequests(new JID("topics.capulet.lit"), items);
+		queueManager.processDiscoItemsResponse(new JID("topics.capulet.lit"), items);
 
 		// Note original packet now sent with remote channel server tag
 		Packet originalPacketRedirected = channelsEngine.poll();