Add asserts for single recipient assumptions

refs #40

src/routing/EpidemicOracleRouter.java

@@ -116,6 +116,7 @@ public class EpidemicOracleRouter extends ActiveRouter {
 		if (m.isFinalRecipient(this.getHost())) {
 			for (EpidemicOracleRouter r : allRouters) {
 				if (r != this && r != from.getRouter()) {
+					this.ensureMessageHasSingleRecipient(m);
 					r.removeDeliveredMessage(id);
 				}
 			}
@@ -156,10 +157,20 @@ public class EpidemicOracleRouter extends ActiveRouter {
 
 		/* was the message delivered to the final recipient? */
 		if (m.isFinalRecipient(con.getOtherNode(getHost()))) {
+			this.ensureMessageHasSingleRecipient(m);
 			this.deleteMessage(m.getId(), false);
 		}
 	}
 
+	/**
+	 * Ensures that the given message only has a single recipient.
+	 * @param msg Message to check.
+	 */
+	private void ensureMessageHasSingleRecipient(Message msg) {
+		assert msg instanceof OneToOneMessage :
+				"EpidemicOracleRouter only works with one to one messages";
+	}
+
 	@Override
 	public void update() {
 		/* nothing to do; all transfers are started only when new connections

src/routing/MaxPropRouter.java

@@ -217,6 +217,7 @@ public class MaxPropRouter extends ActiveRouter {
 
 		/* was the message delivered to the final recipient? */
 		if (m.isFinalRecipient(recipient)) {
+			this.ensureMessageHasSingleRecipient(m);
 			this.ackedMessageIds.add(m.getId()); // yes, add to ACKed messages
 			this.deleteMessage(m.getId(), false); // delete from buffer
 		}
@@ -459,6 +460,15 @@ public class MaxPropRouter extends ActiveRouter {
 		return (OneToOneMessage) msg;
 	}
 
+	/**
+	 * Ensures that the given message only has a single recipient.
+	 * @param msg Message to check.
+	 */
+	private void ensureMessageHasSingleRecipient(Message msg) {
+		assert msg instanceof OneToOneMessage :
+				"MaxPropRouter only works with one to one messages";
+	}
+
 	/**
 	 * Message comparator for the MaxProp routing module.
 	 * Messages that have a hop count smaller than the given

src/routing/MaxPropRouterWithEstimation.java

@@ -353,6 +353,7 @@ public class MaxPropRouterWithEstimation extends ActiveRouter {
 		Message m = con.getMessage();
 		/* was the message delivered to the final recipient? */
 		if (m.isFinalRecipient(con.getOtherNode(getHost()))) {
+			this.ensureMessageHasSingleRecipient(m);
 			this.ackedMessageIds.add(m.getId()); // yes, add to ACKed messages
 			this.deleteMessage(m.getId(), false); // delete from buffer
 		}
@@ -573,10 +574,19 @@ public class MaxPropRouterWithEstimation extends ActiveRouter {
 	 */
 	private OneToOneMessage castMessageToOneToOne(Message msg) {
 		assert msg instanceof OneToOneMessage :
-				"MaxPropRouter only works with one to one messages";
+				"MaxPropRouterWithEstimation only works with one to one messages";
 		return (OneToOneMessage) msg;
 	}
 
+	/**
+	 * Ensures that the given message only has a single recipient.
+	 * @param msg Message to check.
+	 */
+	private void ensureMessageHasSingleRecipient(Message msg) {
+		assert msg instanceof OneToOneMessage :
+				"MaxPropRouterWithEstimation only works with one to one messages";
+	}
+
 	/**
 	 * Message comparator for the MaxProp routing module.
 	 * Messages that have a hop count smaller than the given

[Ghost User]

Make this line start at column 9.

[Ghost User]

SonarQube analysis reported 21 issues:

• 1 critical
• 3 major
• 17 minor

Watch the comments in this conversation to review them. Note: the following issues could not be reported as comments because they are located on lines that are not displayed in this commit:

• Remove usage of generic wildcard type.
• Drop this interface in favor of "java.util.function.Supplier".
• Remove this unused "toReceivePolicy" private field.
• Remove this unused "fromReceivePolicy" private field.
• Rename this abstract class name to match the regular expression '^Abstract[A-Z][a-zA-Z0-9]*$'.
• Replace all tab characters in this file by sequences of white-spaces.
• Make this line start at column 13.
• Make this line start at column 13.
• Remove this unused import 'java.util.List'.
• Make this line start at column 5.
• Make this line start at column 5.
• Make this line start at column 9.
• Make this line start at column 9.
• Make this line start at column 9.
• Make this line start at column 9.
• Make this line start at column 9.
• Make this line start at column 13.
• Make this line start at column 17.