From f571a4a2299050df1151d6782e3a848a88ce3763 Mon Sep 17 00:00:00 2001 From: "m.dalakov" Date: Wed, 29 Nov 2017 19:29:15 +0200 Subject: [PATCH] [SECIOTSRK-701] *fix sonar issue --- .../com/samsung/alive/utils/rest/DsmApiImplTest.java | 3 ++- .../com/samsung/commons/utils/sender/HttpSender.java | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java b/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java index de43588..e9a4da5 100644 --- a/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java +++ b/servers/alive/src/test/java/com/samsung/alive/utils/rest/DsmApiImplTest.java @@ -64,7 +64,8 @@ public class DsmApiImplTest { } @Test - public void authCode() throws DsmApiError, HttpSenderException { + @SuppressWarnings("PMD.SignatureDeclareThrowsException") + public void authCode() throws Exception { when(httpSender.get(anyString(), eq(String.class))).thenReturn(AUTH_CODE); assertThat(sender.authCode(LOGIN, PASSWORD), is(AUTH_CODE)); diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java b/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java index 6c3e2da..aca525f 100644 --- a/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java +++ b/servers/commons/src/main/java/com/samsung/commons/utils/sender/HttpSender.java @@ -203,18 +203,24 @@ public class HttpSender { } private String normalizeTail(String input) { - verifyLength(input); - while (input.endsWith("/")) { - int length = input.length() - 2; - input = input.substring(0, length); + String s = input; + + verifyLength(s); + + while (s.endsWith("/")) { + int length = s.length() - 2; + s = s.substring(0, length); } - return input; + return s; } private static void verifyLength(String input) { - if (input.length() < 2) { + + String s = input; + + if (s.length() < 2) { throw new IllegalArgumentException(MESSAGE_TOO_SHORT); } } -- 2.7.4