Skip to content

Commit c0e57bf

Browse files
authored
Merge pull request #65
refactor(normalize-class): extract class name similarity check to method
2 parents 75348cc + fed5ccf commit c0e57bf

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

plugins/src/main/java/io/github/rawvoid/jaxb/plugin/NormalizeClassPlugin.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ private void removeEmptyDerivedClasses(Outline outline) {
7474
if (!isEmptyClass(implClass)) {
7575
return;
7676
}
77-
var className = implClass.name();
78-
var superClassName = definedSuperClass.name();
79-
if (!(className.startsWith(superClassName) || className.endsWith(superClassName)
80-
|| superClassName.startsWith(className) || superClassName.endsWith(className))) {
77+
if (!isSimilarClassName(implClass.name(), definedSuperClass.name())) {
8178
return;
8279
}
8380

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

99+
private boolean isSimilarClassName(String className, String superClassName) {
100+
return className.startsWith(superClassName)
101+
|| className.endsWith(superClassName)
102+
|| superClassName.startsWith(className)
103+
|| superClassName.endsWith(className);
104+
}
105+
102106
private void clearAbstractModifier(JMods mods) {
103107
try {
104108
var flags = (int) JMODS_MODS_FIELD.get(mods);

0 commit comments

Comments
 (0)