update after code review

Author: erwan-serandour

src/main/java/org/sonarqube/gradle/SonarQubePlugin.java

@@ -118,23 +118,9 @@ private static List<File> registerAndConfigureResolverTasks(Project topLevelProj
         }
         task.setProjectName(SonarUtils.constructPrefixedProjectName(target.getPath()));
 
-        Provider<FileCollection> compile = target.provider(() -> {
-          var sourceSets = SonarUtils.getSourceSets(target);
-          if (sourceSets == null) {
-            return null;
-          }
-          var set = sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME);
-          return set == null ? null : set.getCompileClasspath();
-        });
+        Provider<FileCollection> compile = target.provider(() -> querySourceSet(target, SourceSet.MAIN_SOURCE_SET_NAME));
+        Provider<FileCollection> test = target.provider(() -> querySourceSet(target, SourceSet.TEST_SOURCE_SET_NAME));
         task.setCompileClasspath(compile);
-        Provider<FileCollection> test = target.provider(() -> {
-          var sourceSets = SonarUtils.getSourceSets(target);
-          if (sourceSets == null) {
-            return null;
-          }
-          var set = sourceSets.findByName(SourceSet.TEST_SOURCE_SET_NAME);
-          return set == null ? null : set.getCompileClasspath();
-        });
         task.setTestCompileClasspath(test);
 
         // Currently we only use the SonarResolverTask for Android projects to resolve libraries. Other projects use
@@ -153,6 +139,16 @@ private static List<File> registerAndConfigureResolverTasks(Project topLevelProj
     return resolverFiles;
   }
 
+  @Nullable
+  private static FileCollection querySourceSet(Project project, String sourceSetName) {
+    var sourceSets = SonarUtils.getSourceSets(project);
+    if (sourceSets == null) {
+      return null;
+    }
+    var set = sourceSets.findByName(sourceSetName);
+    return set == null ? null : set.getCompileClasspath();
+  }
+
   private static void setAndroidLibrariesProperties(Project target, SonarResolverTask task) {
     AndroidUtils.LibrariesAndTestLibraries libraries = AndroidUtils.LibrariesAndTestLibraries.ofProject(target);
     task.setMainLibraries(libraries.getMainLibraries());

src/main/java/org/sonarqube/gradle/SonarResolverTask.java

@@ -140,11 +140,11 @@ void run() throws IOException {
     var mainClasspath = this.compileClasspath.getOrNull();
     var testClasspath = testCompileClasspath.getOrNull();
 
-    List<String> compileClasspathFilenames = SonarUtils.exists(mainClasspath == null ? List.of() : mainClasspath)
+    List<String> compileClasspathFilenames = SonarUtils.exists(mainClasspath == null ? Collections.emptyList() : mainClasspath)
       .stream()
       .map(File::getAbsolutePath)
       .collect(Collectors.toList());
-    List<String> testCompileClasspathFilenames = SonarUtils.exists(testClasspath == null ? List.of() : testClasspath)
+    List<String> testCompileClasspathFilenames = SonarUtils.exists(testClasspath == null ? Collections.emptyList() : testClasspath)
       .stream()
       .map(File::getAbsolutePath)
       .collect(Collectors.toList());
@@ -175,9 +175,4 @@ void run() throws IOException {
       LOGGER.info("Resolved properties for " + displayName + " and wrote them to " + getOutputFile() + ".");
     }
   }
-
-  public boolean configurationCacheIsDisabled() {
-    return true;
-  }
-
 }