Skip to content

refactor(normalize-class): extract class name similarity check to method #65

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): extract class name similarity check to method #65

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
12 changes: 8 additions & 4 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 @@ -74,10 +74,7 @@ private void removeEmptyDerivedClasses(Outline outline) {
if (!isEmptyClass(implClass)) {
return;
}
var className = implClass.name();
var superClassName = definedSuperClass.name();
if (!(className.startsWith(superClassName) || className.endsWith(superClassName)
|| superClassName.startsWith(className) || superClassName.endsWith(className))) {
if (!isSimilarClassName(implClass.name(), definedSuperClass.name())) {
return;
}

Expand All @@ -99,6 +96,13 @@ private boolean isEmptyClass(JDefinedClass definedClass) {
&& !definedClass.classes().hasNext();
}

private boolean isSimilarClassName(String className, String superClassName) {
return className.startsWith(superClassName)
|| className.endsWith(superClassName)
|| superClassName.startsWith(className)
|| superClassName.endsWith(className);
}

private void clearAbstractModifier(JMods mods) {
try {
var flags = (int) JMODS_MODS_FIELD.get(mods);
Expand Down