From 6f3c72cca0aa01d06e1167905ce98ef8a777d4ec Mon Sep 17 00:00:00 2001 From: teleivo Date: Fri, 29 Jul 2022 13:43:00 +0200 Subject: [PATCH] fix: sonarqube suggestion Alternatives in regular expressions should be grouped when used with anchors --- .../hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java | 2 +- .../webapi/controller/tracker/csv/TrackerCsvEventService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java index 616641fd6f19..ed063c7ef2b2 100644 --- a/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java +++ b/dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java @@ -62,7 +62,7 @@ public class DefaultCsvEventService private static final CsvSchema CSV_SCHEMA = CSV_MAPPER.schemaFor( CsvEventDataValue.class ) .withLineSeparator( "\n" ); - private static final Pattern TRIM_SINGLE_QUOTES = Pattern.compile( "^'|'$" ); + private static final Pattern TRIM_SINGLE_QUOTES = Pattern.compile( "(?:^')|(?:'$)" ); @Override public void writeEvents( OutputStream outputStream, List events, boolean withHeader ) diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/csv/TrackerCsvEventService.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/csv/TrackerCsvEventService.java index 0e88c9f8d710..dc6ccaa87e81 100644 --- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/csv/TrackerCsvEventService.java +++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/csv/TrackerCsvEventService.java @@ -64,7 +64,7 @@ public class TrackerCsvEventService { private static final CsvMapper CSV_MAPPER = new CsvMapper().enable( CsvParser.Feature.WRAP_AS_ARRAY ); - private static final Pattern TRIM_SINGLE_QUOTES = Pattern.compile( "^'|'$" ); + private static final Pattern TRIM_SINGLE_QUOTES = Pattern.compile( "(?:^')|(?:'$)" ); @Override public void writeEvents( OutputStream outputStream, List events, boolean withHeader )