Skip to content

feat(normalize-class): skip removal of classes with dissimilar names to superclass #63

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): skip removal of classes with dissimilar names to superclass #63

Show file tree
Hide file tree
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
6 changes: 6 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 @@ -73,6 +73,12 @@ 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))) {
return;
}

JaxbClassRefactorUtil.removeFromParentContainer(implClass);
JaxbClassRefactorUtil.removeFromObjectFactory(implClass);
Expand Down
12 changes: 9 additions & 3 deletions plugins/src/test/java/io/github/rawvoid/jaxb/plugin/NormalizeClassPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,24 @@ void testNormalizeDuplicateClasses() throws Exception {

assertThat(classBySimpleName).containsKeys("NormalizeRoot", "Group", "AnotherGroup", "Entry");
assertThat(classBySimpleName).containsKey("BaseType");
assertThat(classBySimpleName).doesNotContainKey("EmptyChild");
assertThat(classBySimpleName).containsKey("BaseNode");
assertThat(classBySimpleName).containsKey("EmptyChild");
assertThat(classBySimpleName).doesNotContainKey("Node");
assertThat(classBySimpleName.get("Entry")).hasSize(1);

var groupClass = classBySimpleName.get("Group").getFirst();
var anotherGroupClass = classBySimpleName.get("AnotherGroup").getFirst();
var entryClass = classBySimpleName.get("Entry").getFirst();
var baseTypeClass = classBySimpleName.get("BaseType").getFirst();
var baseNodeClass = classBySimpleName.get("BaseNode").getFirst();
var emptyChildClass = classBySimpleName.get("EmptyChild").getFirst();
var normalizeRootClass = classBySimpleName.get("NormalizeRoot").getFirst();

assertThat(groupClass.getDeclaredField("entry").getType()).isEqualTo(entryClass);
assertThat(anotherGroupClass.getDeclaredField("entry").getType()).isEqualTo(entryClass);
assertThat(normalizeRootClass.getDeclaredField("emptyChild").getType()).isEqualTo(baseTypeClass);
assertThat(Modifier.isAbstract(baseTypeClass.getModifiers())).isFalse();
assertThat(normalizeRootClass.getDeclaredField("emptyChild").getType()).isEqualTo(emptyChildClass);
assertThat(normalizeRootClass.getDeclaredField("node").getType()).isEqualTo(baseNodeClass);
assertThat(Modifier.isAbstract(baseTypeClass.getModifiers())).isTrue();
assertThat(Modifier.isAbstract(baseNodeClass.getModifiers())).isFalse();
}
}
9 changes: 9 additions & 0 deletions plugins/src/test/resources/schema/normalize-class.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
</xs:complexType>
</xs:element>
<xs:element name="emptyChild" type="tns:EmptyChild"/>
<xs:element name="node" type="tns:Node"/>
</xs:sequence>
</xs:complexType>

Expand All @@ -60,5 +61,13 @@
</xs:complexContent>
</xs:complexType>

<xs:complexType name="BaseNode" abstract="true"/>

<xs:complexType name="Node">
<xs:complexContent>
<xs:extension base="tns:BaseNode"/>
</xs:complexContent>
</xs:complexType>

<xs:element name="normalizeRoot" type="tns:NormalizeRoot"/>
</xs:schema>