Fix cirrus task

SonarSource · Jun 24, 2024 · cb09f12 · cb09f12
1 parent 416ffff
commit cb09f12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -192,9 +192,9 @@ quickfixes_task:
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
     <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
-    cpu: 14
-    memory: 6G
+    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j21-latest
+    cpu: 4
+    memory: 2G
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   env:

diff --git a/its/quickfixes/src/test/java/org/sonar/java/it/ChecksListWithQuickFix.java b/its/quickfixes/src/test/java/org/sonar/java/it/ChecksListWithQuickFix.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.sonar.check.Rule;
-import org.sonar.plugins.java.CheckList;
+import org.sonar.java.GeneratedCheckList;
 import org.sonar.plugins.java.api.JavaCheck;
 import org.sonar.plugins.java.api.JavaFileScanner;
 
@@ -39,7 +39,7 @@ public class ChecksListWithQuickFix {
   static {
 
     QUICKFIX_KEYS = new ArrayList<>();
-    try(Stream<Path> paths = Files.walk(Paths.get(METADATA_FOLDER))) {
+    try (Stream<Path> paths = Files.walk(Paths.get(METADATA_FOLDER))) {
       paths.filter(Files::isRegularFile)
         .forEach(path -> {
           try {
@@ -57,7 +57,7 @@ public class ChecksListWithQuickFix {
 
     checks = new ArrayList<>();
     List<Class<? extends JavaCheck>> withQuickFixes =
-      CheckList.getJavaChecks().stream()
+      GeneratedCheckList.getJavaChecks().stream()
         .filter(c -> c.isAnnotationPresent(Rule.class) && hasQuickFixCovered(c.getAnnotation(Rule.class)))
         .toList();
     for (Class c : withQuickFixes) {
@@ -69,7 +69,7 @@ public class ChecksListWithQuickFix {
     }
   }
 
-  private static boolean hasQuickFixCovered(Rule rule){
+  private static boolean hasQuickFixCovered(Rule rule) {
     return QUICKFIX_KEYS.contains(rule.key());
   }
 

diff --git a/its/quickfixes/src/test/java/org/sonar/java/it/QuickFixesApplier.java b/its/quickfixes/src/test/java/org/sonar/java/it/QuickFixesApplier.java
@@ -67,7 +67,7 @@ public class QuickFixesApplier {
   public void verifyAll(List<InputFile> files) throws IOException {
     List<JavaFileScanner> visitors = new ArrayList<>(ChecksListWithQuickFix.checks);
     SonarComponents sonarComponents = sonarComponents();
-    VisitorsBridgeForQuickFixTests visitorsBridge = new VisitorsBridgeForQuickFixTests(visitors, DEFAULT_CLASSPATH, sonarComponents, new JavaVersionImpl(21));
+    VisitorsBridgeForQuickFixes visitorsBridge = new VisitorsBridgeForQuickFixes(visitors, DEFAULT_CLASSPATH, sonarComponents, new JavaVersionImpl(21));
 
     JavaAstScanner astScanner = new JavaAstScanner(sonarComponents);
     astScanner.setVisitorBridge(visitorsBridge);

diff --git a/...va/it/VisitorsBridgeForQuickFixTests.java → .../java/it/VisitorsBridgeForQuickFixes.java b/...va/it/VisitorsBridgeForQuickFixTests.java → .../java/it/VisitorsBridgeForQuickFixes.java
@@ -30,7 +30,6 @@
 import org.sonar.java.SonarComponents;
 import org.sonar.java.annotations.VisibleForTesting;
 import org.sonar.java.model.JavaVersionImpl;
-import org.sonar.java.model.Sema;
 import org.sonar.java.model.VisitorsBridge;
 import org.sonar.java.reporting.JavaQuickFix;
 import org.sonar.java.testing.JavaFileScannerContextForTests;
@@ -41,9 +40,10 @@
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.ModuleScannerContext;
 import org.sonar.plugins.java.api.caching.CacheContext;
+import org.sonar.plugins.java.api.semantic.Sema;
 import org.sonar.plugins.java.api.tree.CompilationUnitTree;
 
-public class VisitorsBridgeForQuickFixTests extends VisitorsBridge {
+public class VisitorsBridgeForQuickFixes extends VisitorsBridge {
 
   private final Map<Path, List<JavaQuickFix>> quickFixes = new HashMap<>();
 
@@ -53,16 +53,16 @@ public class VisitorsBridgeForQuickFixTests extends VisitorsBridge {
 
 
   @VisibleForTesting
-  public VisitorsBridgeForQuickFixTests(JavaFileScanner visitor, SonarComponents sonarComponents) {
+  public VisitorsBridgeForQuickFixes(JavaFileScanner visitor, SonarComponents sonarComponents) {
     this(Collections.singletonList(visitor), Collections.emptyList(), sonarComponents, new JavaVersionImpl());
   }
 
-  public VisitorsBridgeForQuickFixTests(Iterable<? extends JavaCheck> visitors, @Nullable SonarComponents sonarComponents, JavaVersion javaVersion) {
+  public VisitorsBridgeForQuickFixes(Iterable<? extends JavaCheck> visitors, @Nullable SonarComponents sonarComponents, JavaVersion javaVersion) {
     super(visitors, Collections.emptyList(), sonarComponents, javaVersion);
     enableSemantic = false;
   }
 
-  public VisitorsBridgeForQuickFixTests(Iterable<? extends JavaCheck> visitors, List<File> projectClasspath, @Nullable SonarComponents sonarComponents, JavaVersion javaVersion) {
+  public VisitorsBridgeForQuickFixes(Iterable<? extends JavaCheck> visitors, List<File> projectClasspath, @Nullable SonarComponents sonarComponents, JavaVersion javaVersion) {
     super(visitors, projectClasspath, sonarComponents, javaVersion);
   }