1 files changed, 0 insertions, 91 deletions
diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/service/DmaapWebClient.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/service/DmaapWebClient.java
deleted file mode 100644
index 5a8806b4..00000000
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/service/DmaapWebClient.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START======================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property, 2018-2019 Nordix Foundation. All rights reserved.
- * ===============================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END========================================================================
- */
-
-package org.onap.dcaegen2.collectors.datafile.service;
-
-import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.RESPONSE_CODE;
-import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.SERVICE_NAME;
-
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapCustomConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.client.ClientRequest;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClient.Builder;
-import reactor.core.publisher.Mono;
-
-/**
- * Web client for the DMaaP MessageRouter.
- *
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 7/4/18
- */
-public class DmaapWebClient {
-
-    private static final Logger logger = LoggerFactory.getLogger(DmaapWebClient.class);
-
-    private String contentType;
-
-    /**
-     * Creating DmaapReactiveWebClient passing to them basic DmaapConfig.
-     *
-     * @param dmaapCustomConfig - configuration object
-     * @return DmaapReactiveWebClient
-     */
-    public DmaapWebClient fromConfiguration(DmaapCustomConfig dmaapCustomConfig) {
-        this.contentType = dmaapCustomConfig.dmaapContentType();
-        return this;
-    }
-
-    /**
-     * Construct Reactive WebClient with appropriate settings.
-     *
-     * @return WebClient
-     */
-    public WebClient build() {
-        Builder webClientBuilder = WebClient.builder() //
-            .defaultHeader(HttpHeaders.CONTENT_TYPE, contentType) //
-            .filter(getRequestFilter()) //
-            .filter(getResponseFilter());
-        return webClientBuilder.build();
-    }
-
-    private ExchangeFilterFunction getResponseFilter() {
-        return ExchangeFilterFunction.ofResponseProcessor(this::logResponse);
-    }
-
-    Mono<ClientResponse> logResponse(ClientResponse clientResponse) {
-        MDC.put(RESPONSE_CODE, String.valueOf(clientResponse.statusCode()));
-        logger.trace("Response Status {}", clientResponse.statusCode());
-        MDC.remove(RESPONSE_CODE);
-        return Mono.just(clientResponse);
-    }
-
-    private ExchangeFilterFunction getRequestFilter() {
-        return ExchangeFilterFunction.ofRequestProcessor(this::logRequest);
-    }
-
-    Mono<ClientRequest> logRequest(ClientRequest clientRequest) {
-        MDC.put(SERVICE_NAME, String.valueOf(clientRequest.url()));
-        logger.trace("Request: {} {}", clientRequest.method(), clientRequest.url());
-        logger.trace("HTTP request headers: {}", clientRequest.headers());
-        MDC.remove(SERVICE_NAME);
-        return Mono.just(clientRequest);
-    }
-}