Skip to content

Commit 1c96e55

Browse files
authored
transform classes with name containing ee9 or EE9 (#89)
* transform classes with name containing ee9 or EE9 Signed-off-by: Olivier Lamy <[email protected]> * fix class name change Signed-off-by: Olivier Lamy <[email protected]> --------- Signed-off-by: Olivier Lamy <[email protected]>
1 parent 9c48176 commit 1c96e55

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/main/java/org/eclipse/jetty/toolchain/modifysources/ModifyEE9ToEE8.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public Visitable visit(JavadocComment n, Void arg) {
518518
String previousFullClassName = previousPackage + "." + cu.getPrimaryTypeName().get();
519519
String fullClassName = previousPackage + "." + //
520520
StringUtils.replaceFirst(cu.getPrimaryTypeName().get(), "Jakarta", "Javax");
521-
String className = StringUtils.replaceFirst(cu.getPrimaryTypeName().get(), "Jakarta", "Javax");
521+
String className = replaceClassName(cu.getPrimaryTypeName().get());
522522
cu.getPrimaryType().get().setName(className);
523523

524524
Path newPath = out.resolve(fullClassName.replace('.', '/') + ".java");
@@ -550,6 +550,13 @@ public Visitable visit(JavadocComment n, Void arg) {
550550
}
551551

552552

553+
private String replaceClassName(String previousClassName) {
554+
String className = StringUtils.replace(previousClassName, "Jakarta", "Javax");
555+
className = StringUtils.replace(className, "ee9", "ee8");
556+
className = StringUtils.replace(className, "EE9", "EE8");
557+
return className;
558+
}
559+
553560
private static void changeEE9NameToEE8(NodeWithName n) {
554561
//org.eclipse.jetty.ee9.nested to org.eclipse.jetty.ee8.nested
555562
String currentName = n.getName().asString();

0 commit comments

Comments
 (0)