summaryrefslogtreecommitdiffstats
path: root/ONAP-PDP-REST
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-11-13 14:08:14 +0000
committerliamfallon <liam.fallon@est.tech>2019-11-13 22:16:10 +0000
commit2f3ca9fc5edc5a52659b3486605e0db508143318 (patch)
tree0511aa5f0d117fa78032f5b91b2024b57dba5913 /ONAP-PDP-REST
parent0c20d1c294fe146e1018f14b07a8d861c29fe527 (diff)
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 <liam.fallon@est.tech>
Diffstat (limited to 'ONAP-PDP-REST')
-rw-r--r--ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java2
-rw-r--r--ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java2
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl2
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml16
4 files changed, 11 insertions, 11 deletions
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 @@
<persistence-unit name="XACML-PAP-REST">
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -109,7 +109,7 @@
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -146,12 +146,12 @@
<class>org.onap.policy.rest.jpa.MicroServiceLocation</class>
<class>org.onap.policy.rest.jpa.Obadvice</class>
<class>org.onap.policy.rest.jpa.ObadviceExpression</class>
- <class>org.onap.policy.rest.jpa.PEPOptions</class>
- <class>org.onap.policy.rest.jpa.PIPConfigParam</class>
- <class>org.onap.policy.rest.jpa.PIPConfiguration</class>
- <class>org.onap.policy.rest.jpa.PIPResolver</class>
- <class>org.onap.policy.rest.jpa.PIPResolverParam</class>
- <class>org.onap.policy.rest.jpa.PIPType</class>
+ <class>org.onap.policy.rest.jpa.PepOptions</class>
+ <class>org.onap.policy.rest.jpa.PipConfigParam</class>
+ <class>org.onap.policy.rest.jpa.PipConfiguration</class>
+ <class>org.onap.policy.rest.jpa.PipResolver</class>
+ <class>org.onap.policy.rest.jpa.PipResolverParam</class>
+ <class>org.onap.policy.rest.jpa.PipType</class>
<class>org.onap.policy.rest.jpa.PolicyAlgorithms</class>
<class>org.onap.policy.rest.jpa.PolicyManagement</class>
<class>org.onap.policy.rest.jpa.PolicyScopeService</class>