chore: analysisConfig now only have the git analysis related settings, and the others are used from env injected configs

ilyas0v · ilyas0v · commit 5ef40f23c714 · 2025-11-20T13:52:05.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -73,7 +73,7 @@ tasks.named('checkstyleMain') {
 }
 
 tasks.named('pmdMain') {
-    dependsOn 'jandex'
+    dependsOn 'jandex', 'compileQuarkusGeneratedSourcesJava'
 }
 
 tasks.named('compileTestJava') {
diff --git a/src/main/java/net/explorviz/code/analysis/GitAnalysis.java b/src/main/java/net/explorviz/code/analysis/GitAnalysis.java
@@ -54,9 +54,6 @@ public class GitAnalysis { // NOPMD
   @ConfigProperty(name = "explorviz.gitanalysis.restrict-analysis-to-folders")
   /* default */ Optional<String> restrictAnalysisToFoldersProperty;  // NOCS NOPMD
 
-  @ConfigProperty(name = "explorviz.gitanalysis.fetch-remote-data", defaultValue = "true")
-  /* default */ boolean fetchRemoteDataProperty;  // NOCS
-
   @ConfigProperty(name = "explorviz.gitanalysis.send-to-remote", defaultValue = "true")
   /* default */ boolean sendToRemoteProperty;  // NOCS
 
@@ -69,9 +66,6 @@ public class GitAnalysis { // NOPMD
   @ConfigProperty(name = "explorviz.gitanalysis.end-commit-sha1")
   /* default */ Optional<String> endCommitProperty;  // NOCS
 
-  @ConfigProperty(name = "explorviz.gitanalysis.save-crashed_files")
-  /* default */ boolean saveCrashedFilesProperty;  // NOCS
-
   @ConfigProperty(name = "explorviz.landscape.token")
   /* default */ String landscapeTokenProperty;  // NOCS
 
@@ -98,12 +92,9 @@ private AnalysisConfig createConfig() {
         .branch(repositoryBranchProperty)
         .sourceDirectory(sourceDirectoryProperty)
         .restrictAnalysisToFolders(restrictAnalysisToFoldersProperty)
-        .fetchRemoteData(fetchRemoteDataProperty)
-        .sendToRemote(sendToRemoteProperty)
         .calculateMetrics(calculateMetricsProperty)
         .startCommit(startCommitProperty)
         .endCommit(endCommitProperty)
-        .saveCrashedFiles(saveCrashedFilesProperty)
         .landscapeToken(landscapeTokenProperty)
         .applicationName(applicationNameProperty)
         .build();
diff --git a/src/main/java/net/explorviz/code/analysis/api/AnalysisRequest.java b/src/main/java/net/explorviz/code/analysis/api/AnalysisRequest.java
@@ -21,7 +21,6 @@ public class AnalysisRequest {
   private boolean calculateMetrics = true;
   private String startCommit;
   private String endCommit;
-  private boolean saveCrashedFiles;
   private String landscapeToken = "";
   private String applicationName = "";
 
@@ -100,14 +99,6 @@ public void setEndCommit(final String endCommit) {
     this.endCommit = endCommit;
   }
 
-  public boolean isSaveCrashedFiles() {
-    return saveCrashedFiles;
-  }
-
-  public void setSaveCrashedFiles(final boolean saveCrashedFiles) {
-    this.saveCrashedFiles = saveCrashedFiles;
-  }
-
   public String getLandscapeToken() {
     return landscapeToken;
   }
@@ -133,18 +124,14 @@ public AnalysisConfig toConfig() {
     return new AnalysisConfig.Builder()
         .repoPath(Optional.ofNullable(repoPath))
         .repoRemoteUrl(Optional.ofNullable(repoRemoteUrl))
-        .remoteStoragePath(Optional.ofNullable(remoteStoragePath))
         .gitUsername(Optional.ofNullable(username))
         .gitPassword(Optional.ofNullable(password))
         .branch(Optional.ofNullable(branch))
         .sourceDirectory(Optional.ofNullable(sourceDirectory))
         .restrictAnalysisToFolders(Optional.ofNullable(restrictAnalysisToFolders))
-        .fetchRemoteData(fetchRemoteData)
-        .sendToRemote(sendToRemote)
         .calculateMetrics(calculateMetrics)
         .startCommit(Optional.ofNullable(startCommit))
         .endCommit(Optional.ofNullable(endCommit))
-        .saveCrashedFiles(saveCrashedFiles)
         .landscapeToken(landscapeToken != null ? landscapeToken : "")
         .applicationName(applicationName != null ? applicationName : "")
         .build();
diff --git a/src/main/java/net/explorviz/code/analysis/git/GitRepositoryHandler.java b/src/main/java/net/explorviz/code/analysis/git/GitRepositoryHandler.java
@@ -65,6 +65,9 @@ public class GitRepositoryHandler { // NOPMD
   private static final String JAVA_PATH_SUFFIX = ".java";
   private static String repositoryPath;
 
+  @ConfigProperty(name = "explorviz.gitanalysis.remote.storage-path")
+  /* default */ Optional<String> repoLocalStoragePathProperty; // NOCS
+
   private Git git;
 
   public static String getCurrentRepositoryPath() {
@@ -320,7 +323,7 @@ public Repository getGitRepository(AnalysisConfig config)
 
     return getGitRepository(config.getRepoPath().orElse(""),
         new RemoteRepositoryObject(config.getRepoRemoteUrl().orElse(""),
-            config.getRemoteStoragePath().orElse(""), credentialsProvider,
+            repoLocalStoragePathProperty.orElse(""), credentialsProvider,
             config.getBranch().orElse("")));
   }
 
diff --git a/src/main/java/net/explorviz/code/analysis/service/AnalysisConfig.java b/src/main/java/net/explorviz/code/analysis/service/AnalysisConfig.java
@@ -9,56 +9,41 @@ public class AnalysisConfig {
 
   private final Optional<String> repoPath;
   private final Optional<String> repoRemoteUrl;
-  private final Optional<String> localStoragePath;
-  private final Optional<String> remoteStoragePath;
   private final Optional<String> gitUsername;
   private final Optional<String> gitPassword;
   private final Optional<String> branch;
   private final Optional<String> sourceDirectory;
   private final Optional<String> restrictAnalysisToFolders;
-  private final boolean fetchRemoteData;
-  private final boolean sendToRemote;
   private final boolean calculateMetrics;
   private final Optional<String> startCommit;
   private final Optional<String> endCommit;
-  private final boolean saveCrashedFiles;
   private final String landscapeToken;
   private final String applicationName;
 
 
   public AnalysisConfig(
       final Optional<String> repoPath,
       final Optional<String> repoRemoteUrl,
-      final Optional<String> localStoragePath,
-      final Optional<String> remoteStoragePath,
       final Optional<String> gitUsername,
       final Optional<String> gitPassword,
       final Optional<String> branch,
       final Optional<String> sourceDirectory,
       final Optional<String> restrictAnalysisToFolders,
-      final boolean fetchRemoteData,
-      final boolean sendToRemote,
       final boolean calculateMetrics,
       final Optional<String> startCommit,
       final Optional<String> endCommit,
-      final boolean saveCrashedFiles,
       final String landscapeToken,
       final String applicationName) {
     this.repoPath = repoPath;
     this.repoRemoteUrl = repoRemoteUrl;
-    this.localStoragePath = localStoragePath;
-    this.remoteStoragePath = remoteStoragePath;
     this.gitUsername = gitUsername;
     this.gitPassword = gitPassword;
     this.branch = branch;
     this.sourceDirectory = sourceDirectory;
     this.restrictAnalysisToFolders = restrictAnalysisToFolders;
-    this.fetchRemoteData = fetchRemoteData;
-    this.sendToRemote = sendToRemote;
     this.calculateMetrics = calculateMetrics;
     this.startCommit = startCommit;
     this.endCommit = endCommit;
-    this.saveCrashedFiles = saveCrashedFiles;
     this.landscapeToken = landscapeToken;
     this.applicationName = applicationName;
   }
@@ -71,14 +56,6 @@ public Optional<String> getRepoRemoteUrl() {
     return repoRemoteUrl;
   }
 
-  public Optional<String> getLocalStoragePath() {
-    return localStoragePath;
-  }
-
-  public Optional<String> getRemoteStoragePath() {
-    return remoteStoragePath;
-  }
-
   public Optional<String> getGitUsername() {
     return gitUsername;
   }
@@ -99,14 +76,6 @@ public Optional<String> getRestrictAnalysisToFolders() {
     return restrictAnalysisToFolders;
   }
 
-  public boolean isFetchRemoteData() {
-    return fetchRemoteData;
-  }
-
-  public boolean isSendToRemote() {
-    return sendToRemote;
-  }
-
   public boolean isCalculateMetrics() {
     return calculateMetrics;
   }
@@ -119,10 +88,6 @@ public Optional<String> getEndCommit() {
     return endCommit;
   }
 
-  public boolean isSaveCrashedFiles() {
-    return saveCrashedFiles;
-  }
-
   public String getLandscapeToken() {
     return landscapeToken;
   }
@@ -137,19 +102,14 @@ public String getApplicationName() {
   public static class Builder {
     private Optional<String> repoPath = Optional.empty();
     private Optional<String> repoRemoteUrl = Optional.empty();
-    private Optional<String> localStoragePath = Optional.empty();
-    private Optional<String> remoteStoragePath = Optional.empty();
     private Optional<String> gitUsername = Optional.empty();
     private Optional<String> gitPassword = Optional.empty();
     private Optional<String> branch = Optional.empty();
     private Optional<String> sourceDirectory = Optional.empty();
     private Optional<String> restrictAnalysisToFolders = Optional.empty();
-    private boolean fetchRemoteData = true;
-    private boolean sendToRemote = true;
     private boolean calculateMetrics = true;
     private Optional<String> startCommit = Optional.empty();
     private Optional<String> endCommit = Optional.empty();
-    private boolean saveCrashedFiles;
     private String landscapeToken = "";
     private String applicationName = "";
 
@@ -162,16 +122,6 @@ public Builder repoRemoteUrl(final Optional<String> repoRemoteUrl) {
       this.repoRemoteUrl = repoRemoteUrl;
       return this;
     }
-
-    public Builder localStoragePath(final Optional<String> localStoragePath) {
-      this.localStoragePath = localStoragePath;
-      return this;
-    }
-
-    public Builder remoteStoragePath(final Optional<String> remoteStoragePath) {
-      this.remoteStoragePath = remoteStoragePath;
-      return this;
-    }
     
     public Builder gitUsername(final Optional<String> gitUsername) {
       this.gitUsername = gitUsername;
@@ -198,16 +148,6 @@ public Builder restrictAnalysisToFolders(final Optional<String> restrictAnalysis
       return this;
     }
 
-    public Builder fetchRemoteData(final boolean fetchRemoteData) {
-      this.fetchRemoteData = fetchRemoteData;
-      return this;
-    }
-
-    public Builder sendToRemote(final boolean sendToRemote) {
-      this.sendToRemote = sendToRemote;
-      return this;
-    }
-
     public Builder calculateMetrics(final boolean calculateMetrics) {
       this.calculateMetrics = calculateMetrics;
       return this;
@@ -223,11 +163,6 @@ public Builder endCommit(final Optional<String> endCommit) {
       return this;
     }
 
-    public Builder saveCrashedFiles(final boolean saveCrashedFiles) {
-      this.saveCrashedFiles = saveCrashedFiles;
-      return this;
-    }
-
     public Builder landscapeToken(final String landscapeToken) {
       this.landscapeToken = landscapeToken;
       return this;
@@ -242,19 +177,14 @@ public AnalysisConfig build() {
       return new AnalysisConfig(
           repoPath,
           repoRemoteUrl,
-          localStoragePath,
-          remoteStoragePath,
           gitUsername,
           gitPassword,
           branch,
           sourceDirectory,
           restrictAnalysisToFolders,
-          fetchRemoteData,
-          sendToRemote,
           calculateMetrics,
           startCommit,
           endCommit,
-          saveCrashedFiles,
           landscapeToken,
           applicationName
       );
diff --git a/src/main/java/net/explorviz/code/analysis/service/AnalysisService.java b/src/main/java/net/explorviz/code/analysis/service/AnalysisService.java
@@ -34,6 +34,7 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevSort;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,6 +55,12 @@ public class AnalysisService { // NOPMD
   @Inject
   /* package */ CommitReportHandler commitReportHandler; // NOCS
 
+  @ConfigProperty(name = "explorviz.gitanalysis.save-crashed_files")
+  /* default */ boolean saveCrashedFilesProperty;  // NOCS
+
+  @ConfigProperty(name = "explorviz.gitanalysis.fetch-remote-data", defaultValue = "true")
+  /* default */ boolean fetchRemoteDataProperty;  // NOCS
+
   // only done because checkstyle does not like the duplication of literals
   private static String toErrorText(final String position, final String commitId,
       final String branchName) {
@@ -81,7 +88,7 @@ public void analyzeAndSendRepo(final AnalysisConfig config, final DataExporter e
       // get fetch data from remote
       final Optional<String> startCommit = findStartCommit(config, exporter, branch);
       final Optional<String> endCommit =
-          config.isFetchRemoteData() ? Optional.empty() : config.getEndCommit();
+          fetchRemoteDataProperty ? Optional.empty() : config.getEndCommit();
 
       checkIfCommitsAreReachable(startCommit, endCommit, branch);
 
@@ -97,12 +104,12 @@ public void analyzeAndSendRepo(final AnalysisConfig config, final DataExporter e
           if (!inAnalysisRange) {
             if (commit.name().equals(startCommit.get())) {
               inAnalysisRange = true;
-              if (config.isFetchRemoteData()) {
+              if (fetchRemoteDataProperty) {
                 lastCheckedCommit = commit;
                 continue;
               }
             } else {
-              if (config.isFetchRemoteData()) {
+              if (fetchRemoteDataProperty) {
                 lastCheckedCommit = commit;
               }
               continue;
@@ -165,7 +172,7 @@ private void checkIfCommitsAreReachable(final Optional<String> startCommit,
 
   private Optional<String> findStartCommit(final AnalysisConfig config,
       final DataExporter exporter, final String branch) {
-    if (config.isFetchRemoteData()) {
+    if (fetchRemoteDataProperty) {
       final StateData remoteState = exporter.requestStateData(
           getUnambiguousUpstreamName(config.getRepoRemoteUrl()), branch);
       if (remoteState.getCommitID().isEmpty() || remoteState.getCommitID().isBlank()) {
@@ -338,7 +345,7 @@ private FileDataHandler fileAnalysis(final AnalysisConfig config, final Reposito
       final FileDataHandler fileDataHandler = parser.parseFileContent(fileContent, file.fileName,
           config.isCalculateMetrics(), commitSha); // NOPMD
       if (fileDataHandler == null) {
-        if (config.isSaveCrashedFiles()) {
+        if (saveCrashedFilesProperty) {
           DebugFileWriter.saveDebugFile("/logs/crashedfiles/", fileContent,
               file.fileName);
         }
diff --git a/src/test/java/net/explorviz/code/analysis/visitor/CyclomaticComplexityVisitorTest.java b/src/test/java/net/explorviz/code/analysis/visitor/CyclomaticComplexityVisitorTest.java
@@ -42,7 +42,7 @@ void cyclomaticComplexityTest() throws FileNotFoundException { // NOCS
         .getMetricValue("cyclomatic_complexity")); // NOCS
     Assertions.assertEquals("2", fileDataHandler.getClassData("com.easy.life.Nested") // NOCS
         .getMethod("com.easy.life.Nested.heavyNested2#1980e")
-        .getMetricValue("cyclomatic_complexity"));// NOCS
+        .getMetricValue("cyclomatic_complexity")); // NOCS
     Assertions.assertEquals("4", fileDataHandler.getClassData("com.easy.life.Nested") // NOCS
         .getMetricValue("cyclomatic_complexity_weighted"));
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ tasks.named('checkstyleMain') {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`tasks.named('pmdMain') {`
`76`		`- dependsOn 'jandex'`
	`76`	`+ dependsOn 'jandex', 'compileQuarkusGeneratedSourcesJava'`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`tasks.named('compileTestJava') {`