Fix Wildcard Import Annotation Resolution

Author: rcosta358

liquidjava-example/src/main/java/testSuite/classes/arraylist_correct/ArrayListRefinements.java

@@ -1,8 +1,6 @@
 package testSuite.classes.arraylist_correct;
 
-import liquidjava.specification.ExternalRefinementsFor;
-import liquidjava.specification.RefinementPredicate;
-import liquidjava.specification.StateRefinement;
+import liquidjava.specification.*;
 
 @ExternalRefinementsFor("java.util.ArrayList")
 public interface ArrayListRefinements<E> {

liquidjava-example/src/main/java/testSuite/classes/socket_error/SocketRefinements.java

@@ -1,9 +1,7 @@
 package testSuite.classes.socket_error;
 
 import java.net.SocketAddress;
-import liquidjava.specification.ExternalRefinementsFor;
-import liquidjava.specification.StateRefinement;
-import liquidjava.specification.StateSet;
+import liquidjava.specification.*;
 
 @ExternalRefinementsFor("java.net.Socket")
 @StateSet({"unconnected", "binded", "connected", "closed"})

liquidjava-example/src/main/java/testSuite/classes/state_multiple_cases_correct/InputStreamReaderRefinements.java

@@ -1,10 +1,7 @@
 package testSuite.classes.state_multiple_cases_correct;
 
 import java.io.InputStream;
-import liquidjava.specification.ExternalRefinementsFor;
-import liquidjava.specification.Refinement;
-import liquidjava.specification.StateRefinement;
-import liquidjava.specification.StateSet;
+import liquidjava.specification.*;
 
 // https://docs.oracle.com/javase/7/docs/api/java/io/InputStreamReader.html
 @ExternalRefinementsFor("java.io.InputStreamReader")

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/TypeChecker.java

@@ -64,7 +64,7 @@ public Optional<Predicate> getRefinementFromAnnotation(CtElement element) throws
         Optional<Predicate> constr = Optional.empty();
         Optional<String> ref = Optional.empty();
         for (CtAnnotation<? extends Annotation> ann : element.getAnnotations()) {
-            String an = ann.getActualAnnotation().annotationType().getCanonicalName();
+            String an = ann.getAnnotationType().getQualifiedName();
             if (an.contentEquals("liquidjava.specification.Refinement")) {
                 String value = getStringFromAnnotation(ann.getValue("value"));
                 ref = Optional.of(value);
@@ -93,7 +93,7 @@ public Optional<Predicate> getRefinementFromAnnotation(CtElement element) throws
     @SuppressWarnings({ "rawtypes" })
     public Optional<String> getMessageFromAnnotation(CtElement element) {
         for (CtAnnotation<? extends Annotation> ann : element.getAnnotations()) {
-            String an = ann.getActualAnnotation().annotationType().getCanonicalName();
+            String an = ann.getAnnotationType().getQualifiedName();
             if (an.contentEquals("liquidjava.specification.Refinement")) {
                 Map<String, CtExpression> values = ann.getAllValues();
                 String msg = getStringFromAnnotation((values.get("msg")));
@@ -109,7 +109,7 @@ public Optional<String> getMessageFromAnnotation(CtElement element) {
     public void handleStateSetsFromAnnotation(CtElement element) throws LJError {
         int set = 0;
         for (CtAnnotation<? extends Annotation> ann : element.getAnnotations()) {
-            String an = ann.getActualAnnotation().annotationType().getCanonicalName();
+            String an = ann.getAnnotationType().getQualifiedName();
             if (an.contentEquals("liquidjava.specification.StateSet")) {
                 set++;
                 createStateSet((CtNewArray<String>) ann.getAllValues().get("value"), set, element);
@@ -266,7 +266,7 @@ protected void handleAlias(String ref, CtElement element, SourcePosition positio
 
     Optional<CtAnnotation<?>> getExternalRefinement(CtInterface<?> intrface) {
         for (CtAnnotation<? extends Annotation> ann : intrface.getAnnotations())
-            if (ann.getActualAnnotation().annotationType().getCanonicalName()
+            if (ann.getAnnotationType().getQualifiedName()
                     .contentEquals("liquidjava.specification.ExternalRefinementsFor")) {
                 return Optional.of(ann);
             }

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/object_checkers/AuxStateHandler.java

@@ -612,8 +612,7 @@ static VariableInstance getTarget(CtElement invocation) {
     }
 
     private static List<CtAnnotation<? extends Annotation>> getStateAnnotation(CtElement element) {
-        return element.getAnnotations().stream().filter(ann -> ann.getActualAnnotation().annotationType()
-                .getCanonicalName().contentEquals("liquidjava.specification.StateRefinement"))
-                .collect(Collectors.toList());
+        return element.getAnnotations().stream().filter(ann -> ann.getAnnotationType().getQualifiedName()
+                .contentEquals("liquidjava.specification.StateRefinement")).collect(Collectors.toList());
     }
 }