From 2f3ca9fc5edc5a52659b3486605e0db508143318 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 13 Nov 2019 14:08:14 +0000 Subject: Unit/SONAR/Checkstyle in ONAP-REST Fourth batch of JPA pojos (N-P), with JUnit added and SONAR/Checkstyle issues addressed. In cases where a class name change caused an update in another package, the license header on files for those knock on changes are not updated. Issue-ID: POLICY-2131 Change-Id: I9319b514b5c19e6837c34566dde770673d16bca3 Signed-off-by: liamfallon --- .../pdp/rest/api/services/GetDictionaryService.java | 2 +- .../pdp/rest/api/test/GetDictionaryServiceTest.java | 2 +- ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl | 2 +- .../src/test/resources/META-INF/persistence.xml | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ONAP-PDP-REST') diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java index 44cc76478..1f0700f81 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java @@ -158,7 +158,7 @@ public class GetDictionaryService { case "VNFType": jsonString = jsonString.replace("vnfTypeDictionaryDatas", "DictionaryDatas"); break; - case "PEPOptions": + case "PepOptions": jsonString = jsonString.replace("pepOptionsDictionaryDatas", "DictionaryDatas"); break; case "Varbind": diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java index 4544b6b1c..1904b4bf0 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java @@ -76,7 +76,7 @@ public class GetDictionaryServiceTest { result = (String) formatDictionary.invoke(gds, input); assertNotNull(result); // - dp.setDictionary("PEPOptions"); + dp.setDictionary("PepOptions"); gds = new GetDictionaryService(dp, null); result = (String) formatDictionary.invoke(gds, input); assertNotNull(result); diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl index 062169345..d28a00dde 100644 --- a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl +++ b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS ConfigurationDataEntity DROP TABLE IF EXISTS PolicyEntity -DROP TABLE IF EXISTS PolicyDBDaoEntity +DROP TABLE IF EXISTS PolicyDbDaoEntity DROP TABLE IF EXISTS ActionBodyEntity DROP SEQUENCE IF EXISTS seqPolicy DROP SEQUENCE IF EXISTS seqConfig diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml index b4313271e..4362be902 100644 --- a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml +++ b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml @@ -22,7 +22,7 @@ org.onap.policy.rest.jpa.PolicyEntity org.onap.policy.rest.jpa.ConfigurationDataEntity - org.onap.policy.rest.jpa.PolicyDBDaoEntity + org.onap.policy.rest.jpa.PolicyDbDaoEntity org.onap.policy.rest.jpa.GroupEntity org.onap.policy.rest.jpa.PdpEntity org.onap.policy.rest.jpa.ActionBodyEntity @@ -109,7 +109,7 @@ org.eclipse.persistence.jpa.PersistenceProvider org.onap.policy.rest.jpa.PolicyEntity org.onap.policy.rest.jpa.ConfigurationDataEntity - org.onap.policy.rest.jpa.PolicyDBDaoEntity + org.onap.policy.rest.jpa.PolicyDbDaoEntity org.onap.policy.rest.jpa.GroupEntity org.onap.policy.rest.jpa.PdpEntity org.onap.policy.rest.jpa.ActionBodyEntity @@ -146,12 +146,12 @@ org.onap.policy.rest.jpa.MicroServiceLocation org.onap.policy.rest.jpa.Obadvice org.onap.policy.rest.jpa.ObadviceExpression - org.onap.policy.rest.jpa.PEPOptions - org.onap.policy.rest.jpa.PIPConfigParam - org.onap.policy.rest.jpa.PIPConfiguration - org.onap.policy.rest.jpa.PIPResolver - org.onap.policy.rest.jpa.PIPResolverParam - org.onap.policy.rest.jpa.PIPType + org.onap.policy.rest.jpa.PepOptions + org.onap.policy.rest.jpa.PipConfigParam + org.onap.policy.rest.jpa.PipConfiguration + org.onap.policy.rest.jpa.PipResolver + org.onap.policy.rest.jpa.PipResolverParam + org.onap.policy.rest.jpa.PipType org.onap.policy.rest.jpa.PolicyAlgorithms org.onap.policy.rest.jpa.PolicyManagement org.onap.policy.rest.jpa.PolicyScopeService -- cgit 1.2.3-korg