Skip to content

Commit 4797d03

Browse files
authored
Fix sonar warning on direct use of regex + @SuppressWarning on caseUuid log (#111)
Signed-off-by: Igor PIROG <igor.pirog@rte-france.com>
1 parent fcd8041 commit 4797d03

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/main/java/com/powsybl/caseserver/datasource/S3CaseDataSourceService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import org.springframework.stereotype.Service;
1616

1717
import java.io.InputStream;
18+
import java.net.URLDecoder;
19+
import java.nio.charset.StandardCharsets;
1820
import java.nio.file.Files;
1921
import java.util.Set;
2022
import java.util.UUID;
@@ -75,7 +77,8 @@ public InputStream getInputStream(UUID caseUuid, String suffix, String ext) {
7577

7678
@Override
7779
public Set<String> listName(UUID caseUuid, String regex) {
78-
return s3CaseService.listName(caseUuid, regex);
80+
final String decodedRegex = URLDecoder.decode(regex, StandardCharsets.UTF_8);
81+
return s3CaseService.listName(caseUuid, decodedRegex);
7982
}
8083
}
8184

src/main/java/com/powsybl/caseserver/service/FsCaseService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public String getCaseName(UUID caseUuid) {
146146
}
147147

148148
@Override
149+
@SuppressWarnings("javasecurity:S5145")
149150
public CaseInfos getCaseInfos(UUID caseUuid) {
150151
Path file = getCaseFile(caseUuid);
151152
if (file == null) {

src/main/java/com/powsybl/caseserver/service/S3CaseService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ private List<S3Object> getCaseS3Objects(UUID caseUuid) {
237237
}
238238

239239
@Override
240+
@SuppressWarnings("javasecurity:S5145")
240241
public CaseInfos getCaseInfos(UUID caseUuid) {
241242
if (!caseExists(caseUuid)) {
242243
LOGGER.error("The directory with the following uuid doesn't exist: {}", caseUuid);

0 commit comments

Comments
 (0)