Revert "Send less files in commit data to optimize performance"

This reverts commit 7dd6fd4.

Author: malte-hansen

src/main/java/net/explorviz/code/analysis/handler/AbstractFileDataHandler.java

@@ -66,10 +66,6 @@ public void setLandscapeToken(final String landscapeToken) {
     builder.setLandscapeToken(landscapeToken);
   }
 
-  public void setCommitId(final String commitId) {
-    builder.setCommitId(commitId);
-  }
-
   public abstract FileData getProtoBufObject();
 
   @Override

src/main/java/net/explorviz/code/analysis/handler/CommitReportHandler.java

@@ -16,7 +16,9 @@
 @ApplicationScoped
 public class CommitReportHandler { // NOPMD
 
+  private final List<FileIdentifier> modifiedFiles = new ArrayList<>();
   private final List<FileIdentifier> deletedFiles = new ArrayList<>();
+  private final List<FileIdentifier> addedFiles = new ArrayList<>();
   private CommitData.Builder builder;
 
   /**
@@ -32,7 +34,9 @@ public CommitReportHandler() {
    */
   public void clear() {
     this.builder = CommitData.newBuilder();
+    this.modifiedFiles.clear();
     this.deletedFiles.clear();
+    this.addedFiles.clear();
   }
 
   /**
@@ -61,13 +65,17 @@ private FileIdentifier toFileId(final FileDescriptor fileDescriptor) {
         .build();
   }
 
-
+  public void addModified(final FileDescriptor fileDescriptor) {
+    modifiedFiles.add(toFileId(fileDescriptor));
+  }
 
   public void addDeleted(final FileDescriptor fileDescriptor) {
     deletedFiles.add(toFileId(fileDescriptor));
   }
 
-
+  public void addAdded(final FileDescriptor fileDescriptor) {
+    addedFiles.add(toFileId(fileDescriptor));
+  }
 
   /**
    * ...
@@ -96,6 +104,8 @@ public void setCommitDate(final Timestamp commitDate) {
    * Returns the commit data. * * @return commit data object
    */
   public CommitData getCommitData() {
+    builder.addAllAddedFiles(addedFiles);
+    builder.addAllModifiedFiles(modifiedFiles);
     builder.addAllDeletedFiles(deletedFiles);
     return builder.build();
   }

src/main/java/net/explorviz/code/analysis/service/AnalysisService.java

@@ -345,6 +345,8 @@ private void commitAnalysis(final AnalysisConfig config, final Repository reposi
       throws GitAPIException, NotFoundException, IOException {
 
     Git.wrap(repository).checkout().setName(commit.getName()).call();
+    createCommitReport(config, repository, commit, lastCommit, exporter, branchName, descriptorTriple,
+        restrictMatchers, excludeMatchers);
 
     antlrParserService.reset();
     GitMetricCollector.resetAuthor();
@@ -379,10 +381,10 @@ private void commitAnalysis(final AnalysisConfig config, final Repository reposi
             LOGGER.error("File size of file " + fileDescriptor.relativePath
                 + " could not be analyzed." + e.getMessage());
           }
+          // Add Git metrics for all files
           GitMetricCollector.addCommitGitMetrics(fileDataHandler, commit);
           fileDataHandler.setLandscapeToken(config.landscapeToken());
           fileDataHandler.setRepositoryName(config.getRepositoryName());
-          fileDataHandler.setCommitId(commit.getName());
           exporter.persistFile(fileDataHandler.getProtoBufObject());
         }
       } catch (IOException e) {
@@ -392,9 +394,6 @@ private void commitAnalysis(final AnalysisConfig config, final Repository reposi
       }
     });
 
-    createCommitReport(config, repository, commit, lastCommit, exporter, branchName, descriptorTriple,
-        restrictMatchers, excludeMatchers);
-
   }
 
   private void createCommitReport(final AnalysisConfig config, final Repository repository,
@@ -421,10 +420,18 @@ private void createCommitReport(final AnalysisConfig config, final Repository re
     final List<FileDescriptor> deletedFiles = descriptorTriple.middle();
     final List<FileDescriptor> addedFiles = descriptorTriple.right();
 
+    for (final FileDescriptor modifiedFile : modifiedFiles) {
+      commitReportHandler.addModified(modifiedFile);
+    }
+
     for (final FileDescriptor deletedFile : deletedFiles) {
       commitReportHandler.addDeleted(deletedFile);
     }
 
+    for (final FileDescriptor addedFile : addedFiles) {
+      commitReportHandler.addAdded(addedFile);
+    }
+
     final List<Ref> list = Git.wrap(repository).tagList().call();
     final List<String> tags = new ArrayList<>();
     for (final Ref tag : list) {

src/main/proto/commit.proto

@@ -22,6 +22,8 @@ message CommitData {
   repeated string tags = 8;
 
   // Git file metrics
+  repeated FileIdentifier added_files = 10;
+  repeated FileIdentifier modified_files = 11;
   repeated FileIdentifier deleted_files = 12;
 }
 

src/main/proto/file.proto

@@ -94,7 +94,4 @@ message FileData {
   int32 added_lines = 12;
   int32 modified_lines = 13;
   int32 deleted_lines = 14;
-
-  // The commit ID this file belongs to
-  string commit_id = 15;
 }