Merge Casablanca

[so.git] / bpmn / so-bpmn-tasks / src / main / java / org / onap / so / client / sniro / SniroClient.java

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/SniroClient.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/SniroClient.java
index cee94e2..7f09305 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/SniroClient.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sniro/SniroClient.java
@@ -23,9 +23,9 @@ package org.onap.so.client.sniro;
 import java.util.LinkedHashMap;
 
 import org.camunda.bpm.engine.delegate.BpmnError;
+import org.onap.so.bpmn.common.baseclient.BaseClient;
 import org.onap.so.bpmn.core.UrnPropertiesReader;
 import org.onap.so.client.exception.BadResponseException;
-import org.onap.so.client.sdnc.BaseClient;
 import org.onap.so.client.sniro.beans.ManagerProperties;
 import org.onap.so.client.sniro.beans.SniroConductorRequest;
 import org.onap.so.client.sniro.beans.SniroManagerRequest;
@@ -72,12 +72,12 @@ public class SniroClient {
                header.set("X-patchVersion", managerProperties.getHeaders().get("patchVersion"));
                header.set("X-minorVersion", managerProperties.getHeaders().get("minorVersion"));
                header.set("X-latestVersion", managerProperties.getHeaders().get("latestVersion"));
-               BaseClient<String, LinkedHashMap<?, ?>> baseClient = new BaseClient<>();
+               BaseClient<String, LinkedHashMap<String, Object>> baseClient = new BaseClient<>();
 
                baseClient.setTargetUrl(url);
                baseClient.setHttpHeader(header);
 
-               LinkedHashMap<?, ?> response = baseClient.post(homingRequest.toJsonString(), new ParameterizedTypeReference<LinkedHashMap<? ,?>>() {});
+               LinkedHashMap<String, Object> response = baseClient.post(homingRequest.toJsonString(), new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
                validator.validateDemandsResponse(response);
                log.trace("Completed Sniro Client Post Demands");
        }
@@ -102,12 +102,12 @@ public class SniroClient {
                HttpHeaders header = new HttpHeaders();
                header.setContentType(MediaType.APPLICATION_JSON);
                header.set("Authorization", UrnPropertiesReader.getVariable("sniro.conductor.headers.auth"));
-               BaseClient<String, LinkedHashMap<?, ?>> baseClient = new BaseClient<>();
+               BaseClient<String, LinkedHashMap<String, Object>> baseClient = new BaseClient<>();
 
                baseClient.setTargetUrl(url);
                baseClient.setHttpHeader(header);
 
-               LinkedHashMap<?, ?> response = baseClient.post(releaseRequest.toJsonString(), new ParameterizedTypeReference<LinkedHashMap<? ,?>>() {});
+               LinkedHashMap<String, Object> response = baseClient.post(releaseRequest.toJsonString(), new ParameterizedTypeReference<LinkedHashMap<String, Object>>() {});
                SniroValidator v = new SniroValidator();
                v.validateReleaseResponse(response);
                log.trace("Completed Sniro Client Post Release");