Skip to content

feat(normalize-class): remove empty derived classes and update superclass references #61

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

feat(normalize-class): remove empty derived classes and update superclass references #61

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
54 changes: 54 additions & 0 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 @@ -36,8 +36,23 @@
@Option(name = "Xnormalize-class", description = "Normalize generated classes")
public class NormalizeClassPlugin extends AbstractPlugin {

private static final String FIELD_MODS = "mods";

private static final java.lang.reflect.Field JMODS_MODS_FIELD = getField(JMods.class, FIELD_MODS);

private static java.lang.reflect.Field getField(Class<?> type, String name) {
try {
var field = type.getDeclaredField(name);
field.setAccessible(true);
return field;
} catch (NoSuchFieldException ex) {
throw new IllegalStateException("Failed to access field '" + name + "' on " + type.getName(), ex);
}
}

@Override
public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) throws SAXException {
removeEmptyDerivedClasses(outline);
outline.getAllPackageContexts().forEach(packageOutline -> {
removeDuplicateClasses(packageOutline);
});
Expand All @@ -47,6 +62,45 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) thro
return true;
}

private void removeEmptyDerivedClasses(Outline outline) {
var classOutlines = new ArrayList<>(outline.getClasses());
classOutlines.forEach(classOutline -> {
var implClass = classOutline.implClass;
var superClass = implClass.superClass();
if (!(superClass instanceof JDefinedClass definedSuperClass)) {
return;
}
if (!isEmptyClass(implClass)) {
return;
}

JaxbClassRefactorUtil.removeFromParentContainer(implClass);
JaxbClassRefactorUtil.removeFromObjectFactory(implClass);

outline.getClasses().forEach(c ->
JaxbClassRefactorUtil.replaceClassReferences(c.implClass, implClass, definedSuperClass));

if (definedSuperClass.isAbstract()) {
clearAbstractModifier(definedSuperClass.mods());
}
});
}

private boolean isEmptyClass(JDefinedClass definedClass) {
return definedClass.fields().isEmpty()
&& definedClass.methods().isEmpty()
&& !definedClass.classes().hasNext();
}

private void clearAbstractModifier(JMods mods) {
try {
var flags = (int) JMODS_MODS_FIELD.get(mods);
JMODS_MODS_FIELD.set(mods, flags & ~JMod.ABSTRACT);
} catch (IllegalAccessException ex) {
throw new IllegalStateException("Failed to clear abstract modifier", ex);
}
}

private void removeDuplicateClasses(PackageOutline packageOutline) {
var classOutlines = packageOutline.getClasses();
var classOutlinesGroup = classOutlines.stream()
Expand Down