Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 9 insertions, 8 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 e5024518b..7ebecba57 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
@@ -25,9 +25,6 @@ import com.google.common.base.MoreObjects;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 
 import javax.ws.rs.core.Response;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import static org.onap.vid.utils.Logging.getMethodCallerName;
 
@@ -38,9 +35,7 @@ import static org.onap.vid.utils.Logging.getMethodCallerName;
  */
 public class RestObject<T> {
 
-    final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-
-    final static ObjectMapper objectMapper = new ObjectMapper();
+    static final ObjectMapper objectMapper = new ObjectMapper();
 
 	/**
 	 * Generic version of the RestObject class.
@@ -58,6 +53,12 @@ public class RestObject<T> {
     public RestObject() {
     }
 
+    public void copyFrom(RestObject<T> src) {
+        set(src.get());
+        setRaw(src.getRaw());
+        setStatusCode(src.getStatusCode());
+    }
+
     public RestObject(Response cres, Class<?> tClass, EELFLoggerDelegate logger) {
 
         String rawEntity = null;
@@ -70,10 +71,10 @@ public class RestObject<T> {
         catch ( Exception e ) {
             try {
                 this.setRaw(rawEntity);
-                logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + getMethodCallerName() + " Error reading response entity as " + tClass + ": , e="
+                logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " Error reading response entity as " + tClass + ": , e="
                         + e.getMessage() + ", Entity=" + rawEntity);
             } catch (Exception e2) {
-                logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + getMethodCallerName() + " No response entity, this is probably ok, e="
+                logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " No response entity, this is probably ok, e="
                         + e.getMessage());
             }
         }