From 9afc8d1448a6a913db56304d3bc80cd92c141d0f Mon Sep 17 00:00:00 2001 From: Claudio David Gasparini Date: Mon, 11 Jan 2021 16:42:30 +0100 Subject: Enable spotbugs and fix spotbugs warns Issue-ID: CPS-159 Signed-off-by: Claudio David Gasparini Change-Id: Iee572fd740689a172ca599123b0751b5e909223a --- .../src/main/java/org/onap/cps/rest/utils/MultipartFileUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cps-rest/src') diff --git a/cps-rest/src/main/java/org/onap/cps/rest/utils/MultipartFileUtil.java b/cps-rest/src/main/java/org/onap/cps/rest/utils/MultipartFileUtil.java index 0c527a556..c53d1a42a 100644 --- a/cps-rest/src/main/java/org/onap/cps/rest/utils/MultipartFileUtil.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/utils/MultipartFileUtil.java @@ -19,10 +19,12 @@ package org.onap.cps.rest.utils; +import static com.google.common.base.Preconditions.checkNotNull; import static org.opendaylight.yangtools.yang.common.YangConstants.RFC6020_YANG_FILE_EXTENSION; import com.google.common.collect.ImmutableMap; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Map; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -47,7 +49,7 @@ public class MultipartFileUtil { } private static String extractYangResourceName(final MultipartFile multipartFile) { - final String fileName = multipartFile.getOriginalFilename(); + final String fileName = checkNotNull(multipartFile.getOriginalFilename(), "Missing filename."); if (!fileName.endsWith(RFC6020_YANG_FILE_EXTENSION)) { throw new ModelValidationException("Unsupported file type.", String.format("Filename %s does not end with '%s'", fileName, RFC6020_YANG_FILE_EXTENSION)); @@ -57,7 +59,7 @@ public class MultipartFileUtil { private static String extractYangResourceContent(final MultipartFile multipartFile) { try { - return new String(multipartFile.getBytes()); + return new String(multipartFile.getBytes(), StandardCharsets.UTF_8); } catch (final IOException e) { throw new CpsException("Cannot read the resource file.", e.getMessage(), e); } -- cgit 1.2.3-korg