Replaced all tabs with spaces in java and pom.xml

[so.git] / bpmn / so-bpmn-tasks / src / main / java / org / onap / so / client / sdnc / SDNCClient.java

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
index 9e60196..732bba8 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/SDNCClient.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -21,14 +23,14 @@
 package org.onap.so.client.sdnc;
 
 import java.util.LinkedHashMap;
-
 import javax.ws.rs.core.UriBuilder;
-
+import org.onap.so.bpmn.common.baseclient.BaseClient;
 import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.beans.SDNCProperties;
 import org.onap.so.client.sdnc.endpoint.SDNCTopology;
-import org.onap.so.logger.MsoLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
@@ -37,58 +39,63 @@ import org.springframework.stereotype.Component;
 @Component
 public class SDNCClient {
 
-       private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, SDNCClient.class);
-       private BaseClient<String, LinkedHashMap<?, ?>> STOClient = new BaseClient<>();
+    private static final Logger logger = LoggerFactory.getLogger(SDNCClient.class);
+
+    @Autowired
+    private SDNCProperties properties;
+    @Autowired
+    private SdnCommonTasks sdnCommonTasks;
+
+    /**
+     * 
+     * @param request - takes in a generated object from sdnc client - creates a json request string and sends it to
+     *        sdnc - receives and validates the linkedhashmap sent back from sdnc
+     * @throws MapperException
+     * @throws BadResponseException
+     */
+    public String post(Object request, SDNCTopology topology) throws MapperException, BadResponseException {
+        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
+        String targetUrl = properties.getHost() + properties.getPath() + ":" + topology.toString() + "/";
+        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
+
+        STOClient.setTargetUrl(targetUrl);
+        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth());
+        STOClient.setHttpHeader(httpHeader);
+        LinkedHashMap<String, Object> output =
+                STOClient.post(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
+        return sdnCommonTasks.validateSDNResponse(output);
+    }
 
-       @Autowired
-       private SDNCProperties properties;
-       @Autowired
-       private SdnCommonTasks sdnCommonTasks;
-       /**
-        * 
-        * @param request
-        *            - takes in a generated object from sdnc client
-        *            - creates a json request string and sends it to sdnc
-        *            - receives and validates the linkedhashmap sent back from sdnc
-        * @throws MapperException 
-        * @throws BadResponseException 
-        */
-       public String post(Object request, SDNCTopology topology) throws MapperException, BadResponseException {
-                       String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-                       String targetUrl = properties.getHost() + properties.getPath() + ":" + topology.toString() + "/";
-                       STOClient.setTargetUrl(targetUrl);
-                       HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth());
-                       STOClient.setHttpHeader(httpHeader);
-                       msoLogger.info("Running SDNC CLIENT for TargetUrl: " + targetUrl);
-                       LinkedHashMap<?, ?> output = STOClient.post(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<? ,?>>() {});
-                       msoLogger.info("Validating output...");
-                       return sdnCommonTasks.validateSDNResponse(output);
-       }
 
+    public String post(Object request, String url) throws MapperException, BadResponseException {
+        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
+        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
+        STOClient.setTargetUrl(url);
+        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth());
+        STOClient.setHttpHeader(httpHeader);
+        LinkedHashMap<String, Object> output =
+                STOClient.post(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
+        return sdnCommonTasks.validateSDNResponse(output);
+    }
 
-       /**
-        * 
-        * @param queryLink
-        *            - takes in a link to topology that needs to be queried
-        *            - creates a json request string and sends it to sdnc
-        *            - receives and validates the linkedhashmap sent back from sdnc
-        *               * 
-        * @throws MapperException 
-        * @throws BadResponseException 
-        */
-       public String get(String queryLink) throws MapperException, BadResponseException {
-                       
-                       String request = "";
-                       String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
-                       String targetUrl = UriBuilder.fromUri(properties.getHost()).path(queryLink).build().toString();                 
-                       STOClient.setTargetUrl(targetUrl);
-                       msoLogger.info("TargetUrl: " + targetUrl);
-                       HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth());
-                       STOClient.setHttpHeader(httpHeader);
-                       msoLogger.info("Running SDNC CLIENT...");
-                       LinkedHashMap<?, ?> output = STOClient.get(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<? ,?>>() {});
-                       msoLogger.info("Validating output...");
-                       return sdnCommonTasks.validateSDNGetResponse(output);
-       }
+    /**
+     * 
+     * @param queryLink - takes in a link to topology that needs to be queried - creates a json request string and sends
+     *        it to sdnc - receives and validates the linkedhashmap sent back from sdnc *
+     * @throws MapperException
+     * @throws BadResponseException
+     */
+    public String get(String queryLink) throws MapperException, BadResponseException {
+        String request = "";
+        String jsonRequest = sdnCommonTasks.buildJsonRequest(request);
+        String targetUrl = UriBuilder.fromUri(properties.getHost()).path(queryLink).build().toString();
+        BaseClient<String, LinkedHashMap<String, Object>> STOClient = new BaseClient<>();
+        STOClient.setTargetUrl(targetUrl);
+        HttpHeaders httpHeader = sdnCommonTasks.getHttpHeaders(properties.getAuth());
+        STOClient.setHttpHeader(httpHeader);
+        LinkedHashMap<String, Object> output =
+                STOClient.get(jsonRequest, new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
+        return sdnCommonTasks.validateSDNGetResponse(output);
+    }
 
 }