1 files changed, 12 insertions, 8 deletions
diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java
index f7ccf4f2..292a7157 100644
--- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java
+++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java
@@ -20,16 +20,12 @@
 
 package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.impl;
 
-import static org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.impl.Commons.extractFailReason;
-
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import io.netty.handler.timeout.ReadTimeoutException;
 import io.vavr.collection.List;
-import java.nio.charset.StandardCharsets;
-
 import io.vavr.control.Option;
 import org.jetbrains.annotations.NotNull;
 import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod;
@@ -48,6 +44,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
 
+import java.nio.charset.StandardCharsets;
+
+import static org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.impl.Commons.extractFailReason;
+
 /**
  * @author <a href="mailto:piotr.jaszczyk@nokia.com">Piotr Jaszczyk</a>
  * @since March 2019
@@ -55,11 +55,14 @@ import reactor.core.publisher.Mono;
 public class MessageRouterSubscriberImpl implements MessageRouterSubscriber {
     private final RxHttpClient httpClient;
     private final Gson gson;
+    private final ClientErrorReasonPresenter clientErrorReasonPresenter;
     private static final Logger LOGGER = LoggerFactory.getLogger(MessageRouterSubscriberImpl.class);
 
-    public MessageRouterSubscriberImpl(RxHttpClient httpClient, Gson gson) {
+    public MessageRouterSubscriberImpl(RxHttpClient httpClient, Gson gson,
+                                       ClientErrorReasonPresenter clientErrorReasonPresenter) {
         this.httpClient = httpClient;
         this.gson = gson;
+        this.clientErrorReasonPresenter = clientErrorReasonPresenter;
     }
 
     @Override
@@ -67,7 +70,8 @@ public class MessageRouterSubscriberImpl implements MessageRouterSubscriber {
         LOGGER.debug("Requesting new items from DMaaP MR: {}", request);
         return httpClient.call(buildGetHttpRequest(request))
                 .map(this::buildGetResponse)
-                .doOnError(ReadTimeoutException.class, e -> LOGGER.error("Timeout exception occurred when subscribe items from DMaaP MR", e))
+                .doOnError(ReadTimeoutException.class,
+                        e -> LOGGER.error("Timeout exception occurred when subscribe items from DMaaP MR", e))
                 .onErrorResume(ReadTimeoutException.class, e -> createErrorResponse(ClientErrorReasons.TIMEOUT));
     }
 
@@ -91,7 +95,7 @@ public class MessageRouterSubscriberImpl implements MessageRouterSubscriber {
                 : builder.failReason(extractFailReason(httpResponse)).build();
     }
 
-    private List<JsonElement> getAsJsonElements(HttpResponse httpResponse){
+    private List<JsonElement> getAsJsonElements(HttpResponse httpResponse) {
         JsonArray bodyAsJsonArray = httpResponse
                 .bodyAsJson(StandardCharsets.UTF_8, gson, JsonArray.class);
 
@@ -104,7 +108,7 @@ public class MessageRouterSubscriberImpl implements MessageRouterSubscriber {
     }
 
     private Mono<MessageRouterSubscribeResponse> createErrorResponse(ClientErrorReason clientErrorReason) {
-        String failReason = ClientErrorReasonPresenter.present(clientErrorReason);
+        String failReason = clientErrorReasonPresenter.present(clientErrorReason);
         return Mono.just(ImmutableMessageRouterSubscribeResponse.builder()
                 .failReason(failReason)
                 .build());