Merge pull request #411 from adessoAG/teams-frontend-roles

Proper handling of roles in the UI and many performance improvements.

Author: maximAtanasov

Dockerfile

@@ -1,4 +1,4 @@
 FROM openjdk:11.0.8-jre-buster
 ARG JAR_FILE=coderadar-app/build/**/*.jar
-COPY ${JAR_FILE} coderadar-app-0.5.0.local.jar
-ENTRYPOINT ["java","-jar","/coderadar-app-0.5.0.local.jar"]
+COPY ${JAR_FILE} coderadar-app-1.0.0.local.jar
+ENTRYPOINT ["java","-jar","/coderadar-app-1.0.0.local.jar"]

build.gradle

@@ -20,8 +20,8 @@ apply plugin: "java"
 apply plugin: "org.sonarqube"
 
 ext {
-    majorVersion = '0'
-    minorVersion = '5'
+    majorVersion = '1'
+    minorVersion = '0'
     patchVersion = '0'
     baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"
 }

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

@@ -5,6 +5,7 @@
 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;
@@ -18,15 +19,23 @@
 @EntityScan(basePackages = "io.reflectoring.coderadar")
 @SpringBootApplication(scanBasePackages = "io.reflectoring.coderadar")
 @Controller
-public class CoderadarApplication {
+public class CoderadarApplication implements ErrorController {
 
   public static void main(String[] args) {
     Locale.setDefault(Locale.US);
     SpringApplication.run(CoderadarApplication.class, args);
   }
 
-  @GetMapping(value = "/**/{path:[^.]*}")
-  public String redirect() {
+  private static final String ERROR = "/error";
+
+  /** @return forwards to index.html (angular app) */
+  @GetMapping(value = ERROR)
+  public String error() {
     return "forward:/index.html";
   }
+
+  @Override
+  public String getErrorPath() {
+    return ERROR;
+  }
 }

coderadar-app/src/main/resources/application.properties.template

@@ -8,6 +8,7 @@ coderadar.authentication.accessToken.durationInMinutes=15
 coderadar.authentication.refreshToken.durationInMinutes=86400
 coderadar.authentication.enabled=true
 coderadar.cors.enabled=true
+coderadar.gitPasswordsEncryptionKey=test-key
 
 logging.level.io.reflectoring.coderadar=DEBUG
 logging.level.org.reflections=ERROR

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

@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar;
 
+import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -30,6 +31,8 @@ public class CoderadarConfigurationProperties {
 
   @NotNull private Integer scanIntervalInSeconds = 30;
 
+  @NotNull private String gitPasswordsEncryptionKey;
+
   @NotNull private Locale dateLocale = Locale.ENGLISH;
 
   private Authentication authentication = new Authentication();
@@ -69,6 +72,11 @@ public void validateWorkdirIsWritable() {
     }
   }
 
+  @PostConstruct
+  public void setGitPasswordEncryptionKey() {
+    PasswordUtil.setKey(gitPasswordsEncryptionKey);
+  }
+
   @Data
   public static class Authentication {
 

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

@@ -0,0 +1,10 @@
+package io.reflectoring.coderadar;
+
+public class CoderadarConstants {
+
+  private CoderadarConstants() {}
+
+  public static final int COMMIT_HASH_LENGTH = 16;
+
+  public static final String ZERO_HASH = "0000000000000000";
+}

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

@@ -0,0 +1,29 @@
+package io.reflectoring.coderadar;
+
+import io.reflectoring.coderadar.analyzer.service.AnalyzingService;
+import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService;
+import io.reflectoring.coderadar.projectadministration.service.project.ScanProjectScheduler;
+import io.reflectoring.coderadar.useradministration.service.security.TokenService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ShutdownService implements ShutdownUseCase {
+
+  private final ProcessProjectService processProjectService;
+  private final ScanProjectScheduler scanProjectScheduler;
+  private final AnalyzingService analyzingService;
+  private final ConfigurableApplicationContext applicationContext;
+  private final TokenService tokenService;
+
+  @Override
+  public void shutdown() throws InterruptedException {
+    tokenService.setShuttingDown(true);
+    analyzingService.onShutdown();
+    scanProjectScheduler.onShutdown();
+    processProjectService.onShutdown();
+    applicationContext.close();
+  }
+}

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

@@ -0,0 +1,5 @@
+package io.reflectoring.coderadar;
+
+public interface ShutdownUseCase {
+  void shutdown() throws InterruptedException;
+}

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

@@ -0,0 +1,16 @@
+package io.reflectoring.coderadar;
+
+public class ValidationUtils {
+
+  private ValidationUtils() {}
+
+  public static String validateAndTrimCommitHash(String commitHash) {
+    if (commitHash.length() < CoderadarConstants.COMMIT_HASH_LENGTH) {
+      throw new IllegalArgumentException(
+          String.format(
+              "The length of the commit hash must be at least %d",
+              CoderadarConstants.COMMIT_HASH_LENGTH));
+    }
+    return commitHash.substring(0, CoderadarConstants.COMMIT_HASH_LENGTH);
+  }
+}

coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/AnalyzerConfiguration.java

@@ -11,8 +11,6 @@ public class AnalyzerConfiguration {
   private String analyzerName;
   private boolean enabled;
 
-  private AnalyzerConfigurationFile analyzerConfigurationFile;
-
   public AnalyzerConfiguration(long id, String analyzerName, boolean enabled) {
     this.id = id;
     this.analyzerName = analyzerName;