Merge "Fix checkstyle issues in apex model basic"

4 files changed, 24 insertions, 24 deletions

diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyCreateModelFiles.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyCreateModelFiles.java
index 8113436ca..384ad5114 100644
--- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyCreateModelFiles.java
+++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyCreateModelFiles.java
@@ -30,8 +30,8 @@ public class TestApexSamplePolicyCreateModelFiles {
         final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JAVA");
         final TestApexModel<AxPolicyModel> testApexPolicyModel =
                 new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
-        testApexPolicyModel.testApexModelWriteReadXML();
-        testApexPolicyModel.testApexModelWriteReadJSON();
+        testApexPolicyModel.testApexModelWriteReadXml();
+        testApexPolicyModel.testApexModelWriteReadJson();
     }
 
     @Test
@@ -40,8 +40,8 @@ public class TestApexSamplePolicyCreateModelFiles {
                 new TestApexSamplePolicyModelCreator("JAVASCRIPT");
         final TestApexModel<AxPolicyModel> testApexPolicyModel =
                 new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
-        testApexPolicyModel.testApexModelWriteReadXML();
-        testApexPolicyModel.testApexModelWriteReadJSON();
+        testApexPolicyModel.testApexModelWriteReadXml();
+        testApexPolicyModel.testApexModelWriteReadJson();
     }
 
     @Test
@@ -49,8 +49,8 @@ public class TestApexSamplePolicyCreateModelFiles {
         final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JRUBY");
         final TestApexModel<AxPolicyModel> testApexPolicyModel =
                 new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
-        testApexPolicyModel.testApexModelWriteReadXML();
-        testApexPolicyModel.testApexModelWriteReadJSON();
+        testApexPolicyModel.testApexModelWriteReadXml();
+        testApexPolicyModel.testApexModelWriteReadJson();
     }
 
     @Test
@@ -58,8 +58,8 @@ public class TestApexSamplePolicyCreateModelFiles {
         final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("JYTHON");
         final TestApexModel<AxPolicyModel> testApexPolicyModel =
                 new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
-        testApexPolicyModel.testApexModelWriteReadXML();
-        testApexPolicyModel.testApexModelWriteReadJSON();
+        testApexPolicyModel.testApexModelWriteReadXml();
+        testApexPolicyModel.testApexModelWriteReadJson();
     }
 
     @Test
@@ -67,7 +67,7 @@ public class TestApexSamplePolicyCreateModelFiles {
         final TestApexSamplePolicyModelCreator apexPolicyModelCreator = new TestApexSamplePolicyModelCreator("MVEL");
         final TestApexModel<AxPolicyModel> testApexPolicyModel =
                 new TestApexModel<AxPolicyModel>(AxPolicyModel.class, apexPolicyModelCreator);
-        testApexPolicyModel.testApexModelWriteReadXML();
-        testApexPolicyModel.testApexModelWriteReadJSON();
+        testApexPolicyModel.testApexModelWriteReadXml();
+        testApexPolicyModel.testApexModelWriteReadJson();
     }
 }
diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyDBWrite.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyDBWrite.java
index 48e2f8058..45314672e 100644
--- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyDBWrite.java
+++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyDBWrite.java
@@ -26,7 +26,7 @@ import java.sql.DriverManager;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.dao.DAOParameters;
+import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
@@ -50,10 +50,10 @@ public class TestApexSamplePolicyDBWrite {
 
     @Test
     public void testModelWriteReadJPA() throws Exception {
-        final DAOParameters daoParameters = new DAOParameters();
-        daoParameters.setPluginClass(DefaultApexDao.class.getCanonicalName());
-        daoParameters.setPersistenceUnit("SampleModelTest");
+        final DaoParameters DaoParameters = new DaoParameters();
+        DaoParameters.setPluginClass(DefaultApexDao.class.getCanonicalName());
+        DaoParameters.setPersistenceUnit("SampleModelTest");
 
-        testApexModel.testApexModelWriteReadJPA(daoParameters);
+        testApexModel.testApexModelWriteReadJpa(DaoParameters);
     }
 }
diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyModel.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyModel.java
index 3673dae2f..36810b44b 100644
--- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyModel.java
+++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/plugins/executor/test/script/handling/TestApexSamplePolicyModel.java
@@ -29,7 +29,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.basicmodel.dao.DAOParameters;
+import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
@@ -60,21 +60,21 @@ public class TestApexSamplePolicyModel {
 
     @Test
     public void testModelWriteReadXML() throws Exception {
-        testApexModel.testApexModelWriteReadXML();
+        testApexModel.testApexModelWriteReadXml();
     }
 
     @Test
     public void testModelWriteReadJSON() throws Exception {
-        testApexModel.testApexModelWriteReadJSON();
+        testApexModel.testApexModelWriteReadJson();
     }
 
     @Test
     public void testModelWriteReadJPA() throws Exception {
-        final DAOParameters daoParameters = new DAOParameters();
-        daoParameters.setPluginClass(DefaultApexDao.class.getCanonicalName());
-        daoParameters.setPersistenceUnit("SampleModelTest");
+        final DaoParameters DaoParameters = new DaoParameters();
+        DaoParameters.setPluginClass(DefaultApexDao.class.getCanonicalName());
+        DaoParameters.setPersistenceUnit("SampleModelTest");
 
-        testApexModel.testApexModelWriteReadJPA(daoParameters);
+        testApexModel.testApexModelWriteReadJpa(DaoParameters);
     }
 
     
diff --git a/testsuites/integration/integration-executor-test/src/test/resources/META-INF/persistence.xml b/testsuites/integration/integration-executor-test/src/test/resources/META-INF/persistence.xml
index 5ba5bfa4c..40773a4d4 100644
--- a/testsuites/integration/integration-executor-test/src/test/resources/META-INF/persistence.xml
+++ b/testsuites/integration/integration-executor-test/src/test/resources/META-INF/persistence.xml
@@ -23,8 +23,8 @@
     <persistence-unit name="SampleModelTest" transaction-type="RESOURCE_LOCAL">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
 
-        <class>org.onap.policy.apex.model.basicmodel.dao.converters.CDATAConditioner</class>
-        <class>org.onap.policy.apex.model.basicmodel.dao.converters.UUID2String</class>
+        <class>org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner</class>
+        <class>org.onap.policy.apex.model.basicmodel.dao.converters.Uuid2String</class>
         <class>org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey</class>
         <class>org.onap.policy.apex.model.basicmodel.concepts.AxConcept</class>
         <class>org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo</class>