Added teams functionality

.github/workflows/sonarcloud.yml

@@ -26,6 +26,6 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: analyze on sonarcloud
-        run: gradle build sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }}
+        run: gradle codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dsonar.java.binaries=build/classes
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         mavenLocal()
+        mavenCentral()
         jcenter()
         maven {
             url "https://plugins.gradle.org/m2/"
@@ -10,9 +11,13 @@ buildscript {
 
 plugins {
     id "org.sonarqube" version "2.8"
+    id "jacoco"
 }
 
 apply plugin: 'idea'
+apply plugin: "jacoco"
+apply plugin: "java"
+apply plugin: "org.sonarqube"
 
 ext {
     majorVersion = '0'
@@ -28,20 +33,11 @@ file('gradle.d').listFiles().sort().each {
     }
 }
 
-sonarqube {
-    properties {
-        property "sonar.projectKey", "adessoAG_coderadar"
-        property "sonar.organization", "adesso-ag"
-        property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.sources", "src/main/java, coderadar-ui/src"
-        property "sonar.tests", "src/test/java"
-        property "sonar.exclusions", "coderadar-app/workdir"
-    }
-}
 
 subprojects {
     apply plugin: "idea"
     apply plugin: "java"
+    apply plugin: "org.sonarqube"
 
     buildscript {
         repositories {
@@ -79,6 +75,19 @@ subprojects {
         testLogging {
             events "passed", "skipped", "failed"
         }
+        finalizedBy jacocoTestReport
+    }
+
+    jacocoTestReport {
+        dependsOn test
+    }
+
+    jacocoTestReport {
+        reports {
+            xml.enabled true
+            csv.enabled false
+            html.enabled true
+        }
     }
 
     dependencies {
@@ -87,12 +96,74 @@ subprojects {
         testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: version_junit
         annotationProcessor("org.projectlombok:lombok:$lombok_version")
         compileOnly("org.projectlombok:lombok:$lombok_version")
+        testCompile group: 'org.jacoco', name: 'org.jacoco.ant', version: '0.8.5'
     }
 
+
 }
 
 idea {
     project {
         vcs = 'Git'
     }
 }
+
+sonarqube {
+    properties {
+        property "sonar.projectKey", "adessoAG_coderadar"
+        property "sonar.organization", "adesso-ag"
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.sources", "src/main/java, coderadar-ui/src"
+        property "sonar.tests", "src/test/java"
+        property "sonar.exclusions", "coderadar-app/workdir"
+        property 'sonar.core.codeCoveragePlugin', 'jacoco'
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/codeCoverageReport/codeCoverageReport.xml"
+    }
+}
+
+allprojects {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        testCompile group: 'org.jacoco', name: 'org.jacoco.ant', version: '0.8.5'
+    }
+}
+
+tasks.register("codeCoverageReport", JacocoReport) {
+    // If a subproject applies the 'jacoco' plugin, add the result it to the report
+    subprojects { subproject ->
+        subproject.plugins.withType(JacocoPlugin).configureEach {
+            subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).configureEach { testTask ->
+                sourceSets subproject.sourceSets.main
+                executionData(testTask)
+            }
+
+            // To automatically run `test` every time `./gradlew codeCoverageReport` is called,
+            // you may want to set up a task dependency between them as shown below.
+            // Note that this requires the `test` tasks to be resolved eagerly (see `forEach`) which
+            // may have a negative effect on the configuration time of your build.
+            subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).forEach {
+                rootProject.tasks.codeCoverageReport.dependsOn(it)
+            }
+        }
+    }
+
+    // enable the different report types (html, xml, csv)
+    reports {
+        // xml is usually used to integrate code coverage with
+        // other tools like SonarQube, Coveralls or Codecov
+        xml.enabled true
+
+        // HTML reports can be used to see code coverage
+        // without any external tools
+        html.enabled true
+    }
+}
+
+

coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java

@@ -5,12 +5,11 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 
 @EnableScheduling
 @EnableAsync(proxyTargetClass = true)
@@ -19,22 +18,15 @@
 @EntityScan(basePackages = "io.reflectoring.coderadar")
 @SpringBootApplication(scanBasePackages = "io.reflectoring.coderadar")
 @Controller
-public class CoderadarApplication implements ErrorController {
+public class CoderadarApplication {
+
   public static void main(String[] args) {
     Locale.setDefault(Locale.US);
     SpringApplication.run(CoderadarApplication.class, args);
   }
 
-  // Forward unknown paths to index.html (angular)
-  private static final String PATH = "/error";
-
-  @RequestMapping(path = PATH)
-  public String error() {
+  @GetMapping(value = "/**/{path:[^.]*}")
+  public String redirect() {
     return "forward:/index.html";
   }
-
-  @Override
-  public String getErrorPath() {
-    return PATH;
-  }
 }

coderadar-core/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.diffplug.gradle.spotless"
+apply plugin: "jacoco"
 
 dependencies {
     compile project(':coderadar-plugin-api')

coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java

@@ -74,7 +74,7 @@ public static class Authentication {
 
     @NotNull private Integer accessTokenDurationInMinutes = 15;
 
-    @NotNull private Boolean enabled = Boolean.TRUE;
+    private boolean enabled = Boolean.TRUE;
 
     @NotNull private Integer refreshTokenDurationInMinutes = 86400;
   }

coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java

@@ -15,10 +15,10 @@
 
 @Service
 public class AnalyzerPluginService {
-  private Logger logger = LoggerFactory.getLogger(AnalyzerPluginService.class);
+  private final Logger logger = LoggerFactory.getLogger(AnalyzerPluginService.class);
 
-  private Map<String, Class<? extends SourceCodeFileAnalyzerPlugin>> sourceCodeFileAnalyzerPlugins =
-      new HashMap<>();
+  private final Map<String, Class<? extends SourceCodeFileAnalyzerPlugin>>
+      sourceCodeFileAnalyzerPlugins = new HashMap<>();
 
   /**
    * Constructs a new AnalyzerPluginRegistry. This is a very expensive operation since the
@@ -103,7 +103,7 @@ private void checkValidConfigurationFile(
         }
         throw new IllegalArgumentException(
             String.format(
-                "Not a valid configuration file for analyzer plugin %s. The first couple lines of configuration file are:\n %s",
+                "Not a valid configuration file for analyzer plugin %s. The first couple lines of configuration file are:%n %s",
                 configurableAnalyzer.getClass(), firstCoupleLines.toString()));
       } catch (IOException e) {
         throw new IllegalArgumentException(

coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java

@@ -170,44 +170,42 @@ private void analyzeBranch(
    */
   private void zeroOutMissingMetrics(
       Commit commit, List<MetricValue> metrics, Map<Long, List<MetricValue>> fileMetrics) {
+
     for (FileToCommitRelationship relationship : commit.getTouchedFiles()) {
-      List<MetricValue> values = fileMetrics.get(relationship.getFile().getId());
-      if (values != null) {
-        for (MetricValue value : values) {
-          if (value.getValue() != 0
-              && metrics.stream()
-                  .noneMatch(
-                      metricValue ->
-                          metricValue.getName().equals(value.getName())
-                              && metricValue.getFileId() == value.getFileId())) {
-            metrics.add(
-                new MetricValue(
-                    value.getName(),
-                    0L,
-                    commit.getId(),
-                    value.getFileId(),
-                    Collections.emptyList()));
-          }
+      List<MetricValue> values =
+          fileMetrics.getOrDefault(relationship.getFile().getId(), Collections.emptyList());
+
+      for (MetricValue value : values) {
+        if (value.getValue() != 0
+            && metrics.stream()
+                .noneMatch(
+                    metricValue ->
+                        metricValue.getName().equals(value.getName())
+                            && metricValue.getFileId() == value.getFileId())) {
+          metrics.add(
+              new MetricValue(
+                  value.getName(), 0L, commit.getId(), value.getFileId(), Collections.emptyList()));
         }
       }
     }
 
+    if (metrics.isEmpty()) {
+      return;
+    }
     metrics.sort(Comparator.comparingLong(MetricValue::getFileId));
-    if (!metrics.isEmpty()) {
-      long fileId = metrics.get(0).getFileId();
-      List<MetricValue> metricsForFile = new ArrayList<>();
-      for (MetricValue metricValue : metrics) {
-        if (metricValue.getValue() != 0) {
-          if (metricValue.getFileId() != fileId) {
-            fileMetrics.put(fileId, new ArrayList<>(metricsForFile));
-            fileId = metricValue.getFileId();
-            metricsForFile.clear();
-          }
-          metricsForFile.add(metricValue);
+    long fileId = metrics.get(0).getFileId();
+    List<MetricValue> metricsForFile = new ArrayList<>();
+    for (MetricValue metricValue : metrics) {
+      if (metricValue.getValue() != 0) {
+        if (metricValue.getFileId() != fileId) {
+          fileMetrics.put(fileId, new ArrayList<>(metricsForFile));
+          fileId = metricValue.getFileId();
+          metricsForFile.clear();
         }
+        metricsForFile.add(metricValue);
       }
-      fileMetrics.put(fileId, metricsForFile);
     }
+    fileMetrics.put(fileId, metricsForFile);
   }
 
   /**

coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java

@@ -2,8 +2,10 @@
 
 import java.util.Set;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class Contributor {
   private Long id;
   private String displayName;