Resolving testConfigUpdateGoodPayload

[vid.git] / vid-app-common / src / main / java / org / onap / vid / mso / MsoUtil.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
index eae705a..562182a 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
@@ -2,14 +2,15 @@
  * ============LICENSE_START=======================================================
  * VID
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 - 2019 Nokia. 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.
@@ -22,105 +23,37 @@ package org.onap.vid.mso;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.glassfish.jersey.client.ClientResponse;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import io.joshworks.restclient.http.HttpResponse;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 
-import static org.onap.vid.utils.Logging.getMethodName;
-
-/**
- * The Class MsoUtil.
- */
 public class MsoUtil {
-       
-       /** The logger. */
-       private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoUtil.class);
-       
-       /** The Constant dateFormat. */
-       final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-       
-       /**
-        * Wrap response.
-        *
-        * @param body the body
-        * @param statusCode the status code
-        * @return the mso response wrapper
-        */
-       public static MsoResponseWrapper wrapResponse ( String body, int statusCode ) {
-               
-               MsoResponseWrapper w = new MsoResponseWrapper();
-               w.setStatus (statusCode);
-               w.setEntity(body);
-               
-               return w;
-       }
 
-       /**
-        * Wrap response.
-        *
-        * @param cres the cres
-        * @return the mso response wrapper
-        */
-       public static MsoResponseWrapper wrapResponse (ClientResponse cres) {   
-               String resp_str = "";
-               if ( cres != null ) {
-                       resp_str = cres.readEntity(String.class);
-               }
-               int statuscode = cres.getStatus();
-               MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, statuscode );
-               return (w);
-       }
-       
-       /**
-        * Wrap response.
-        *
-        * @param rs the rs
-        * @return the mso response wrapper
-        */
-       public static MsoResponseWrapper wrapResponse (RestObject<String> rs) {
-               String resp_str = null;
-               int status = 0;
-               if ( rs != null ) {
-                       resp_str = rs.get() != null ? rs.get() : rs.getRaw();
-                       status = rs.getStatusCode();
-               }
-               MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, status );
-               return (w);
-       }       
-       
-       /**
-        * Convert pojo to string.
-        *
-        * @param <T> the generic type
-        * @param t the t
-        * @return the string
-        * @throws JsonProcessingException the json processing exception
-        */
-       public static <T> String convertPojoToString ( T t ) {
-               
-               String methodName = "convertPojoToString";
-               ObjectMapper mapper = new ObjectMapper();
-               String r_json_str = "";
-           if ( t != null ) {
-                   try {
-                       r_json_str = mapper.writeValueAsString(t);
-                   }
-                   catch ( com.fasterxml.jackson.core.JsonProcessingException j ) {
-                       logger.debug(EELFLoggerDelegate.debugLogger,getMethodName() + " Unable to parse object of type " + t.getClass().getName() + " as json", j);
-                   }
-           }
-           return (r_json_str);
-       }
-       
-       /**
-        * The main method.
-        *
-        * @param args the arguments
-        */
-       public static void main(String[] args) {
-               // TODO Auto-generated method stub
+    final static ObjectMapper objectMapper = new ObjectMapper();
+
+    private MsoUtil() {
+    }
+
+    public static MsoResponseWrapper wrapResponse(RestObject<String> restObject) {
+        String response = restObject.get() != null ? restObject.get() : restObject.getRaw();
+        int status = restObject.getStatusCode();
+        return new MsoResponseWrapper(status, response);
+    }
 
-       }
+    public static <T> MsoResponseWrapper wrapResponse(HttpResponse<T> httpResponse)  {
+        MsoResponseWrapper msoResponseWrapper = new MsoResponseWrapper();
+        msoResponseWrapper.setStatus(httpResponse.getStatus());
+        if (httpResponse.getRawBody() != null) {
+            try {
+                T body = httpResponse.getBody();
+                String entityStr = body instanceof String ? (String) body : objectMapper.writeValueAsString(httpResponse.getBody());
+                msoResponseWrapper.setEntity(entityStr);
+            }
+            catch(JsonProcessingException e)
+            {
+                ExceptionUtils.rethrow(e);
+            }
+        }
+        return msoResponseWrapper;
+    }
 }