Fixed nasty RankedComparator bug (pointed out my Mira) where edge case values caused comparator malfunction

Change-Id: I85774e38449a96854bf88ab0889b05849157b586
Signed-off-by: Jakub Podlesak <[email protected]>

Author: japod

core-common/src/main/java/org/glassfish/jersey/model/internal/RankedComparator.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -66,7 +66,7 @@ public enum Order {
          */
         DESCENDING(-1);
 
-        private int ordering;
+        private final int ordering;
 
         private Order(int ordering) {
             this.ordering = ordering;
@@ -85,10 +85,10 @@ public RankedComparator(final Order order) {
 
     @Override
     public int compare(final RankedProvider<T> o1, final RankedProvider<T> o2) {
-        return (getPriority(o1) - getPriority(o2)) * order.ordering;
+        return ((getPriority(o1) > getPriority(o2)) ? order.ordering : -order.ordering);
     }
 
-    protected int getPriority(RankedProvider<T> rankedProvider) {
+    protected int getPriority(final RankedProvider<T> rankedProvider) {
         return rankedProvider.getRank();
     }
 }

core-common/src/test/java/org/glassfish/jersey/process/internal/RankedComparatorTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -71,6 +71,8 @@ public void testPriorityComparator() {
         list.add(new RankedProvider<Object>(new F100()));
         list.add(new RankedProvider<Object>(new F200()));
         list.add(new RankedProvider<Object>(new F200()));
+        list.add(new RankedProvider<Object>(new F_INT_MIN()));
+        list.add(new RankedProvider<Object>(new F_INT_MAX()));
         Collections.sort(list, new RankedComparator<Object>(RankedComparator.Order.ASCENDING));
         int max = Integer.MIN_VALUE;
         for (RankedProvider<Object> o : list) {
@@ -112,4 +114,11 @@ private static class F300 {
     private static class F1000 {
     }
 
+    @Priority(Integer.MIN_VALUE)
+    private static class F_INT_MIN {
+    }
+
+    @Priority(Integer.MAX_VALUE)
+    private static class F_INT_MAX {
+    }
 }