Merge pull request #77 from norrisjeremy/more-annotation-api-tweaks

More annotation-api tweaks

Author: rbygrave

inject/src/main/java/io/avaje/inject/spi/DBeanContext.java

@@ -106,10 +106,6 @@ public <T> List<T> sortByPriority(List<T> list) {
 
   @Override
   public <T> List<T> sortByPriority(List<T> list, final Class<? extends Annotation> priorityAnnotation) {
-    if (priorityAnnotation == null) {
-      // priority annotation not on the classpath
-      return list;
-    }
     boolean priorityUsed = false;
     List<SortBean<T>> tempList = new ArrayList<>(list.size());
     for (T bean : list) {
@@ -250,7 +246,7 @@ private static class SortBean<T> implements Comparable<SortBean<T>> {
     int initPriority(Class<? extends Annotation> priorityAnnotation) {
       // Avoid adding hard dependency on javax.annotation-api by using reflection
       try {
-        Annotation ann = bean.getClass().getAnnotation(priorityAnnotation);
+        Annotation ann = bean.getClass().getDeclaredAnnotation(priorityAnnotation);
         if (ann != null) {
           int priority = (Integer) priorityAnnotation.getMethod("value").invoke(ann);
           priorityDefined = true;