Merge changes from topic 'portalsdk2.4'

* changes:
  Fix features.properties
  Upgrade portal SDK to 2.4

17 files changed, 83 insertions, 68 deletions

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 050c3c5a..025b63a0 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -17,7 +17,7 @@
 		<encoding>UTF-8</encoding>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<epsdk.version>2.1.0</epsdk.version>

+		<epsdk.version>2.4.0</epsdk.version>

 		<springframework.version>4.2.9.RELEASE</springframework.version>

 		<hibernate.version>4.3.11.Final</hibernate.version>

 		<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->

diff --git a/epsdk-app-onap/src/main/resources/vid-data.sql b/epsdk-app-onap/src/main/resources/vid-data.sql
index 150f8bc0..e2af216e 100755
--- a/epsdk-app-onap/src/main/resources/vid-data.sql
+++ b/epsdk-app-onap/src/main/resources/vid-data.sql
@@ -78,44 +78,44 @@ INSERT INTO `vid_category_parameter_option` (`CATEGORY_OPT_APP_ID`, `NAME`, `CAT
 --

 -- Dumping data for table `fn_function`

 --

-INSERT INTO `fn_function` VALUES ('1','test role function') ON DUPLICATE KEY UPDATE FUNCTION_NAME='test role function';

-INSERT INTO `fn_function` VALUES ('doclib','Document Library') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library';

-INSERT INTO `fn_function` VALUES ('doclib_admin','Document Library Admin') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Admin';

-INSERT INTO `fn_function` VALUES ('login','Login') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Login';

-INSERT INTO `fn_function` VALUES ('menu_admin','Admin Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Admin Menu';

-INSERT INTO `fn_function` VALUES ('menu_ajax','Ajax Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Ajax Menu';

-INSERT INTO `fn_function` VALUES ('menu_servicemodels','Browse SDC Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Browse SDC Service Instances';

-INSERT INTO `fn_function` VALUES ('menu_concept','CoNCEPT') ON DUPLICATE KEY UPDATE FUNCTION_NAME='CoNCEPT';

-INSERT INTO `fn_function` VALUES ('menu_customer','Customer Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Menu';

-INSERT INTO `fn_function` VALUES ('menu_customer_create','Customer Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Create';

-INSERT INTO `fn_function` VALUES ('menu_doclib','Document Library Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Menu';

-INSERT INTO `fn_function` VALUES ('menu_feedback','Feedback Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Feedback Menu';

-INSERT INTO `fn_function` VALUES ('menu_help','Help Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Help Menu';

-INSERT INTO `fn_function` VALUES ('menu_home','Home Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Home Menu';

-INSERT INTO `fn_function` VALUES ('menu_itracker','iTracker Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='iTracker Menu';

-INSERT INTO `fn_function` VALUES ('menu_itracker_admin','Itracker Admin/Support menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Itracker Admin/Support menu';

-INSERT INTO `fn_function` VALUES ('menu_job','Job Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Menu';

-INSERT INTO `fn_function` VALUES ('menu_job_create','Job Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Create';

-INSERT INTO `fn_function` VALUES ('menu_job_designer','Process in Designer view') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process in Designer view';

-INSERT INTO `fn_function` VALUES ('menu_logout','Logout Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Logout Menu';

-INSERT INTO `fn_function` VALUES ('menu_map','Map Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Map Menu';

-INSERT INTO `fn_function` VALUES ('menu_newserinstance','Create New Service Instance') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Create New Service Instance';

-INSERT INTO `fn_function` VALUES ('menu_notes','Notes Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Notes Menu';

-INSERT INTO `fn_function` VALUES ('menu_process','Process List') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process List';

-INSERT INTO `fn_function` VALUES ('menu_profile','Profile Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Menu';

-INSERT INTO `fn_function` VALUES ('menu_profile_create','Profile Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Create';

-INSERT INTO `fn_function` VALUES ('menu_profile_import','Profile Import') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Import';

-INSERT INTO `fn_function` VALUES ('menu_reports','Reports Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Reports Menu';

-INSERT INTO `fn_function` VALUES ('menu_sample','Sample Pages Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Pages Menu';

-INSERT INTO `fn_function` VALUES ('menu_tab','Sample Tab Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Tab Menu';

-INSERT INTO `fn_function` VALUES ('menu_task','Task Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Menu';

-INSERT INTO `fn_function` VALUES ('menu_task_search','Task Search') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Search';

-INSERT INTO `fn_function` VALUES ('menu_test','Test Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Menu';

-INSERT INTO `fn_function` VALUES ('menu_viewlog','Log Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Log Menu';

-INSERT INTO `fn_function` VALUES ('view_reports','View Raptor reports') ON DUPLICATE KEY UPDATE FUNCTION_NAME='View Raptor reports';

-INSERT INTO `fn_function` VALUES ('menu_searchexisting', 'Search for Existing Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Search for Existing Service Instances';

-INSERT INTO `fn_function` VALUES ('menu_changemanagement','VNF Changes') ON DUPLICATE KEY UPDATE FUNCTION_NAME='VNF Changes';

---INSERT INTO `fn_function` VALUES ('menu_testenvironment','Test Environments') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Environments';

+INSERT INTO `fn_function` VALUES ('1','test role function','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='test role function';

+INSERT INTO `fn_function` VALUES ('doclib','Document Library','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library';

+INSERT INTO `fn_function` VALUES ('doclib_admin','Document Library Admin','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Admin';

+INSERT INTO `fn_function` VALUES ('login','Login','url','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Login';

+INSERT INTO `fn_function` VALUES ('menu_admin','Admin Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Admin Menu';

+INSERT INTO `fn_function` VALUES ('menu_ajax','Ajax Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Ajax Menu';

+INSERT INTO `fn_function` VALUES ('menu_servicemodels','Browse SDC Service Instances','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Browse SDC Service Instances';

+INSERT INTO `fn_function` VALUES ('menu_concept','CoNCEPT','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='CoNCEPT';

+INSERT INTO `fn_function` VALUES ('menu_customer','Customer Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Menu';

+INSERT INTO `fn_function` VALUES ('menu_customer_create','Customer Create','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Create';

+INSERT INTO `fn_function` VALUES ('menu_doclib','Document Library Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Menu';

+INSERT INTO `fn_function` VALUES ('menu_feedback','Feedback Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Feedback Menu';

+INSERT INTO `fn_function` VALUES ('menu_help','Help Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Help Menu';

+INSERT INTO `fn_function` VALUES ('menu_home','Home Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Home Menu';

+INSERT INTO `fn_function` VALUES ('menu_itracker','iTracker Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='iTracker Menu';

+INSERT INTO `fn_function` VALUES ('menu_itracker_admin','Itracker Admin/Support menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Itracker Admin/Support menu';

+INSERT INTO `fn_function` VALUES ('menu_job','Job Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Menu';

+INSERT INTO `fn_function` VALUES ('menu_job_create','Job Create','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Create';

+INSERT INTO `fn_function` VALUES ('menu_job_designer','Process in Designer view','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process in Designer view';

+INSERT INTO `fn_function` VALUES ('menu_logout','Logout Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Logout Menu';

+INSERT INTO `fn_function` VALUES ('menu_map','Map Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Map Menu';

+INSERT INTO `fn_function` VALUES ('menu_newserinstance','Create New Service Instance','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Create New Service Instance';

+INSERT INTO `fn_function` VALUES ('menu_notes','Notes Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Notes Menu';

+INSERT INTO `fn_function` VALUES ('menu_process','Process List','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process List';

+INSERT INTO `fn_function` VALUES ('menu_profile','Profile Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Menu';

+INSERT INTO `fn_function` VALUES ('menu_profile_create','Profile Create','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Create';

+INSERT INTO `fn_function` VALUES ('menu_profile_import','Profile Import','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Import';

+INSERT INTO `fn_function` VALUES ('menu_reports','Reports Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Reports Menu';

+INSERT INTO `fn_function` VALUES ('menu_sample','Sample Pages Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Pages Menu';

+INSERT INTO `fn_function` VALUES ('menu_tab','Sample Tab Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Tab Menu';

+INSERT INTO `fn_function` VALUES ('menu_task','Task Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Menu';

+INSERT INTO `fn_function` VALUES ('menu_task_search','Task Search','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Search';

+INSERT INTO `fn_function` VALUES ('menu_test','Test Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Menu';

+INSERT INTO `fn_function` VALUES ('menu_viewlog','Log Menu','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Log Menu';

+INSERT INTO `fn_function` VALUES ('view_reports','View Raptor reports','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='View Raptor reports';

+INSERT INTO `fn_function` VALUES ('menu_searchexisting', 'Search for Existing Service Instances','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Search for Existing Service Instances';

+INSERT INTO `fn_function` VALUES ('menu_changemanagement','VNF Changes','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='VNF Changes';

+--INSERT INTO `fn_function` VALUES ('menu_testenvironment','Test Environments','menu','*') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Environments';

 

 --

 -- Dumping data for table `fn_lu_activity`

diff --git a/epsdk-app-onap/src/main/resources/vid-schema.sql b/epsdk-app-onap/src/main/resources/vid-schema.sql
index efd4d05f..3f15c88a 100755
--- a/epsdk-app-onap/src/main/resources/vid-schema.sql
+++ b/epsdk-app-onap/src/main/resources/vid-schema.sql
@@ -561,7 +561,10 @@ DEFAULT CHARACTER SET = utf8;
 CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_function` (

   `FUNCTION_CD` VARCHAR(30) NOT NULL,

   `FUNCTION_NAME` VARCHAR(50) NOT NULL,

-  PRIMARY KEY (`FUNCTION_CD`))

+  `type` VARCHAR(20) NOT NULL,

+  `action` VARCHAR(20) NOT NULL,

+  PRIMARY KEY (`FUNCTION_CD`),

+  CONSTRAINT `function` UNIQUE (FUNCTION_CD,TYPE,ACTION))

 ENGINE = InnoDB

 DEFAULT CHARACTER SET = utf8;

 

@@ -1375,10 +1378,22 @@ CREATE TABLE IF NOT EXISTS `vid_category_parameter_option` (
   CONSTRAINT `FK_OWNING_ENTITY_OPTIONS_TO_OE` FOREIGN KEY (`CATEGORY_ID`) REFERENCES `vid_openecomp_epsdk`.`vid_category_parameter` (`CATEGORY_ID`)

 ) COLLATE='utf8_bin' ENGINE=InnoDB AUTO_INCREMENT=25;

 

+CREATE TABLE IF NOT EXISTS `vid_job` (

+  `JOB_ID`        BINARY(16)   NOT NULL PRIMARY KEY,

+  `CREATED_DATE`  TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,

+  `MODIFIED_DATE` TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,

+  `JOB_STATUS`    VARCHAR(50)  NULL COLLATE 'utf8_bin',

+  `JOB_TYPE`      VARCHAR(50)  NULL COLLATE 'utf8_bin',

+  `JOB_DATA`      MEDIUMTEXT   NULL COLLATE 'utf8_bin',

+  `PARENT_JOB_ID` BINARY(16)   NULL,

+  `TAKEN_BY`      VARCHAR(100) NULL COLLATE 'utf8_bin',

+  CONSTRAINT `FK_OWNING_VID_JOB_PARENT` FOREIGN KEY (`PARENT_JOB_ID`) REFERENCES `vid_openecomp_epsdk`.`vid_job` (`JOB_ID`)

+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

 

+ALTER TABLE `vid_job`

+  ADD COLUMN if NOT EXISTS `TAKEN_BY` VARCHAR (100) COLLATE 'utf8_bin';

 -- ----------------------------------------------------------------------------

 -- View vid_openecomp_epsdk.v_url_access

 -- ----------------------------------------------------------------------------

 CREATE OR REPLACE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_url_access` AS select distinct `m`.`ACTION` AS `URL`,`m`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_menu` `m` where (`m`.`ACTION` is not null) union select distinct `t`.`ACTION` AS `URL`,`t`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_tab` `t` where (`t`.`ACTION` is not null) union select `r`.`RESTRICTED_URL` AS `URL`,`r`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_restricted_url` `r`;

-SET FOREIGN_KEY_CHECKS = 1;

-

+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
index f9fdc431..1408313b 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -116,7 +116,7 @@
     -->

     <definition name="collaboration" template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"/>

     <definition name="user_profile_list" template="/app/fusion/scripts/view-models/admin-page/profile.html"/>

-    <definition name="admin" template="/app/fusion/scripts/view-models/admin-page/admin.html"/>

+    <definition name="admin" template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />

     <definition name="workflows" template="/app/fusion/scripts/view-models/workflows/workflow-landing.html"/>

     

         <definition extends="ebz_template" name="report_wizard">   

diff --git a/pom.xml b/pom.xml
index f16ca605..e34fc4d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
 			<id>docker</id>

 			<modules>

 				<module>vid-app-common</module>

+				<module>vid-webpack-master</module>

 				<module>epsdk-app-onap</module>

 				<module>deliveries</module>

 			</modules>

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 57d3de1f..f97a8a29 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -18,7 +18,7 @@
 		<encoding>UTF-8</encoding>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<epsdk.version>2.1.0</epsdk.version>

+		<epsdk.version>2.4.0</epsdk.version>

 		<springframework.version>4.2.9.RELEASE</springframework.version>

 		<hibernate.version>4.3.11.Final</hibernate.version>

 		<!-- Skip assembling the zip by default -->

diff --git a/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java b/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java
index c8a91626..8aa0e892 100644
--- a/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java
+++ b/vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java
@@ -4,7 +4,7 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.onap.vid.exceptions.GenericUncheckedException;
-import org.onap.portalsdk.core.FusionObject;
+import org.onap.portalsdk.core.domain.FusionObject;
 
 import java.util.HashMap;
 import java.util.function.Function;
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
index de466bea..0588ac16 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
@@ -9,3 +9,18 @@
 #    -  featureFlags.filename = ci.features.properties
 #    -  featureFlags.filename = ist.features.properties
 #    -  featureFlags.filename = e2e.features.properties
+
+FLAG_ASYNC_INSTANTIATION = true
+FLAG_ASYNC_JOBS = false
+FLAG_REGION_ID_FROM_REMOTE = true
+CREATE_INSTANCE_TEST = false
+EMPTY_DRAWING_BOARD_TEST = false
+FLAG_ADVANCED_PORTS_FILTER = true
+FLAG_ADD_MSO_TESTAPI_FIELD = true
+FLAG_UNASSIGN_SERVICE = true
+FLAG_COLLECTION_RESOURCE_SUPPORT = true
+FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true
+FLAG_SERVICE_MODEL_CACHE = true
+FLAG_SHOW_ASSIGNMENTS = true
+FLAG_SHOW_VERIFY_SERVICE=false
+FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
index 3356fddf..9d625c4f 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.mso;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.glassfish.jersey.client.ClientResponse;
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,12 +33,10 @@ public class MsoUtilTest {
 
 	@Test
 	public void testConvertPojoToString() throws Exception {
-		T t = null;
 		String result;
 
 		// test 1
-		t = null;
-		result = MsoUtil.convertPojoToString(t);
+		result = MsoUtil.convertPojoToString(null);
 		Assert.assertEquals("", result);
 	}
 
diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
index 38ccf6cf..c8961a47 100644
--- a/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.mso;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.junit.Test;
 
 public class RestObjectTest {
@@ -12,11 +11,10 @@ public class RestObjectTest {
     @Test
     public void testSet() throws Exception {
         RestObject testSubject;
-        T t = null;
 
         // default test
         testSubject = createTestSubject();
-        testSubject.set(t);
+        testSubject.set(null);
     }
 
     @Test
diff --git a/vid-app-common/src/test/java/org/onap/vid/policy/PolicyRestInterfaceTest.java b/vid-app-common/src/test/java/org/onap/vid/policy/PolicyRestInterfaceTest.java
index 0e74c7d8..05191fc5 100644
--- a/vid-app-common/src/test/java/org/onap/vid/policy/PolicyRestInterfaceTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/policy/PolicyRestInterfaceTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.policy;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.json.simple.JSONObject;
 import org.junit.Test;
 import org.onap.vid.policy.rest.RequestDetails;
diff --git a/vid-app-common/src/test/java/org/onap/vid/policy/PolicyUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/policy/PolicyUtilTest.java
index 566d17c1..1629081a 100644
--- a/vid-app-common/src/test/java/org/onap/vid/policy/PolicyUtilTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/policy/PolicyUtilTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.policy;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.glassfish.jersey.client.ClientResponse;
 import org.junit.Assert;
 import org.junit.Test;
@@ -35,12 +34,10 @@ public class PolicyUtilTest {
 
 	@Test
 	public void testConvertPojoToString() throws Exception {
-		T t = null;
 		String result;
 
 		// test 1
-		t = null;
-		result = PolicyUtil.convertPojoToString(t);
+		result = PolicyUtil.convertPojoToString(null);
 		Assert.assertEquals("", result);
 	}
 
diff --git a/vid-app-common/src/test/java/org/onap/vid/policy/RestObjectTest.java b/vid-app-common/src/test/java/org/onap/vid/policy/RestObjectTest.java
index 7665d99a..eab343ab 100644
--- a/vid-app-common/src/test/java/org/onap/vid/policy/RestObjectTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/policy/RestObjectTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.policy;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.junit.Test;
 
 public class RestObjectTest {
@@ -12,11 +11,10 @@ public class RestObjectTest {
 	@Test
 	public void testSet() throws Exception {
 		RestObject testSubject;
-		T t = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.set(t);
+		testSubject.set(null);
 	}
 
 	@Test
diff --git a/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjectTest.java b/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjectTest.java
index e3f01ba0..8c8642e3 100644
--- a/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjectTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjectTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.scheduler;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.junit.Test;
 
 public class RestObjectTest {
@@ -12,11 +11,10 @@ public class RestObjectTest {
     @Test
     public void testSet() throws Exception {
         RestObject testSubject;
-        T t = null;
 
         // default test
         testSubject = createTestSubject();
-        testSubject.set(t);
+        testSubject.set(null);
     }
 
     @Test
diff --git a/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjects/RestObjectTest.java b/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjects/RestObjectTest.java
index b8924d84..13fc57f3 100644
--- a/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjects/RestObjectTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/scheduler/RestObjects/RestObjectTest.java
@@ -1,6 +1,5 @@
 package org.onap.vid.scheduler.RestObjects;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.junit.Test;
 
 
@@ -14,11 +13,10 @@ public class RestObjectTest {
 	@Test
 	public void testSet() throws Exception {
 		RestObject testSubject;
-		T t = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.set(t);
+		testSubject.set(null);
 	}
 
 
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java
index 7feb3704..3f13c9df 100644
--- a/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java
@@ -35,7 +35,7 @@ import org.onap.vid.config.DataSourceConfig;
 import org.onap.vid.config.MockedAaiClientAndFeatureManagerConfig;
 import org.onap.vid.mso.MsoOperationalEnvironmentTest;
 import org.onap.vid.services.AsyncInstantiationBaseTest;
-import org.onap.portalsdk.core.FusionObject;
+import org.onap.portalsdk.core.domain.FusionObject;
 import org.onap.portalsdk.core.service.DataAccessService;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/vid-app-common/src/test/java/org/onap/vid/utils/LoggingTest.java b/vid-app-common/src/test/java/org/onap/vid/utils/LoggingTest.java
index 40f4c876..2cd0d0cc 100644
--- a/vid-app-common/src/test/java/org/onap/vid/utils/LoggingTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/utils/LoggingTest.java
@@ -2,7 +2,6 @@ package org.onap.vid.utils;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.poi.hssf.record.formula.functions.T;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;