Merge "Fix checkstyle issues in apex model basic"

3 files changed, 12 insertions, 12 deletions

diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
index d33621e47..4a27bcfa7 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.context.test.entities.ReferenceKeyTestEntity;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.dao.DAOParameters;
+import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 
 /**
  * Junit tests for class EclipselinkApexDao
@@ -51,16 +51,16 @@ public class EclipselinkApexDaoTest {
     private static final List<AxArtifactKey> TEST_ARTIKEYS = Arrays.asList(new AxArtifactKey[] {
             new AxArtifactKey("ABC", "0.0.1"), new AxArtifactKey("DEF", "0.1.1"), new AxArtifactKey("XYZ", "1.1.1")});
 
-    private final DAOParameters daoParameters = new DAOParameters();
+    private final DaoParameters DaoParameters = new DaoParameters();
 
     private EclipselinkApexDao eclipselinkApexDao = null;
 
     @Before
     public void setup() throws ApexException {
-        daoParameters.setPluginClass(EclipselinkApexDao.class.getCanonicalName());
-        daoParameters.setPersistenceUnit("DAOTest");
+        DaoParameters.setPluginClass(EclipselinkApexDao.class.getCanonicalName());
+        DaoParameters.setPersistenceUnit("DAOTest");
         eclipselinkApexDao = new EclipselinkApexDao();
-        eclipselinkApexDao.init(daoParameters);
+        eclipselinkApexDao.init(DaoParameters);
     }
 
     @After
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
index 2d60e3751..087535d6b 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDao.java
@@ -239,7 +239,7 @@ public class HibernateApexDao extends DefaultApexDao {
         }
         if (ret.size() > 1) {
             throw new IllegalArgumentException("More than one result was returned for search for " + aClass
-                    + " with key " + key.getID() + ": " + ret);
+                    + " with key " + key.getId() + ": " + ret);
         }
         return ret.get(0);
     }
@@ -269,7 +269,7 @@ public class HibernateApexDao extends DefaultApexDao {
         }
         if (ret.size() > 1) {
             throw new IllegalArgumentException("More than one result was returned for search for " + aClass
-                    + " with key " + key.getID() + ": " + ret);
+                    + " with key " + key.getId() + ": " + ret);
         }
         return ret.get(0);
     }
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDaoTest.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDaoTest.java
index 851332b7b..1f100fde8 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDaoTest.java
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/hibernate/HibernateApexDaoTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.context.test.entities.ReferenceKeyTestEntity;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.dao.DAOParameters;
+import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 
 /**
  * Junit test for class HibernateApexDao
@@ -51,16 +51,16 @@ public class HibernateApexDaoTest {
     private static final List<AxArtifactKey> TEST_ARTIKEYS = Arrays.asList(new AxArtifactKey[] {
             new AxArtifactKey("ABC", "0.0.1"), new AxArtifactKey("DEF", "0.1.1"), new AxArtifactKey("XYZ", "1.1.1")});
 
-    private final DAOParameters daoParameters = new DAOParameters();
+    private final DaoParameters DaoParameters = new DaoParameters();
 
     private HibernateApexDao hibernateApexDao = null;
 
     @Before
     public void setupDAO() throws ApexException {
-        daoParameters.setPluginClass(HibernateApexDao.class.getCanonicalName());
-        daoParameters.setPersistenceUnit("DAOTest");
+        DaoParameters.setPluginClass(HibernateApexDao.class.getCanonicalName());
+        DaoParameters.setPersistenceUnit("DAOTest");
         hibernateApexDao = new HibernateApexDao();
-        hibernateApexDao.init(daoParameters);
+        hibernateApexDao.init(DaoParameters);
     }
 
     @After