Upgrade portal SDK to 2.4

Change-Id: Idc9f16d3ee5aa546a6d7154d9e2190d6b96f314e
Issue-ID: VID-299
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

10 files changed, 8 insertions, 24 deletions

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 c8a91626b..8aa0e892a 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/test/java/org/onap/vid/mso/MsoUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java
index 3356fddfc..9d625c4f7 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 38ccf6cfc..c8961a475 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 0e74c7d83..05191fc5e 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 566d17c11..1629081a6 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 7665d99a2..eab343ab0 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 e3f01ba00..8c8642e36 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 b8924d84b..13fc57f36 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 7feb37046..3f13c9dff 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 40f4c876f..2cd0d0cc6 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;