After review fixes

Author: stingion

config-scalecube-configuration-service/src/main/java/io/scalecube/config/service/ScalecubeConfigurationServiceConfigSource.java

@@ -31,6 +31,8 @@ public class ScalecubeConfigurationServiceConfigSource implements ConfigSource {
   private static final Logger LOGGER =
       LoggerFactory.getLogger(ScalecubeConfigurationServiceConfigSource.class);
 
+  private static final ServiceCall serviceCall = new ServiceCall();
+
   private final ConfigurationService service;
 
   private final ReadListRequest requestEntries;
@@ -120,7 +122,7 @@ public Builder url(URL url) {
    * @return service
    */
   public static <T> T httpService(GatewayClientSettings settings, Class<T> clazz) {
-    return new ServiceCall()
+    return serviceCall
         .transport(new GatewayClientTransport(new HttpGatewayClient(settings, HTTP_CLIENT_CODEC)))
         .router(new StaticAddressRouter(Address.create(settings.host(), settings.port())))
         .api(clazz);

scalecube-configuration-benchmarks/src/main/java/io/scalecube/configuration/benchmarks/ConfigurationServiceBenchmarkState.java

@@ -50,6 +50,8 @@ final class ConfigurationServiceBenchmarkState
   private final String gatewayProtocol;
   private final boolean secure;
 
+  private final ServiceCall serviceCall;
+
   private final AtomicReference<String> apiKey = new AtomicReference<>();
 
   /**
@@ -65,6 +67,11 @@ public ConfigurationServiceBenchmarkState(BenchmarkSettings settings) {
     gatewayPort = Integer.valueOf(settings.find("gatewayPort", "7070"));
     gatewayProtocol = String.valueOf(settings.find("gatewayProtocol", "ws"));
     secure = Boolean.valueOf(settings.find("secure", "false"));
+
+    serviceCall =
+        new ServiceCall()
+            .transport(clientTransport())
+            .router(new StaticAddressRouter(Address.create(gatewayHost, gatewayPort)));
   }
 
   @Override
@@ -129,10 +136,7 @@ private GatewayClientTransport clientTransport() {
   }
 
   protected <T> T forService(Class<T> clazz) {
-    return new ServiceCall()
-        .transport(clientTransport())
-        .router(new StaticAddressRouter(Address.create(gatewayHost, gatewayPort)))
-        .api(clazz);
+    return serviceCall.api(clazz);
   }
 
   private void preload(Token token, int configKeysCount) {

scalecube-configuration/src/test/java/io/scalecube/configuration/fixtures/IntegrationEnvironmentFixture.java

@@ -16,30 +16,33 @@
 public final class IntegrationEnvironmentFixture implements Fixture {
 
   private static final IntegrationEnvironment environment = new IntegrationEnvironment();
+  private static String HOST = "localhost";
+  private static int PORT = 7070;
+
+  private ServiceCall serviceCall;
 
   static {
     environment.start();
   }
 
   private GatewayClient client;
   private GatewayClientTransport clientTransport;
-  private String HOST = "localhost";
-  private int PORT = 7070;
 
   @Override
   public void setUp() throws TestAbortedException {
     GatewayClientSettings settings = GatewayClientSettings.builder().host(HOST).port(PORT).build();
 
     client = new WebsocketGatewayClient(settings, WEBSOCKET_CLIENT_CODEC);
     clientTransport = new GatewayClientTransport(client);
+    serviceCall =
+        new ServiceCall()
+            .transport(clientTransport)
+            .router(new StaticAddressRouter(Address.create(HOST, PORT)));
   }
 
   @Override
   public <T> T proxyFor(Class<? extends T> clazz) {
-    return new ServiceCall()
-        .transport(clientTransport)
-        .router(new StaticAddressRouter(Address.create(HOST, PORT)))
-        .api(clazz);
+    return serviceCall.api(clazz);
   }
 
   @Override