From 84cd9a77344d509f1da7e7d8139f41507727ec96 Mon Sep 17 00:00:00 2001
From: Oleksandr Abakumov <o.abakumov@samsung.com>
Date: Fri, 13 Oct 2017 12:28:21 +0300
Subject: [PATCH] Sonar +

---
 servers/alive/configuration/develop/logback.xml    | 23 ----------------------
 .../samsung/alive/utils/rest/ServerSenderImpl.java |  7 ++++---
 .../com/samsung/commons/utils/sync/AsyncCode.java  |  2 +-
 .../samsung/commons/utils/sync/Synchronous.java    | 14 +++++++++----
 .../samsung/dsm/rest/alive/AliveApiSenderImpl.java |  1 -
 servers/pom.xml                                    |  3 ++-
 6 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/servers/alive/configuration/develop/logback.xml b/servers/alive/configuration/develop/logback.xml
index fe2b06b..507e13e 100644
--- a/servers/alive/configuration/develop/logback.xml
+++ b/servers/alive/configuration/develop/logback.xml
@@ -7,55 +7,32 @@
         </layout>
     </appender>
 
-    <appender name="FILE-ENGINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>alive.log</file>
-        <encoder>
-            <Pattern>
-                [%d{yyyy-MM-dd HH:mm:ss}] [%-5p] [%t] %c{1}:[%L] - %m%n
-            </Pattern>
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>/tmp/servers/alive-%d{yyyy-MM-dd-HH-mm}.%i.log</fileNamePattern>
-            <maxFileSize>100MB</maxFileSize>
-            <!-- <maxHistory>30</maxHistory> -->
-            <totalSizeCap>1GB</totalSizeCap>
-        </rollingPolicy>
-    </appender>
-
     <logger name="com.samsung" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="org.springframework" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="org.hibernate" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="kafka" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="org.apache.zookeeper" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <logger name="org.I0Itec.zkclient" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </logger>
 
     <root level="error">
         <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE-ENGINE" />
     </root>
 
     <jmxConfigurator />
diff --git a/servers/alive/src/main/java/com/samsung/alive/utils/rest/ServerSenderImpl.java b/servers/alive/src/main/java/com/samsung/alive/utils/rest/ServerSenderImpl.java
index 895d11b..a366aa7 100644
--- a/servers/alive/src/main/java/com/samsung/alive/utils/rest/ServerSenderImpl.java
+++ b/servers/alive/src/main/java/com/samsung/alive/utils/rest/ServerSenderImpl.java
@@ -17,6 +17,8 @@ public class ServerSenderImpl implements ServerSender {
 
     private RestTemplate restTemplate;
 
+    private static final String API_URL_TEMPLATE = "%s/restapi/login?login=%s&password=%s";
+
     /**
      * Server host
      */
@@ -37,9 +39,8 @@ public class ServerSenderImpl implements ServerSender {
     @Override
     public String authCode(String login, String password) throws ServerSenderError {
         try {
-            String stringURI = format("%s/restapi/login?login=%s&password=%s", host, login, password);
-            LOG.debug("Server Sender:");
-            LOG.debug(stringURI);
+            String stringURI = format(API_URL_TEMPLATE, host, login, password);
+            LOG.debug("Server Sender: " + format(API_URL_TEMPLATE, host, login, "<hidden>"));
 
             ResponseEntity<String> result = restTemplate.getForEntity(new URI(stringURI), String.class);
 
diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java b/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java
index 8b0641f..dd3a331 100644
--- a/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java
+++ b/servers/commons/src/main/java/com/samsung/commons/utils/sync/AsyncCode.java
@@ -7,5 +7,5 @@ package com.samsung.commons.utils.sync;
  */
 @FunctionalInterface
 public interface AsyncCode<T> {
-    void async(ResultCallback<T> resultCallback) throws Throwable;
+    void async(ResultCallback<T> resultCallback) throws Exception;
 }
diff --git a/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java b/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java
index c0f1ab0..9341f58 100644
--- a/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java
+++ b/servers/commons/src/main/java/com/samsung/commons/utils/sync/Synchronous.java
@@ -16,15 +16,21 @@ public class Synchronous<T> {
 
     private final Logger log = Logger.getLogger(Synchronous.class);
 
+    // Default timeout (ms)
+    private static final int DEFAULT_TIMEOUT = 1000;
+
+    // Default maximum rounds
+    private static final int DEFAULT_MAX_ROUNDS = 10;
+
     private final Object lock = new Object();
 
     private boolean firstTime = true;
 
     // How long to wait before the next try
-    private int timeout = 1000;
+    private int timeout = DEFAULT_TIMEOUT;
 
     // Max tries before exit
-    private int maxRounds = 10;
+    private int maxRounds = DEFAULT_MAX_ROUNDS;
 
     // Result
     private T result;
@@ -102,8 +108,8 @@ public class Synchronous<T> {
 
                     asyncCode.async(resultCallback);
 
-                } catch (Throwable throwable) {
-                    log.error("Error on running asynchronous code. Return empty.", throwable);
+                } catch (Exception e) {
+                    log.error("Error on running asynchronous code. Return empty.", e);
 
                     return empty();
                 }
diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/alive/AliveApiSenderImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/alive/AliveApiSenderImpl.java
index f70e0eb..58ace66 100644
--- a/servers/dsm/src/main/java/com/samsung/dsm/rest/alive/AliveApiSenderImpl.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/alive/AliveApiSenderImpl.java
@@ -2,7 +2,6 @@ package com.samsung.dsm.rest.alive;
 
 import org.apache.log4j.Logger;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
diff --git a/servers/pom.xml b/servers/pom.xml
index 35d60a8..2c82f15 100644
--- a/servers/pom.xml
+++ b/servers/pom.xml
@@ -75,7 +75,8 @@
                     1. Do "mvn jetty:run" to start jetty server
                     See the application in browser under <contextPath>
 
-                    2. Use mvnDebug jetty:run for debug
+                    2. Use "mvnDebug jetty:run" for debug
+                    3. With specified port - "mvn jetty:run -Djetty.http.port=8181"
                 -->
                 <plugin>
                     <groupId>org.eclipse.jetty</groupId>
-- 
2.7.4