1 files changed, 24 insertions, 77 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java b/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java
index 7ebecba57..cf3941478 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java
@@ -3,13 +3,14 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -20,97 +21,37 @@
 
 package org.onap.vid.mso;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.MoreObjects;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-import javax.ws.rs.core.Response;
-
-import static org.onap.vid.utils.Logging.getMethodCallerName;
 
-/**
- * The Class RestObject.
- *
- * @param <T> the generic type
- */
 public class RestObject<T> {
 
-    static final ObjectMapper objectMapper = new ObjectMapper();
-
-	/**
-	 * Generic version of the RestObject class.
-	 *
-	 */
-    // T stands for "Type"
     private T t;
-    
-    // The string source of t, if available
+
+    /**
+     * The string source of t, if available
+     */
     private String rawT;
 
-    /** The status code. */
-    private int statusCode= 0;
+    private int statusCode = 0;
 
     public RestObject() {
     }
 
-    public void copyFrom(RestObject<T> src) {
-        set(src.get());
-        setRaw(src.getRaw());
-        setStatusCode(src.getStatusCode());
+    public void set(T t) {
+        this.t = t;
     }
 
-    public RestObject(Response cres, Class<?> tClass, EELFLoggerDelegate logger) {
-
-        String rawEntity = null;
-        try {
-            cres.bufferEntity();
-            rawEntity = cres.readEntity(String.class);
-            T t = (T) objectMapper.readValue(rawEntity, tClass);
-            this.set(t);
-        }
-        catch ( Exception e ) {
-            try {
-                this.setRaw(rawEntity);
-                logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " Error reading response entity as " + tClass + ": , e="
-                        + e.getMessage() + ", Entity=" + rawEntity);
-            } catch (Exception e2) {
-                logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " No response entity, this is probably ok, e="
-                        + e.getMessage());
-            }
-        }
-
-        int status = cres.getStatus();
-        this.setStatusCode (status);
+    public T get() {
+        return t;
     }
 
+    public void setStatusCode(int v) {
+        this.statusCode = v;
+    }
 
-    /**
-     * Sets the.
-     *
-     * @param t the t
-     */
-    public void set(T t) { this.t = t; }
-    
-    /**
-     * Gets the.
-     *
-     * @return the t
-     */
-    public T get() { return t; }
-	
-    /**
-     * Sets the status code.
-     *
-     * @param v the new status code
-     */
-    public void setStatusCode(int v) { this.statusCode = v; }
-    
-    /**
-     * Gets the status code.
-     *
-     * @return the status code
-     */
-    public int getStatusCode() { return this.statusCode; }
+    public int getStatusCode() {
+        return this.statusCode;
+    }
 
     public String getRaw() {
         return rawT;
@@ -120,6 +61,12 @@ public class RestObject<T> {
         this.rawT = rawT;
     }
 
+    public void copyFrom(RestObject<T> src) {
+        set(src.get());
+        setRaw(src.getRaw());
+        setStatusCode(src.getStatusCode());
+    }
+
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)