34: Prepare MR1

Task-Url: unitsofmeasurement/unit-tck#34

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.0, November 4, 2020
+ * @version 2.1, November 16, 2020
  * @author Werner Keil
  * @author Martin Desruisseaux
  * @since 1.0
@@ -221,7 +221,12 @@ private static final class Selector implements Predicate<ServiceProvider>, Compa
         public boolean test(ServiceProvider provider) {
             Object value = null;
             if (nameGetter != null) {
-                Annotation a = provider.getClass().getAnnotation(namedAnnotation);
+                Annotation a = null;
+                if (namedAnnotation != null) { 
+                	a = provider.getClass().getAnnotation(namedAnnotation);
+                } else if (jakartaNamedAnnotation != null) {
+                	a = provider.getClass().getAnnotation(jakartaNamedAnnotation);
+                }
                 if (a != null) try {
                     value = nameGetter.invoke(a, (Object[]) null);
                 } catch (IllegalAccessException | InvocationTargetException e) {
@@ -242,7 +247,12 @@ public boolean test(ServiceProvider provider) {
          */
         private int priority(ServiceProvider provider) {
             if (priorityGetter != null) {
-                Annotation a = provider.getClass().getAnnotation(priorityAnnotation);
+                Annotation a = null;
+                if (priorityAnnotation != null) { 
+                	a = provider.getClass().getAnnotation(priorityAnnotation);
+                } else if (jakartaPriorityAnnotation != null) {
+                	a = provider.getClass().getAnnotation(jakartaPriorityAnnotation);
+                }
                 if (a != null) try {
                     return (Integer) priorityGetter.invoke(a, (Object[]) null);
                 } catch (IllegalAccessException | InvocationTargetException e) {