finish merge with develop

build.gradle

@@ -43,7 +43,7 @@ dependencies {
             files('build/common/microservice-common.jar'),
             files('build/common/microservice-common.jar'),
 //            files('build/client/microservice-client.jar'),
 //            files('build/client/microservice-client.jar'),
             'io.jsonwebtoken:jjwt:0.6.0',
             'io.jsonwebtoken:jjwt:0.6.0',
-            'io.undertow:undertow-core:1.0.1.Final',
+            'io.undertow:undertow-core:2.0.28.Final',
             'com.fasterxml.jackson.core:jackson-databind:2.2.3',
             'com.fasterxml.jackson.core:jackson-databind:2.2.3',
             'io.dropwizard.metrics:metrics-core:3.1.0',
             'io.dropwizard.metrics:metrics-core:3.1.0',
             'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14',
             'com.netflix.hystrix:hystrix-codahale-metrics-publisher:1.4.14',

src/main/java/microservice/utils/RestHttpClient.java

@@ -50,7 +50,6 @@ import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.function.Supplier;
-import java.util.concurrent.TimeUnit;
 
 
 import static common.microservice.io.iface.IRestClient.COMMAND_ERROR;
 import static common.microservice.io.iface.IRestClient.COMMAND_ERROR;
 
 
@@ -94,8 +93,6 @@ public class RestHttpClient extends SimpleRestClient implements Closeable {
             .readTimeout(HTTP_SOCKET_READ_TIMEOUT, TimeUnit.SECONDS)
             .readTimeout(HTTP_SOCKET_READ_TIMEOUT, TimeUnit.SECONDS)
             .build();
             .build();
 
 
-//        httpAsyncClient = createHttpClient();
-//        httpAsyncClient.start();
         initBaseRestValidation();
         initBaseRestValidation();
     }
     }