Skip to content
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

Correctly set a superclass' corresponding class #383

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Correctly set a superclass' corresponding class #383

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
e44987a
Add some tests to check a superclass' corresponding class
guillermocalvo Feb 24, 2024
ce4efd6
Correctly set a superclass' corresponding class
guillermocalvo Feb 24, 2024
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
1 change: 1 addition & 0 deletions japicmp/src/main/java/japicmp/compat/CompatibilityChanges.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ private <T> void forAllSuperclasses(JApiClass jApiClass, Map<String, JApiClass>
}
classMap.put(foundClass.getFullyQualifiedName(), foundClass);
}
superclass.setJApiClass(foundClass);
T returnValue = onSuperclassCallback.callback(foundClass, classMap, superclass.getChangeStatus());
returnValues.add(returnValue);
forAllSuperclasses(foundClass, classMap, returnValues, onSuperclassCallback);
Expand Down
1 change: 0 additions & 1 deletion japicmp/src/main/java/japicmp/model/JApiClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ private JApiSuperclass extractSuperclass(Optional<CtClass> oldClassOptional, Opt
}
}
}
retVal.setJApiClass(this);
return retVal;
}

Expand Down
6 changes: 5 additions & 1 deletion japicmp/src/main/java/japicmp/model/JApiSuperclass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,14 @@ public List<JApiCompatibilityChange> getCompatibilityChanges() {
return this.compatibilityChanges;
}

void setJApiClass(JApiClass jApiClass) {
public void setJApiClass(JApiClass jApiClass) {
this.correspondingJApiClass = Optional.of(jApiClass);
}

public Optional<JApiClass> getCorrespondingJApiClass() {
return correspondingJApiClass;
}

/**
* Returns the {@link japicmp.model.JApiClass} this superclass belongs to.
* @return the JApiClass this superclass belongs to.
Expand Down
6 changes: 6 additions & 0 deletions japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ public List<CtClass> createNewClasses(ClassPool classPool) {
assertThat(jApiClass.getSuperclass().getCompatibilityChanges(), hasItem(JApiCompatibilityChange.SUPERCLASS_ADDED));
assertThat(jApiClass.isBinaryCompatible(), is(true));
JApiSuperclass superclass = jApiClass.getSuperclass();
assertEquals("japicmp.Test", superclass.getJApiClassOwning().getFullyQualifiedName());
assertEquals("japicmp.Superclass", superclass.getCorrespondingJApiClass().get().getFullyQualifiedName());
assertThat(superclass.isBinaryCompatible(), is(true));
assertThat(superclass.getCompatibilityChanges(), hasItem(JApiCompatibilityChange.SUPERCLASS_ADDED));
}
Expand All @@ -233,6 +235,8 @@ public List<CtClass> createNewClasses(ClassPool classPool) {
assertThat(jApiClass.getCompatibilityChanges().size(), is(0));
assertThat(jApiClass.isBinaryCompatible(), is(true));
JApiSuperclass superclass = jApiClass.getSuperclass();
assertEquals("japicmp.Test", superclass.getJApiClassOwning().getFullyQualifiedName());
assertEquals("java.lang.Object", superclass.getCorrespondingJApiClass().get().getFullyQualifiedName());
assertThat(superclass.isBinaryCompatible(), is(true));
assertThat(superclass.getCompatibilityChanges().size(), is(0));
}
Expand Down Expand Up @@ -370,6 +374,8 @@ public List<CtClass> createNewClasses(ClassPool classPool) {
assertThat(jApiMethod.getCompatibilityChanges(), hasItem(JApiCompatibilityChange.METHOD_REMOVED));
assertThat(jApiMethod.isBinaryCompatible(), is(false));
JApiSuperclass superclass = jApiClass.getSuperclass();
assertEquals("japicmp.Test", superclass.getJApiClassOwning().getFullyQualifiedName());
assertEquals("java.lang.Object", superclass.getCorrespondingJApiClass().get().getFullyQualifiedName());
assertThat(superclass.isBinaryCompatible(), is(true));
assertThat(superclass.getCompatibilityChanges().size(), is(0));
}
Expand Down
Loading