Skip to content

refactor(normalize-class): only remove classes with same name and identical structure #60

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

Merged
rawvoid merged 1 commit into from
Feb 4, 2026
Merged

refactor(normalize-class): only remove classes with same name and identical structure #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 25 additions & 18 deletions plugins/src/main/java/io/github/rawvoid/jaxb/plugin/NormalizeClassPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,28 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) thro

private void removeDuplicateClasses(PackageOutline packageOutline) {
var classOutlines = packageOutline.getClasses();
var classOutlinesGroup = classOutlines.stream()
.collect(Collectors.groupingBy(c -> c.implClass.name().toUpperCase()));

var groupedClasses = groupingEqualClasses(classOutlines);
for (var groupedClass : groupedClasses) {
if (groupedClass.size() <= 1) {
continue;
classOutlinesGroup.forEach((name, sameNameClasses) -> {
if (sameNameClasses.size() == 1) {
return;
}
groupedClass.sort(Comparator.comparing(this::innerDepth));
var savingClass = groupedClass.getFirst();
var groupedClasses = groupingEqualClasses(sameNameClasses);
if (groupedClasses.size() > 1) {
return;
}
for (var groupedClass : groupedClasses) {
if (groupedClass.size() <= 1) {
continue;
}
groupedClass.sort(Comparator.comparing(this::innerDepth));
var savingClass = groupedClass.getFirst();

var removeClasses = groupedClass.subList(1, groupedClass.size());
removeAndReplaceClass(removeClasses, savingClass);
}
var removeClasses = groupedClass.subList(1, groupedClass.size());
removeAndReplaceClass(removeClasses, savingClass);
}
});
}

private int innerDepth(ClassOutline classOutline) {
Expand All @@ -77,15 +87,13 @@ private int innerDepth(JDefinedClass definedClass) {
return depth;
}

private List<List<ClassOutline>> groupingEqualClasses(Set<? extends ClassOutline> classes) {
private List<List<ClassOutline>> groupingEqualClasses(Collection<? extends ClassOutline> classes) {
List<List<ClassOutline>> groupedClasses = new ArrayList<>();
for (var classOutline : classes) {
groupedClasses.stream()
.filter(group -> isEqual(group.getFirst().implClass, classOutline.implClass))
.findFirst()
.ifPresentOrElse(group -> group.add(classOutline),
() -> groupedClasses.add(new ArrayList<>(List.of(classOutline))));
}
classes.forEach(classOutline -> groupedClasses.stream()
.filter(group -> isEqual(group.getFirst().implClass, classOutline.implClass))
.findFirst()
.ifPresentOrElse(group -> group.add(classOutline),
() -> groupedClasses.add(new ArrayList<>(List.of(classOutline)))));
return groupedClasses;
}

Expand All @@ -109,7 +117,6 @@ private boolean isEqual(JDefinedClass class1, JDefinedClass class2) {
}

if (class1.classes().hasNext() || class2.classes().hasNext()) {

return false;
}

Expand Down