Test that non-iq & iq[type=result] do not get remapped

Author: Lloyd Watkin

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

@@ -74,11 +74,15 @@ public void process(Packet packet) throws ComponentException {
 		logger.debug("Packet payload " + packet.toXML() + " going to federation.");
 
 		String to = packet.getTo().toString();
+        String uniqueId = packet.getID();
+        
+        if (true == performIdMapping(packet)) {
 
-		String uniqueId = generateUniqueId(packet);
-		idMap.put(uniqueId, packet.getID());
-		packet.setID(uniqueId);
-
+			uniqueId = generateUniqueId(packet);
+			idMap.put(uniqueId, packet.getID());
+			packet.setID(uniqueId);
+        }
+        
 		sentRemotePackets.put(uniqueId, packet.getFrom());
 		try {
 			extractNodeDetails(packet);
@@ -114,6 +118,17 @@ public void process(Packet packet) throws ComponentException {
 		}
 	}
 
+	private boolean performIdMapping(Packet packet) {
+		if (false == packet.getElement().getName().equals("iq")) {
+			return false;
+		}
+		IQ iq = (IQ) packet;
+		if (true == iq.getType().equals(IQ.Type.result)) {
+			return false;
+		}
+		return true;
+	}
+
 	private void extractNodeDetails(Packet packet) {
 		try {
 			String packetXml = packet.toXML();

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

@@ -17,6 +17,7 @@
 import org.mockito.Mockito;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 import org.buddycloud.channelserver.channel.ChannelsEngineMock;
@@ -254,5 +255,45 @@ public void testOutgoingIqPacketsGetIdMapped() throws Exception {
 
 		Assert.assertTrue(originalId.equals(packetInternal.getID()));
 	}
+	
+	@Test
+	public void testNonIqPacketsDoNotGetIdMapped() throws Exception {
+		channelsEngine.clear();
 
+		String originalId = "id:12345";
+		Message packet = new Message();
+		packet.setFrom(new JID("romeo@montague.lit/street"));
+		packet.setTo(new JID("topics.capulet.lit"));
+		packet.getElement().addAttribute("remote-server-discover", "false");
+		packet.setID(originalId);
+		
+		queueManager.addChannelMap(new JID("topics.capulet.lit"));
+		
+		queueManager.process(packet.createCopy());
+		
+		Message packetExternal = (Message) channelsEngine.poll();
+
+		Assert.assertTrue(originalId.equals(packetExternal.getID()));
+	}
+	
+	@Test
+	public void testIqResultPacketsDontGetIdMapped() throws Exception {
+		channelsEngine.clear();
+
+		String originalId = "id:12345";
+		IQ packet = new IQ();
+		packet.setFrom(new JID("romeo@montague.lit/street"));
+		packet.setTo(new JID("topics.capulet.lit"));
+		packet.setType(IQ.Type.result);
+		packet.setID(originalId);
+		packet.getElement().addAttribute("remote-server-discover", "false");
+		
+		queueManager.addChannelMap(new JID("topics.capulet.lit"));
+		
+		queueManager.process(packet.createCopy());
+		
+		IQ packetExternal = (IQ) channelsEngine.poll();
+
+		Assert.assertTrue(originalId.equals(packetExternal.getID()));
+	}
 }