From c28353ec8b036b74bb070ca03420bfea29b1ca8d Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Thu, 28 Apr 2022 16:22:34 -0500 Subject: SONAR-16316 DAO to fetch report issues from DB SONAR-16316 Export CSV files with issues SONAR-16316 Create Web API 'api/regulatory_reports/download' SONAR-16316 Export Scanner Context SONAR-16316 Write report zip file SONAR-16316 Integrate pdf report in zip file --- .../sonar/server/platform/monitoring/SettingsSection.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'server/sonar-webserver-core/src') diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java index 8c87854b66a..9bf64d642ad 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java @@ -77,7 +77,7 @@ public class SettingsSection implements SystemInfoSection, Global { private void addDefaultNewCodeDefinition(Builder protobuf) { try (DbSession dbSession = dbClient.openSession(false)) { Optional period = dbClient.newCodePeriodDao().selectGlobal(dbSession); - setAttribute(protobuf, "Default New Code Definition", parseDefaultNewCodeDefinition(period)); + setAttribute(protobuf, "Default New Code Definition", parseDefaultNewCodeDefinition(period.orElse(NewCodePeriodDto.defaultInstance()))); } } @@ -95,15 +95,11 @@ public class SettingsSection implements SystemInfoSection, Global { return abbreviate(value, MAX_VALUE_LENGTH); } - private static String parseDefaultNewCodeDefinition(Optional period) { - if (!period.isPresent()) { - return "PREVIOUS_VERSION"; + private static String parseDefaultNewCodeDefinition(NewCodePeriodDto period) { + if (period.getValue() == null) { + return period.getType().name(); } - if (period.get().getValue() == null) { - return period.get().getType().name(); - } - - return period.get().getType().name() + ": " + period.get().getValue(); + return period.getType().name() + ": " + period.getValue(); } } -- cgit v1.2.3