Merge pull request #208 from tomvin6/eli_scm_30.4

defect #832120: Jenkins plugin - scm lines enrichment is failing  if …

Author: radislavB

src/main/java/com/microfocus/application/automation/tools/octane/model/processors/scm/GitSCMProcessor.java

@@ -97,11 +97,14 @@ private SCMData enrichLinesOnSCMData(SCMData scmData, AbstractBuild build) {
             if (workspace != null) {
                 File repoDir = new File(getRemoteString(build) + File.separator + ".git");
                 scmData = workspace.act(new LineEnricherCallable(repoDir, scmData));
+                logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
+            }
+            else {
+                logger.warn("Line enricher: workspace is null");
             }
         } catch (Exception e1) {
-            logger.error("Line enricher: FAILED. could not enrich lines on SCM Data " + e1);
+            logger.error("Line enricher: FAILED. could not enrich lines on SCM Data ", e1);
         }
-        logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
         return scmData;
     }
 
@@ -349,7 +352,7 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {
             df.setDetectRenames(true);
 
             //add blame data to scm data
-            Set<String> committedFiles = getCommittedFiles(scmData);
+            Set<String> committedFiles = getAddedOrEditedFiles(scmData);
             List<SCMFileBlame> fileBlameList = getBlameData(repo, committedFiles);
             scmData.setFileBlameList(fileBlameList);
 
@@ -396,10 +399,10 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {
         }
     }
 
-    private static Set<String> getCommittedFiles(SCMData scmData) {
+    private static Set<String> getAddedOrEditedFiles(SCMData scmData) {
         Set<String> filesCommittedInPPR = new HashSet<>();
         for (SCMCommit curCommit : scmData.getCommits()) {
-            curCommit.getChanges().forEach(change -> filesCommittedInPPR.add(change.getFile()));
+            curCommit.getChanges().stream().filter(change -> !change.getType().equals("delete")).forEach(change -> filesCommittedInPPR.add(change.getFile()));
         }
         return filesCommittedInPPR;
     }