Skip to content

Commit d4787eb

Browse files
olamyolamy
committed
do not limit types to startsWith Jakarta but use contains
Signed-off-by: Olivier Lamy <[email protected]>
1 parent bf4e23f commit d4787eb

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public void execute()
154154
cu.findAll(VariableDeclarator.class).forEach(vd -> {
155155
if (vd.getType() instanceof ClassOrInterfaceType) {
156156
String nameAsString = ((ClassOrInterfaceType)vd.getType()).getNameAsString();
157-
if (nameAsString.startsWith("Jakarta")) {
158-
((ClassOrInterfaceType)vd.getType()).setName(nameAsString.replaceFirst("Jakarta", "Javax"));
157+
if (nameAsString.contains("Jakarta")) {
158+
((ClassOrInterfaceType)vd.getType()).setName(nameAsString.replace("Jakarta", "Javax"));
159159
}
160160
}
161161
if (StringUtils.equals(vd.getNameAsString(), "SERVLET_MAJOR_VERSION")) {
@@ -166,15 +166,15 @@ public void execute()
166166

167167
cu.findAll(ConstructorDeclaration.class).forEach(cd -> {
168168
String typeName = cd.getNameAsString();
169-
if(typeName.startsWith("Jakarta")) {
170-
cd.setName(typeName.replaceFirst("Jakarta", "Javax"));
169+
if(typeName.contains("Jakarta")) {
170+
cd.setName(typeName.replace("Jakarta", "Javax"));
171171
}
172172
cd.getParameters().forEach(parameter -> {
173173
if(parameter.getType() instanceof ClassOrInterfaceType) {
174174
ClassOrInterfaceType cit = ((ClassOrInterfaceType)parameter.getType());
175175
String name = cit.getNameAsString();
176-
if(name.startsWith("Jakarta")) {
177-
cit.setName(name.replaceFirst("Jakarta", "Javax"));
176+
if(name.contains("Jakarta")) {
177+
cit.setName(name.replace("Jakarta", "Javax"));
178178
}
179179
}
180180
});
@@ -190,17 +190,17 @@ public void execute()
190190
.map(type -> (ClassOrInterfaceType) type)
191191
.forEach(classOrInterfaceType -> {
192192
String currentName = classOrInterfaceType.getNameAsString();
193-
if (currentName.startsWith("Jakarta")) {
194-
classOrInterfaceType.setName(currentName.replaceFirst("Jakarta", "Javax"));
193+
if (currentName.contains("Jakarta")) {
194+
classOrInterfaceType.setName(currentName.replace("Jakarta", "Javax"));
195195
}
196196
})
197197
);
198198

199199
cu.findAll(NameExpr.class).stream()
200-
.filter(nameExpr -> nameExpr.getNameAsString().startsWith("Jakarta"))
200+
.filter(nameExpr -> nameExpr.getNameAsString().contains("Jakarta"))
201201
.forEach(nameExpr -> {
202202
String className = nameExpr.getNameAsString();
203-
nameExpr.setName(className.replaceFirst("Jakarta", "Javax"));
203+
nameExpr.setName(className.replace("Jakarta", "Javax"));
204204
});
205205

206206
cu.accept(
@@ -261,10 +261,10 @@ public Visitable visit(MethodCallExpr n, Void arg) {
261261

262262
n.getArguments().stream().filter(node -> node instanceof NodeWithSimpleName)
263263
.map(node -> (NodeWithSimpleName<?>)node)
264-
.filter(nameExpr -> nameExpr.getNameAsString().startsWith("Jakarta"))
264+
.filter(nameExpr -> nameExpr.getNameAsString().contains("Jakarta"))
265265
.forEach(nameExpr -> {
266266
String className = nameExpr.getNameAsString();
267-
nameExpr.setName(className.replaceFirst("Jakarta", "Javax"));
267+
nameExpr.setName(className.replace("Jakarta", "Javax"));
268268
});
269269

270270
n.getChildNodes().stream().filter(node -> node instanceof FieldAccessExpr)
@@ -273,25 +273,25 @@ public Visitable visit(MethodCallExpr n, Void arg) {
273273
.map(nameExpr -> (NameExpr)nameExpr.getScope())
274274
.forEach(nameExpr -> {
275275
String fullClassName = nameExpr.getNameAsString();
276-
if(fullClassName.startsWith("Jakarta")) {
277-
nameExpr.setName(fullClassName.replaceFirst("Jakarta", "Javax"));
276+
if(fullClassName.contains("Jakarta")) {
277+
nameExpr.setName(fullClassName.replace("Jakarta", "Javax"));
278278
}
279279
});
280280

281281
n.getChildNodes().stream().filter(node -> node instanceof NameExpr)
282282
.map(node -> (NameExpr)node)
283-
.filter(nameExpr -> nameExpr.getNameAsString().startsWith("Jakarta"))
283+
.filter(nameExpr -> nameExpr.getNameAsString().contains("Jakarta"))
284284
.forEach(nameExpr -> {
285285
String className = nameExpr.getNameAsString();
286-
nameExpr.setName(className.replaceFirst("Jakarta", "Javax"));
286+
nameExpr.setName(className.replace("Jakarta", "Javax"));
287287
});
288288

289289
n.getChildNodes().stream().filter(node -> node instanceof ClassExpr)
290290
.map(node -> (ClassExpr)node)
291-
.filter(classExpr -> classExpr.getTypeAsString().startsWith("Jakarta"))
291+
.filter(classExpr -> classExpr.getTypeAsString().contains("Jakarta"))
292292
.forEach(classExpr -> {
293293
String className = classExpr.getTypeAsString();
294-
classExpr.setType(className.replaceFirst("Jakarta", "Javax"));
294+
classExpr.setType(className.replace("Jakarta", "Javax"));
295295
});
296296
}
297297
return super.visit(n, arg);
@@ -328,7 +328,7 @@ public Visitable visit(ClassOrInterfaceType n, Void arg) {
328328
n = parseResult.getResult().get();
329329
}
330330
}
331-
if(currentName.startsWith("Jakarta")) {
331+
if(currentName.contains("Jakarta")) {
332332
String newName = StringUtils.replace(currentName, "Jakarta", "Javax");
333333
ParseResult<ClassOrInterfaceType> parseResult = javaParser.parseClassOrInterfaceType(newName);
334334
if (parseResult.isSuccessful() && parseResult.getResult().isPresent()) {

0 commit comments

Comments
 (0)