fix(Dart): dart language files not indexed with SonarQube 10.4+ (#218)

* fix(Dart): dart language files not indexed with SonarQube 10.4+

* fix(CI): upgraded JDK version to 17

---------

Co-authored-by: Gilles Grousset <[email protected]>

Author: zippy1978

.github/workflows/maven.yml

@@ -13,10 +13,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
           check-latest: true
           cache: 'maven'
 

.github/workflows/release.yml

@@ -19,10 +19,10 @@ jobs:
         id: tag_name
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
           check-latest: true
           cache: 'maven'
 

CHANGELOG.md

@@ -17,6 +17,8 @@
 #### Bug Fixes
 
 - [#177](https://github.com/insideapp-oss/sonar-flutter/issues/177) analyzer execution fails when errors detected.
+- [#212](https://github.com/insideapp-oss/sonar-flutter/issues/212) source file not indexed with SonarQube 10.4+
+- 
 
 ## 0.5.0
 

dart-lang/src/main/java/fr/insideapp/sonarqube/dart/lang/Dart.java

@@ -17,20 +17,34 @@
  */
 package fr.insideapp.sonarqube.dart.lang;
 
+import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.resources.AbstractLanguage;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 public class Dart extends AbstractLanguage {
     public static final String KEY = "dart";
     private final Configuration config;
 
+    public static final List<String> FILE_SUFFIXES = List.of(".dart");
+
+    public static final String FILE_SUFFIXES_KEY = "sonar.dart.file.suffixes";
+
     public Dart(Configuration config) {
         super(KEY, "Dart");
         this.config = config;
     }
 
     public String[] getFileSuffixes() {
-        return new String[]{"dart"};
+        final List<String> providedFilesSuffixes = Arrays.stream(config.getStringArray(FILE_SUFFIXES_KEY))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.toList());
+        final List<String> filesSuffixes = providedFilesSuffixes.isEmpty() ? FILE_SUFFIXES : providedFilesSuffixes;
+        return filesSuffixes.toArray(new String[0]);
     }
 }

sonar-flutter-plugin/src/main/java/fr/insideapp/sonarqube/flutter/FlutterPlugin.java

@@ -39,16 +39,30 @@ public class FlutterPlugin implements Plugin {
     public static final String DART_CATEGORY = "Dart";
     public static final String FLUTTER_CATEGORY = "Flutter";
     public static final String ANALYSIS_SUBCATEGORY = "Analysis";
+
+    public static final String GENERAL_SUBCATEGORY = "General";
     public static final String TESTS_SUBCATEGORY = "Tests";
 
     public static final String FLUTTER_TESTS_REPORT_PATH_KEY = "sonar.flutter.tests.reportPath";
     public static final String FLUTTER_LCOV_REPORT_PATH_KEY = "sonar.flutter.coverage.reportPath";
 
+
     public void define(Context context) {
 
         // Language support
         context.addExtensions(Dart.class, DartSensor.class, DartProfile.class);
 
+        context.addExtension(
+                PropertyDefinition.builder(Dart.FILE_SUFFIXES_KEY)
+                        .name("File Suffixes")
+                        .description("List of suffixes of Dart files to analyze.")
+                        .multiValues(true)
+                        .category(DART_CATEGORY)
+                        .subCategory(GENERAL_SUBCATEGORY)
+                        .onQualifiers(Qualifiers.PROJECT)
+                        .defaultValue(String.join(",", Dart.FILE_SUFFIXES))
+                        .build());
+
         // Add pubspec support
         context.addExtension(PubSpecSensor.class);
 

sonar-flutter-plugin/src/test/java/fr/insideapp/sonarqube/flutter/FlutterPluginTest.java

@@ -42,7 +42,7 @@ public void define() {
         plugin.define(context);
 
         List<?> extensions = context.getExtensions();
-        assertThat(extensions).hasSize(14);
+        assertThat(extensions).hasSize(15);
 
 
     }