212: Add new Jakarta Annotations

Task-Url: #212

Author: keilw

src/main/java/javax/measure/spi/ServiceProvider.java

@@ -56,7 +56,7 @@
  * All the methods in this class are safe to use by multiple concurrent threads.
  * </p>
  *
- * @version 2.1, November 16, 2020
+ * @version 2.2, November 16, 2020
  * @author Werner Keil
  * @author Martin Desruisseaux
  * @since 1.0
@@ -106,9 +106,9 @@ protected ServiceProvider() {
      * Allows to define a priority for a registered {@code ServiceProvider} instance.
      * When multiple providers are registered in the system, the provider with the highest priority value is taken.
      *
-     * <p>If the {@value #PRIORITY_ANNOTATION} annotation (from JSR-250) is present on the {@code ServiceProvider}
-     * implementation class, then that annotation is taken and this {@code getPriority()} method is ignored.
-     * Otherwise – if the {@code Priority} annotation is absent – this method is used as a fallback.</p>
+     * <p>If the {@value #PRIORITY_ANNOTATION} annotation (from JSR-250) or {@value #JAKARTA_PRIORITY_ANNOTATION} annotation (from Jakarta Annotations) is present on the {@code ServiceProvider}
+     * implementation class, then that annotation (first if both were present) is taken and this {@code getPriority()} method is ignored.
+     * Otherwise – if a {@code Priority} annotation is absent – this method is used as a fallback.</p>
      *
      * @return the provider's priority (default is 0).
      */
@@ -242,8 +242,8 @@ public boolean test(ServiceProvider provider) {
 
         /**
          * Returns the priority of the given service provider.
-         * This method looks for the {@value #PRIORITY_ANNOTATION} annotation,
-         * and if none are found fallbacks on {@link ServiceProvider#getPriority()}.
+         * This method looks for the {@value #PRIORITY_ANNOTATION} annotation or {@value #JAKARTA_PRIORITY_ANNOTATION},
+         * and if none are found falls back on {@link ServiceProvider#getPriority()}.
          */
         private int priority(ServiceProvider provider) {
             if (priorityGetter != null) {
@@ -269,7 +269,9 @@ private int priority(ServiceProvider provider) {
          */
         @Override
         public int compare(final ServiceProvider p1, final ServiceProvider p2) {
-            return Integer.compare(priority(p1), priority(p2));
+        	final int i1 = priority(p1);
+        	final int i2 = priority(p2);
+            return Integer.compare(i2, i1); // reverse order, higher number first.
         }
 
         /**