From 1125e9dd1378ebc9aa381eeb7139e7a95e269a42 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Mon, 12 Sep 2022 11:56:31 -0500 Subject: SONAR-17287 Fix conversion of flow types --- .../sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java | 4 +++- .../main/java/org/sonar/server/issue/TextRangeResponseFormatter.java | 4 +++- .../src/main/java/org/sonar/scanner/issue/IssuePublisher.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java index c824e40efa1..d101ebf4250 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java @@ -263,8 +263,10 @@ public class TrackerRawInputFactory { return Optional.of(DbIssues.FlowType.DATA); case EXECUTION: return Optional.of(DbIssues.FlowType.EXECUTION); - default: + case UNDEFINED: return Optional.empty(); + default: + throw new IllegalArgumentException("Unrecognized type: " + flowType); } } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TextRangeResponseFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TextRangeResponseFormatter.java index d105c4e533c..42473599f39 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TextRangeResponseFormatter.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TextRangeResponseFormatter.java @@ -71,8 +71,10 @@ public class TextRangeResponseFormatter { return Optional.of(Common.FlowType.DATA); case EXECUTION: return Optional.of(Common.FlowType.EXECUTION); + case UNDEFINED: + // we should only get this value if no type was set (since it's the default value of the enum), in which case this method shouldn't be called. default: - return Optional.empty(); + throw new IllegalArgumentException("Unrecognized flow type: " + flowType); } } diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuePublisher.java index f9b38d860cb..965600c0a22 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuePublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuePublisher.java @@ -195,8 +195,10 @@ public class IssuePublisher { return ScannerReport.FlowType.EXECUTION; case DATA: return ScannerReport.FlowType.DATA; - default: + case UNDEFINED: return ScannerReport.FlowType.UNDEFINED; + default: + throw new IllegalArgumentException("Unrecognized flow type: " + flowType); } } -- cgit v1.2.3