From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: 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>
---
 .../java/org/onap/vid/mso/rest/RestInterface.java  | 25 ++++++++--------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/mso/rest/RestInterface.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RestInterface.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RestInterface.java
index feb3f3c1e..ec117cf04 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RestInterface.java
@@ -1,30 +1,25 @@
 package org.onap.vid.mso.rest;
 
+import org.onap.vid.changeManagement.RequestDetailsWrapper;
 import org.onap.vid.mso.RestObject;
-
-import javax.ws.rs.core.MultivaluedHashMap;
+import org.onap.vid.mso.RestObjectWithRequestInfo;
 
 /**
  * Created by pickjonathan on 26/06/2017.
  */
 public interface RestInterface {
 
-    /**
-     * Inits the rest client.
-     */
-    MultivaluedHashMap<String, Object> initMsoClient();
-
     /**
      * Gets the.
      *
      * @param <T> the generic type
      * @param t the t
-     * @param sourceId the source id
      * @param path the path
      * @param restObject the rest object
+     * @param warpException
      * @throws Exception the exception
      */
-    <T> void Get (T t, String sourceId, String path, RestObject<T> restObject );
+    <T> RestObjectWithRequestInfo<T> Get(T t, String path, RestObject<T> restObject, boolean warpException);
 
     /**
      * Delete.
@@ -32,25 +27,22 @@ public interface RestInterface {
      * @param <T> the generic type
      * @param t the t
      * @param r the r
-     * @param sourceID the source ID
      * @param path the path
      * @param restObject the rest object
      * @throws Exception the exception
      */
-    <T> void Delete(T t, Object r, String sourceID, String path, RestObject<T> restObject);
+    <T> void Delete(T t, Object r, String path, RestObject<T> restObject);
 
     /**
      * Post.
      *
-     * @param <T> the generic type
      * @param t the t
      * @param r the r
-     * @param sourceID the source ID
      * @param path the path
      * @param restObject the rest object
      * @throws Exception the exception
      */
-    <T> void Post(T t, Object r, String sourceID, String path, RestObject<T> restObject);
+    void Post(String t, Object r, String path, RestObject<String> restObject);
 
     /**
      * Put.
@@ -58,11 +50,12 @@ public interface RestInterface {
      * @param <T> the generic type
      * @param t the t
      * @param r the r
-     * @param sourceID the source ID
      * @param path the path
      * @param restObject the rest object
      * @throws Exception the exception
      */
-    <T> void Put(T t, org.onap.vid.changeManagement.RequestDetailsWrapper r, String sourceID, String path, RestObject<T> restObject);
+    <T> void Put(T t, RequestDetailsWrapper r, String path, RestObject<T> restObject);
+
+    <T> RestObject<T> GetForObject(String path, Class<T> clazz);
 
 }
-- 
cgit 1.2.3-korg