Merge branch 'AssertComparable' into 'master'

CompareCondition#assertComparable reduces code duplication

See merge request exedio/cope!1798

Author: rw7

runtime/src/com/exedio/cope/CompareCondition.java

@@ -64,6 +64,11 @@ public CompareCondition(
 		this.left = requireNonNull(left, "left");
 		this.right = requireNonNull(right, "right");
 
+		assertComparable(left, right);
+	}
+
+	static <E> void assertComparable(final Function<E> left, final E right)
+	{
 		if(!isComparable(left.getValueClass(), right.getClass(), right))
 		{
 			final StringBuilder sb = new StringBuilder();
@@ -78,7 +83,7 @@ public CompareCondition(
 	}
 
 	@SuppressWarnings("RedundantIfStatement")
-	static boolean isComparable(
+	private static boolean isComparable(
 			final Class<?> left,
 			final Class<?> right,
 			final Object rightValue)

runtime/src/com/exedio/cope/InCondition.java

@@ -1,6 +1,6 @@
 package com.exedio.cope;
 
-import static com.exedio.cope.CompareCondition.isComparable;
+import static com.exedio.cope.CompareCondition.assertComparable;
 import static com.exedio.cope.CompareCondition.toStringForValue;
 import static java.util.Objects.requireNonNull;
 
@@ -33,19 +33,7 @@ public final class InCondition<E> extends Condition
 
 
 		for (final E element : allowedValues)
-		{
-			if(! isComparable(function.getValueClass(), element.getClass(), element))
-			{
-				final StringBuilder sb = new StringBuilder();
-				sb.append(function).
-						append(" not comparable to '");
-				toStringForValue(sb, element, false);
-				sb.append("' (").
-						append(element.getClass().getName()).
-						append(')');
-				throw new IllegalArgumentException(sb.toString());
-			}
-		}
+			assertComparable(function, element);
 	}
 
 	@Override