handle ee9 package name fqcn in method call (#96)

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

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

@@ -194,6 +194,11 @@ public void execute()
                                     })
                 );
 
+                cu.findAll(FieldAccessExpr.class).stream()
+                                .filter(FieldAccessExpr::isFieldAccessExpr)
+                                .filter(fieldAccessExpr -> fieldAccessExpr.getNameAsString().equals("ee9"))
+                                .forEach(fieldAccessExpr -> fieldAccessExpr.setName("ee8"));
+
                 cu.findAll(NameExpr.class).stream()
                         .filter(nameExpr -> nameExpr.getNameAsString().contains("Jakarta"))
                         .forEach(nameExpr -> {
@@ -255,7 +260,7 @@ public Visitable visit(MethodCallExpr n, Void arg) {
                                     n.setScope(nameExpr);
                                 }
                             }
-
+                            fullString = n.toString();
                             if(StringUtils.startsWith(fullString, "EE9") && n.getScope().isPresent()) {
                                 Expression expression = n.getScope().get();
                                 if(expression.isNameExpr()) {
@@ -266,6 +271,7 @@ public Visitable visit(MethodCallExpr n, Void arg) {
                             }
                             replaceMethodCallExpr(n, "Jakarta", "Javax");
                             replaceMethodCallExpr(n, "EE9", "EE8");
+                            replaceMethodCallExpr(n, "org.eclipse.jetty.ee9", "org.eclipse.jetty.ee8");
                             return super.visit(n, arg);
                         }
 
@@ -293,6 +299,15 @@ private void replaceMethodCallExpr(MethodCallExpr n, String contains, String rep
                                             }
                                         });
 
+                                n.getChildNodes().stream().filter(node -> node instanceof FieldAccessExpr)
+                                        .map(node -> (FieldAccessExpr)node)
+                                        .forEach(fieldAccessExpr -> {
+                                            String fullClassName = fieldAccessExpr.getNameAsString();
+                                            if(fullClassName.contains(contains)) {
+                                                fieldAccessExpr.setName(fullClassName.replace(contains, replace));
+                                            }
+                                        });
+
                                 n.getChildNodes().stream().filter(node -> node instanceof NameExpr)
                                         .map(node -> (NameExpr)node)
                                         .filter(nameExpr -> nameExpr.getNameAsString().contains(contains))

src/test/resources/project-modify/src/main/java/org/eclipse/jetty/ee9/jakarta/nested/JakartaScanner.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -610,6 +611,8 @@ else if (currentScan.containsKey(file))
      */
     private void scanFile (File f, Map<String,TimeNSize> scanInfoMap, int depth)
     {
+        X509Certificate[] certificates = (X509Certificate[])request.getAttribute(org.eclipse.jetty.ee9.nested.Request.JAKARTA_SERVLET_REQUEST_X_509_CERTIFICATE);
+
         try
         {
             org.eclipse.jetty.util.log.Log.getLogger(Scanner.class).debug("scanFile {}",f);