Revert "Revert "Jonmv/reapply application name validation""

2 files changed, 4 insertions, 4 deletions

diff --git a/testutil/src/main/java/com/yahoo/test/OrderTester.java b/testutil/src/main/java/com/yahoo/test/OrderTester.java
index 4acba4ee7fe..cc28ca9f469 100644
--- a/testutil/src/main/java/com/yahoo/test/OrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/OrderTester.java
@@ -15,8 +15,8 @@ import java.util.List;
  *
  */
 
-public abstract class OrderTester<T extends Comparable<T>> {
-    private ArrayList<List<T>> groups = new ArrayList<>();
+public abstract class OrderTester<T extends Comparable<? super T>> {
+    private final ArrayList<List<T>> groups = new ArrayList<>();
 
     abstract protected void lessTest(T a, T b);
     abstract protected void greaterTest(T a, T b);
@@ -24,7 +24,7 @@ public abstract class OrderTester<T extends Comparable<T>> {
 
     @SafeVarargs
     @SuppressWarnings("varargs")
-    private final OrderTester<T> addGroup(T... group) {
+    private OrderTester<T> addGroup(T... group) {
         groups.add(Arrays.asList(group));
         return this;
     }
diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
index 850369fbc2e..e95bc056ba8 100644
--- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
  * @author Vegard Sjonfjell
  */
 
-public class TotalOrderTester<T extends Comparable<T>> extends OrderTester<T> {
+public class TotalOrderTester<T extends Comparable<? super T>> extends OrderTester<T> {
     protected void lessTest(T a, T b) throws AssertionError {
         assertTrue(a + " must be less than " + b, a.compareTo(b) <= -1);
     }