Sep 5 3 (#42)

* Changes. * Changes.
codetyio · Sep 5, 2024 · 01b3d36 · 01b3d36
1 parent aedea1f
commit 01b3d36
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/...r-scalastyle/src/main/java/io/codety/scanner/analyzer/scalastyle/ScalastyleConverter.java b/...r-scalastyle/src/main/java/io/codety/scanner/analyzer/scalastyle/ScalastyleConverter.java
@@ -5,6 +5,7 @@
 import io.codety.scanner.analyzer.scalastyle.dto.ScalastyleError;
 import io.codety.scanner.analyzer.scalastyle.dto.ScalastyleFile;
 import io.codety.scanner.reporter.dto.CodeAnalysisIssueDto;
+import io.codety.scanner.util.CodetyConsoleLogger;
 import io.codety.scanner.util.XmlFactoryUtil;
 
 import java.util.ArrayList;
@@ -18,34 +19,36 @@ public static List<CodeAnalysisIssueDto> convertResult(String payload) {
         try {
             ScalastyleCheckstyle scalastyleCheckstyle = XmlFactoryUtil.xmlMapper.readValue(payload, ScalastyleCheckstyle.class);
             List<ScalastyleFile> files = scalastyleCheckstyle.getFile();
-            for(ScalastyleFile scalastyleFile : files){
+            if(files!=null) {
+                for (ScalastyleFile scalastyleFile : files) {
 
-                String fileName = scalastyleFile.getName();
-                if(fileName.startsWith("/")){
-                    fileName = fileName.substring(1);
-                }
-                List<ScalastyleError> errors = scalastyleFile.getError();
-                for(ScalastyleError error : errors){
-                    CodeAnalysisIssueDto issueDto = new CodeAnalysisIssueDto();
-                    issueDto.setFilePath(fileName);
-                    String severity = error.getSeverity();
-                    issueDto.setPriority(3);
-                    issueDto.setIssueCategory("generic");
-                    String source = error.getSource();
-                    if(source != null){
-                        String[] split = source.split("\\.");
-                        source = split[split.length-1];
+                    String fileName = scalastyleFile.getName();
+                    if (fileName.startsWith("/")) {
+                        fileName = fileName.substring(1);
+                    }
+                    List<ScalastyleError> errors = scalastyleFile.getError();
+                    for (ScalastyleError error : errors) {
+                        CodeAnalysisIssueDto issueDto = new CodeAnalysisIssueDto();
+                        issueDto.setFilePath(fileName);
+                        String severity = error.getSeverity();
+                        issueDto.setPriority(3);
+                        issueDto.setIssueCategory("generic");
+                        String source = error.getSource();
+                        if (source != null) {
+                            String[] split = source.split("\\.");
+                            source = split[split.length - 1];
+                        }
+                        issueDto.setIssueCode(source);
+                        issueDto.setStartLineNumber(error.getLine() == null ? 1 : error.getLine());
+                        issueDto.setDescription(error.getMessage());
+                        codeAnalysisIssueDtos.add(issueDto);
                     }
-                    issueDto.setIssueCode(source);
-                    issueDto.setStartLineNumber(error.getLine() == null ? 1 : error.getLine());
-                    issueDto.setDescription(error.getMessage());
-                    codeAnalysisIssueDtos.add(issueDto);
                 }
             }
 
 
         } catch (JsonProcessingException e) {
-
+            CodetyConsoleLogger.debug("Failed to parse scalatyle result", e);
         }
 
 

diff --git a/scanner-common/src/main/java/io/codety/scanner/reporter/dto/CodeAnalysisResultSetDto.java b/scanner-common/src/main/java/io/codety/scanner/reporter/dto/CodeAnalysisResultSetDto.java
@@ -53,7 +53,7 @@ public String toConsoleOutputString(AnalyzerRequest analyzerRequest) {
             }
         }
 
-        for (CodeAnalysisResultDto resultDto : this.getCodeAnalysisResultDtoList()) {
+        for (CodeAnalysisResultDto resultDto : this.getMergedByLanguage()) {
             if (resultDto == null) {
                 continue;
             }

diff --git a/scanner/src/main/java/io/codety/scanner/reporter/github/GithubPullRequestResultReporter.java b/scanner/src/main/java/io/codety/scanner/reporter/github/GithubPullRequestResultReporter.java
@@ -29,8 +29,7 @@ public void deliverResult(AnalyzerRequest analyzerRequest, CodeAnalysisResultSet
             return;
         }
 
-        List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getCodeAnalysisResultDtoList();
-
+        List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getMergedByLanguage();
 
         if (analyzerRequest.getGithubAccessToken() != null) {
 

diff --git a/scanner/src/main/java/io/codety/scanner/reporter/slack/SlackResultGenerator.java b/scanner/src/main/java/io/codety/scanner/reporter/slack/SlackResultGenerator.java
@@ -46,7 +46,7 @@ public String generatePayloadResult(AnalyzerRequest analyzerRequest, CodeAnalysi
 
     public List<SlackMessageBlock> generateRichTextPayloadResult(AnalyzerRequest analyzerRequest, CodeAnalysisResultSetDto codeAnalysisResultSetDto) {
         List<SlackMessageBlock> blocks = new ArrayList<>();
-        List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getCodeAnalysisResultDtoList();
+        List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getMergedByLanguage();
         if(codeAnalysisResultSetDto == null || codeAnalysisResultDtoList.size() ==0 ){
             return blocks;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getCodeAnalysisResultDtoList();
+            List<CodeAnalysisResultDto> codeAnalysisResultDtoList = codeAnalysisResultSetDto.getMergedByLanguage();
             if (analyzerRequest.getGithubAccessToken() != null) {
@@ Expand Down @@