From 35abcecbb0113fb06cca557f4340e93caafcf420 Mon Sep 17 00:00:00 2001 From: "m.dalakov" Date: Thu, 19 Oct 2017 18:05:34 +0300 Subject: [PATCH] [SECIOTSRK-645] Fix SVACE issues: module 17_SRK_servers --- .../main/java/com/samsung/commons/utils/Utils.java | 2 +- .../dsm/domain/oauth/OAuthAccessTokenTest.java | 22 ++++++++++++---------- .../dsm/domain/oauth/OAuthClientTokenTest.java | 12 +++++++----- .../samsung/dsm/domain/oauth/OAuthCodeTest.java | 8 +++++--- .../dsm/domain/oauth/OAuthRefreshTokenTest.java | 12 +++++++----- .../dsm/service/AccessTokenServiceTest.java | 7 +++++-- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java b/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java index 4f7619f..aac3163 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/Utils.java @@ -88,7 +88,7 @@ public final class Utils { Resource resource = new ClassPathResource(path); InputStream resourceInputStream = resource.getInputStream(); - try (Scanner scanner = new Scanner(resourceInputStream)) { + try (Scanner scanner = new Scanner(resourceInputStream, "UTF-8")) { return scanner.useDelimiter("\\A").hasNext() ? scanner.next() : ""; } } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthAccessTokenTest.java b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthAccessTokenTest.java index a08082d..5f82e64 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthAccessTokenTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthAccessTokenTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collection; @@ -48,17 +49,18 @@ public class OAuthAccessTokenTest { */ @Parameters public static Collection data() { + Charset utf8 = Charset.forName("UTF-8"); Object[][] data = new Object[][] { - { "Token identifier 1", "Token 1".getBytes(), "Authentication Id 1", "User name 1", "Client 1", - "Client 1".getBytes(), "refresh token 1" }, - { "Token identifier 2", "Token 2".getBytes(), "Authentication Id 2", "User name 2", "Client 2", - "Client 2".getBytes(), "refresh token 2" }, - { "Token identifier 3", "Token 3".getBytes(), "Authentication Id 3", "User name 3", "Client 3", - "Client 3".getBytes(), "refresh token 3" }, - { "Token identifier 4", "Token 4".getBytes(), "Authentication Id 4", "User name 4", "Client 4", - "Client 4".getBytes(), "refresh token 4" }, - { "Token identifier 5", "Token 5".getBytes(), "Authentication Id 5", "User name 5", "Client 5", - "Client 5".getBytes(), "refresh token 5" } }; + { "Token identifier 1", "Token 1".getBytes(utf8), "Authentication Id 1", "User name 1", "Client 1", + "Client 1".getBytes(utf8), "refresh token 1" }, + { "Token identifier 2", "Token 2".getBytes(utf8), "Authentication Id 2", "User name 2", "Client 2", + "Client 2".getBytes(utf8), "refresh token 2" }, + { "Token identifier 3", "Token 3".getBytes(utf8), "Authentication Id 3", "User name 3", "Client 3", + "Client 3".getBytes(utf8), "refresh token 3" }, + { "Token identifier 4", "Token 4".getBytes(utf8), "Authentication Id 4", "User name 4", "Client 4", + "Client 4".getBytes(utf8), "refresh token 4" }, + { "Token identifier 5", "Token 5".getBytes(utf8), "Authentication Id 5", "User name 5", "Client 5", + "Client 5".getBytes(utf8), "refresh token 5" } }; return Arrays.asList(data); } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthClientTokenTest.java b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthClientTokenTest.java index 1583f32..0cb3019 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthClientTokenTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthClientTokenTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collection; @@ -45,12 +46,13 @@ public class OAuthClientTokenTest { */ @Parameters public static Collection data() { + Charset utf8 = Charset.forName("UTF-8"); Object[][] data = new Object[][] { - { "Token id = 1", "Token 1".getBytes(), "Authentication Id = 1", USER_EMAIL, "Client Id = 1" }, - { "Token id = 2", "Token 2".getBytes(), "Authentication Id = 2", USER_EMAIL, "Client Id = 2" }, - { "Token id = 3", "Token 3".getBytes(), "Authentication Id = 3", USER_EMAIL, "Client Id = 3" }, - { "Token id = 4", "Token 4".getBytes(), "Authentication Id = 4", USER_EMAIL, "Client Id = 4" }, - { "Token id = 5", "Token 5".getBytes(), "Authentication Id = 5", USER_EMAIL, "Client Id = 5" } }; + { "Token id = 1", "Token 1".getBytes(utf8), "Authentication Id = 1", USER_EMAIL, "Client Id = 1" }, + { "Token id = 2", "Token 2".getBytes(utf8), "Authentication Id = 2", USER_EMAIL, "Client Id = 2" }, + { "Token id = 3", "Token 3".getBytes(utf8), "Authentication Id = 3", USER_EMAIL, "Client Id = 3" }, + { "Token id = 4", "Token 4".getBytes(utf8), "Authentication Id = 4", USER_EMAIL, "Client Id = 4" }, + { "Token id = 5", "Token 5".getBytes(utf8), "Authentication Id = 5", USER_EMAIL, "Client Id = 5" } }; return Arrays.asList(data); } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthCodeTest.java b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthCodeTest.java index 20a8d1a..74758d7 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthCodeTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthCodeTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collection; @@ -43,9 +44,10 @@ public class OAuthCodeTest { */ @Parameters public static Collection data() { - Object[][] data = new Object[][] { { "AuthCode = 1", "Authentication 1".getBytes() }, - { "AuthCode = 2", "Authentication 2".getBytes() }, { "AuthCode = 3", "Authentication 3".getBytes() }, - { "AuthCode = 4", "Authentication 4".getBytes() }, { "AuthCode = 5", "Authentication 5".getBytes() } }; + Charset utf8 = Charset.forName("UTF-8"); + Object[][] data = new Object[][] { { "AuthCode = 1", "Authentication 1".getBytes(utf8) }, + { "AuthCode = 2", "Authentication 2".getBytes(utf8) }, { "AuthCode = 3", "Authentication 3".getBytes(utf8) }, + { "AuthCode = 4", "Authentication 4".getBytes(utf8) }, { "AuthCode = 5", "Authentication 5".getBytes(utf8) } }; return Arrays.asList(data); } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthRefreshTokenTest.java b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthRefreshTokenTest.java index 62c254e..335efb2 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthRefreshTokenTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/domain/oauth/OAuthRefreshTokenTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collection; @@ -42,12 +43,13 @@ public class OAuthRefreshTokenTest { */ @Parameters public static Collection data() { + Charset utf8 = Charset.forName("UTF-8"); Object[][] data = new Object[][] { - { "Token id = 1", "Refresh Token 1".getBytes(), "Authentication 1".getBytes() }, - { "Token id = 2", "Refresh Token 2".getBytes(), "Authentication 2".getBytes() }, - { "Token id = 3", "Refresh Token 3".getBytes(), "Authentication 3".getBytes() }, - { "Token id = 4", "Refresh Token 4".getBytes(), "Authentication 4".getBytes() }, - { "Token id = 5", "Refresh Token 5".getBytes(), "Authentication 5".getBytes() } }; + { "Token id = 1", "Refresh Token 1".getBytes(utf8), "Authentication 1".getBytes(utf8) }, + { "Token id = 2", "Refresh Token 2".getBytes(utf8), "Authentication 2".getBytes(utf8) }, + { "Token id = 3", "Refresh Token 3".getBytes(utf8), "Authentication 3".getBytes(utf8) }, + { "Token id = 4", "Refresh Token 4".getBytes(utf8), "Authentication 4".getBytes(utf8) }, + { "Token id = 5", "Refresh Token 5".getBytes(utf8), "Authentication 5".getBytes(utf8) } }; return Arrays.asList(data); } diff --git a/servers/dsm/src/test/java/com/samsung/dsm/service/AccessTokenServiceTest.java b/servers/dsm/src/test/java/com/samsung/dsm/service/AccessTokenServiceTest.java index 7eca252..bcaf110 100644 --- a/servers/dsm/src/test/java/com/samsung/dsm/service/AccessTokenServiceTest.java +++ b/servers/dsm/src/test/java/com/samsung/dsm/service/AccessTokenServiceTest.java @@ -23,6 +23,8 @@ import org.springframework.test.context.web.WebAppConfiguration; import com.samsung.dsm.domain.oauth.OAuthAccessToken; import com.samsung.dsm.service.impl.AccessTokenServiceImpl; +import java.nio.charset.Charset; + /** * The type Access token service test. * @@ -106,8 +108,9 @@ public class AccessTokenServiceTest { } private OAuthAccessToken createToken() { + Charset utf8 = Charset.forName("UTF-8"); return new OAuthAccessToken("Token identifier 1", accessToken - .getBytes(), "Authentication Id 1", "User name 1", "Client 1", "Client 1" - .getBytes(), "refresh token 1"); + .getBytes(utf8), "Authentication Id 1", "User name 1", "Client 1", "Client 1" + .getBytes(utf8), "refresh token 1"); } } -- 2.7.4