From 7059a9c8aa100b51cab7698b09d80ec5acee584e Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 5 Sep 2018 16:06:16 +0300 Subject: Upgrade portal SDK to 2.4 Change-Id: Idc9f16d3ee5aa546a6d7154d9e2190d6b96f314e Issue-ID: VID-299 Signed-off-by: Sonsino, Ofir (os0695) --- vid-app-common/pom.xml | 2 +- vid-app-common/src/main/java/org/onap/vid/utils/DaoUtils.java | 2 +- vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java | 5 +---- vid-app-common/src/test/java/org/onap/vid/mso/RestObjectTest.java | 4 +--- .../src/test/java/org/onap/vid/policy/PolicyRestInterfaceTest.java | 1 - vid-app-common/src/test/java/org/onap/vid/policy/PolicyUtilTest.java | 5 +---- vid-app-common/src/test/java/org/onap/vid/policy/RestObjectTest.java | 4 +--- .../src/test/java/org/onap/vid/scheduler/RestObjectTest.java | 4 +--- .../test/java/org/onap/vid/scheduler/RestObjects/RestObjectTest.java | 4 +--- .../org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java | 2 +- vid-app-common/src/test/java/org/onap/vid/utils/LoggingTest.java | 1 - 11 files changed, 9 insertions(+), 25 deletions(-) (limited to 'vid-app-common') 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 @@ UTF-8 UTF-8 UTF-8 - 2.1.0 + 2.4.0 4.2.9.RELEASE 4.3.11.Final 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/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; -- cgit 1.2.3-korg From 436646fcc88913246d75e03fe4be308545e0d13e Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Wed, 5 Sep 2018 18:26:30 +0300 Subject: Fix features.properties Change-Id: I18bc7ca0bbc270937884eb37d375678a0cd02252 Issue-ID: VID-305 Signed-off-by: Sonsino, Ofir (os0695) --- epsdk-app-onap/src/main/resources/vid-schema.sql | 13 +++++++++++++ .../src/main/webapp/WEB-INF/conf/features.properties | 15 +++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'vid-app-common') diff --git a/epsdk-app-onap/src/main/resources/vid-schema.sql b/epsdk-app-onap/src/main/resources/vid-schema.sql index 02de875b..3f15c88a 100755 --- a/epsdk-app-onap/src/main/resources/vid-schema.sql +++ b/epsdk-app-onap/src/main/resources/vid-schema.sql @@ -1378,7 +1378,20 @@ 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 -- ---------------------------------------------------------------------------- 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 -- cgit 1.2.3-korg