Skip to content

Fix Wildcard Import Annotation Resolution #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rcosta358 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Wildcard Import Annotation Resolution #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4f4b6d
Fix Wildcard Import Annotation Resolution
rcosta358 Mar 26, 2026
3823d53
Rename Method
rcosta358 Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...djava-example/src/main/java/testSuite/classes/arraylist_correct/ArrayListRefinements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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> {
Expand Down
4 changes: 1 addition & 3 deletions liquidjava-example/src/main/java/testSuite/classes/socket_error/SocketRefinements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"})
Expand Down
5 changes: 1 addition & 4 deletions ...ain/java/testSuite/classes/state_multiple_cases_correct/InputStreamReaderRefinements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
8 changes: 4 additions & 4 deletions liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/TypeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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")));
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down
11 changes: 5 additions & 6 deletions ...rc/main/java/liquidjava/processor/refinement_checker/object_checkers/AuxStateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class AuxStateHandler {
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public static void handleConstructorState(CtConstructor<?> c, RefinedFunction f, TypeChecker tc) throws LJError {
List<CtAnnotation<? extends Annotation>> an = getStateAnnotation(c);
List<CtAnnotation<? extends Annotation>> an = getStateAnnotations(c);
if (!an.isEmpty()) {
for (CtAnnotation<? extends Annotation> a : an) {
Map<String, CtExpression> m = a.getAllValues();
Expand Down Expand Up @@ -140,7 +140,7 @@ private static List<GhostFunction> getDifferentSets(TypeChecker tc, String klass
*/
public static void handleMethodState(CtMethod<?> method, RefinedFunction f, TypeChecker tc, String prefix)
throws LJError {
List<CtAnnotation<? extends Annotation>> an = getStateAnnotation(method);
List<CtAnnotation<? extends Annotation>> an = getStateAnnotations(method);
if (!an.isEmpty()) {
setFunctionStates(f, an, tc, method, prefix);
}
Expand Down Expand Up @@ -611,9 +611,8 @@ static VariableInstance getTarget(CtElement invocation) {
return null;
}

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());
private static List<CtAnnotation<? extends Annotation>> getStateAnnotations(CtElement element) {
return element.getAnnotations().stream().filter(ann -> ann.getAnnotationType().getQualifiedName()
Copy link
Copy Markdown
Collaborator

@CatarinaGamboa CatarinaGamboa Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

.contentEquals("liquidjava.specification.StateRefinement")).collect(Collectors.toList());
}
}
Loading