Modify ONAP PAP REST classes basic checkstyle
[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / xacml / rest / jpa / PolicyEntityTest.java
index 8b4c73a..e7de8d0 100644 (file)
@@ -45,18 +45,18 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import java.util.Properties;
 
 public class PolicyEntityTest {
-       
-       private static Logger logger = FlexLogger.getLogger(PolicyEntityTest.class);
-       
+
+    private static Logger logger = FlexLogger.getLogger(PolicyEntityTest.class);
+
     @Test
     public void testAllOps(){
-       Properties properties = new Properties();
-       properties.put(XACMLRestProperties.PROP_PAP_DB_DRIVER,"org.h2.Driver");
-       properties.put(XACMLRestProperties.PROP_PAP_DB_URL, "jdbc:h2:file:./sql/xacmlTest");
-       properties.put(XACMLRestProperties.PROP_PAP_DB_USER, "sa");
-       properties.put(XACMLRestProperties.PROP_PAP_DB_PASSWORD, "");
-       EntityManagerFactory emf = Persistence.createEntityManagerFactory("testPapPU", properties);
-       EntityManager em = emf.createEntityManager();
+        Properties properties = new Properties();
+        properties.put(XACMLRestProperties.PROP_PAP_DB_DRIVER,"org.h2.Driver");
+        properties.put(XACMLRestProperties.PROP_PAP_DB_URL, "jdbc:h2:file:./sql/xacmlTest");
+        properties.put(XACMLRestProperties.PROP_PAP_DB_USER, "sa");
+        properties.put(XACMLRestProperties.PROP_PAP_DB_PASSWORD, "");
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("testPapPU", properties);
+        EntityManager em = emf.createEntityManager();
         // Start a transaction
         EntityTransaction et = em.getTransaction();
 
@@ -101,19 +101,19 @@ public class PolicyEntityTest {
         
         
         logger.debug("\n\n********PolicyEntityTest: Local PolicyEntity and Configuration objects before persist*********"
-                       + "\npolicyId1 = " + policyId1
-                       + "\npolicyName1 = " + policyName1
-                       + "\nversion1 = " + version1
-                       + "\npolicyData1 = " + policyData1
-                       + "\nconfigDataStr1 = " + configDataStr1
-                       + "\nactionBodyStr1 = " + actionBodyStr1
-                       + "\nscope = " + p1.getScope()
-                       + "\ncreatedBy1 = " + createdBy1
-                       + "\ncreatedDateStr1 = " + createdDateStr1
-                       + "\ndescription = " + description
-                       + "\nmodifiedBy1 = " + modifiedBy1
-                       + "\nmodifiedDateStr1 = " + modifiedDateStr1
-                       + "\ndeleted = " + p1.isDeleted());
+                + "\npolicyId1 = " + policyId1
+                + "\npolicyName1 = " + policyName1
+                + "\nversion1 = " + version1
+                + "\npolicyData1 = " + policyData1
+                + "\nconfigDataStr1 = " + configDataStr1
+                + "\nactionBodyStr1 = " + actionBodyStr1
+                + "\nscope = " + p1.getScope()
+                + "\ncreatedBy1 = " + createdBy1
+                + "\ncreatedDateStr1 = " + createdDateStr1
+                + "\ndescription = " + description
+                + "\nmodifiedBy1 = " + modifiedBy1
+                + "\nmodifiedDateStr1 = " + modifiedDateStr1
+                + "\ndeleted = " + p1.isDeleted());
         
         //Set policyID
         p1.setPolicyName("testPID2");
@@ -171,19 +171,19 @@ public class PolicyEntityTest {
         modifiedDateStr1 = (modifiedDate1 != null ? modifiedDate1.toString() : "modifiedDate is null");
         
         logger.debug("\n\n********PolicyEntityTest: Local PolicyEntity and Configuration objects after persist*********"
-                       + "\npolicyId1 = " + policyId1
-                       + "\npolicyName1 = " + policyName1
-                       + "\nversion1 = " + version1
-                       + "\npolicyData1 = " + policyData1
-                       + "\nconfigDataStr1 = " + configDataStr1
-                       + "\nactionBodyStr1 = " + actionBodyStr1
-                       + "\nscopeId = " + p1.getScope()
-                       + "\ncreatedBy1 = " + createdBy1
-                       + "\ncreatedDateStr1 = " + createdDateStr1
-                       + "\ndescription = " + description
-                       + "\nmodifiedBy1 = " + modifiedBy1
-                       + "\nmodifiedDateStr1 = " + modifiedDateStr1
-                       + "\ndeleted = " + p1.isDeleted());
+                + "\npolicyId1 = " + policyId1
+                + "\npolicyName1 = " + policyName1
+                + "\nversion1 = " + version1
+                + "\npolicyData1 = " + policyData1
+                + "\nconfigDataStr1 = " + configDataStr1
+                + "\nactionBodyStr1 = " + actionBodyStr1
+                + "\nscopeId = " + p1.getScope()
+                + "\ncreatedBy1 = " + createdBy1
+                + "\ncreatedDateStr1 = " + createdDateStr1
+                + "\ndescription = " + description
+                + "\nmodifiedBy1 = " + modifiedBy1
+                + "\nmodifiedDateStr1 = " + modifiedDateStr1
+                + "\ndeleted = " + p1.isDeleted());
 
         //Now lets fully configure the configurationData and actionBody
         
@@ -193,7 +193,7 @@ public class PolicyEntityTest {
       ActionBodyEntity a1 = new ActionBodyEntity();
       
         //persist the configuration Data
-       em.persist(c1);        
+        em.persist(c1);
         
         c1.setConfigType("OTHER");
         
@@ -241,28 +241,28 @@ public class PolicyEntityTest {
         Date cdModifiedDate = c1.getModifiedDate();
         
         logger.debug("\n\n********PolicyEntityTest: Local Configuration object after setting values *********"
-                       + "\nconfigurationDataId = " + configurationDataId
-                       + "\ncdVersion = " + cdVersion
-                       + "\ncdConfigType = " + cdConfigType
-                       + "\ncdConfigBody = " + cdConfigBody
-                       + "\ncdCreatedBy = " + cdCreatedBy
-                       + "\ncdCreatedDate = " + cdCreatedDate
-                       + "\ncdDescription = " + cdDescription
-                       + "\ncdModifiedBy = " + cdModifiedBy
-                       + "\ncdModifiedDate = " + cdModifiedDate
-                       + "\ndeleted = " + c1.isDeleted());        
+                + "\nconfigurationDataId = " + configurationDataId
+                + "\ncdVersion = " + cdVersion
+                + "\ncdConfigType = " + cdConfigType
+                + "\ncdConfigBody = " + cdConfigBody
+                + "\ncdCreatedBy = " + cdCreatedBy
+                + "\ncdCreatedDate = " + cdCreatedDate
+                + "\ncdDescription = " + cdDescription
+                + "\ncdModifiedBy = " + cdModifiedBy
+                + "\ncdModifiedDate = " + cdModifiedDate
+                + "\ndeleted = " + c1.isDeleted());
         
 
         
         logger.debug("\n\n********PolicyEntityTest: Local Action Body object after setting values *********"
-                       + "\nactionBodyId = " + a1.getActionBodyId()
-                       + "\nactionBodyVersion = " + a1.getVersion()
-                       + "\nactionBody = " + a1.getActionBody()
-                       + "\nactionBodyCeatedBy = " + a1.getCreatedBy()
-                       + "\nactionBodyCreatedDate = " + a1.getCreatedDate()
-                       + "\nactionBodyModifiedBy = " + a1.getModifiedBy()
-                       + "\nactionBodyModifiedDate = " + a1.getModifiedDate()
-                       + "\nactionBodyDeleted = " + a1.isDeleted());        
+                + "\nactionBodyId = " + a1.getActionBodyId()
+                + "\nactionBodyVersion = " + a1.getVersion()
+                + "\nactionBody = " + a1.getActionBody()
+                + "\nactionBodyCeatedBy = " + a1.getCreatedBy()
+                + "\nactionBodyCreatedDate = " + a1.getCreatedDate()
+                + "\nactionBodyModifiedBy = " + a1.getModifiedBy()
+                + "\nactionBodyModifiedDate = " + a1.getModifiedDate()
+                + "\nactionBodyDeleted = " + a1.isDeleted());
 
         p1.setScope("mckiou.kevin.kim");        
         
@@ -282,10 +282,10 @@ public class PolicyEntityTest {
         List psList = queryscope.getResultList();
         PolicyEntity px = null;
         if(!psList.isEmpty()){
-               //ignores multiple results
-               px = (PolicyEntity) psList.get(0);
+            //ignores multiple results
+            px = (PolicyEntity) psList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No PolicyEntity using scope DB entry found");
+            fail("\nPolicyEntityTest: No PolicyEntity using scope DB entry found");
         }
         
         //The scope object on the retrieved policy object should be same as the one we used to find it
@@ -295,29 +295,29 @@ public class PolicyEntityTest {
         //Because getSingleResult() throws an unchecked exception which is an indication of a 
         //programming error, we are not going to use it.
         @SuppressWarnings("rawtypes")
-               List resultList = query.getResultList();
+        List resultList = query.getResultList();
         PolicyEntity p2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             p2 = (PolicyEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
+            fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
         }
         
         logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after retrieving from DB BEFORE assigning configurationData*********"
-                       + "\npolicyId2 = " + p2.getPolicyId()
-                       + "\npolicyName2 = " + p2.getPolicyName()
-                       + "\nversion2 = " + p2.getVersion()
-                       + "\npolicyData2 = " + p2.getPolicyData()
-                       + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-                       + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-                       + "\nscope2 = " + p2.getScope()
-                       + "\ncreatedBy2 = " + p2.getCreatedBy()
-                       + "\ncreatedDate2 = " + p2.getCreatedDate()
-                       + "\ndescription2 = " + p2.getDescription()
-                       + "\nmodifiedBy2 = " + p2.getModifiedBy()
-                       + "\nmodifiedDate2 = " + p2.getModifiedDate()
-                       + "\ndeleted2 = " + p2.isDeleted());
+                + "\npolicyId2 = " + p2.getPolicyId()
+                + "\npolicyName2 = " + p2.getPolicyName()
+                + "\nversion2 = " + p2.getVersion()
+                + "\npolicyData2 = " + p2.getPolicyData()
+                + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
+                + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
+                + "\nscope2 = " + p2.getScope()
+                + "\ncreatedBy2 = " + p2.getCreatedBy()
+                + "\ncreatedDate2 = " + p2.getCreatedDate()
+                + "\ndescription2 = " + p2.getDescription()
+                + "\nmodifiedBy2 = " + p2.getModifiedBy()
+                + "\nmodifiedDate2 = " + p2.getModifiedDate()
+                + "\ndeleted2 = " + p2.isDeleted());
 
         //Confirm that the retrieved policy object is the same as the persisted object
         assertSame(p1,p2);
@@ -328,26 +328,26 @@ public class PolicyEntityTest {
         query2.setParameter("cid", c1.getConfigurationDataId());
         
         //Get the database version of the Configuration Data
-               resultList = query2.getResultList();
+        resultList = query2.getResultList();
         ConfigurationDataEntity c2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             c2 = (ConfigurationDataEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
+            fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
         }
         
         logger.debug("\n\n********PolicyEntityTest: Configuration object after retrieving from DB BEFORE assigning to policy*********"
-                       + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-                       + "\nversion2 = " + c2.getVersion()
-                       + "\nconfigType2 = " + c2.getConfigType()
-                       + "\nconfigBody2 = " + c2.getConfigBody()
-                       + "\ncreatedBy2 = " + c2.getCreatedBy()
-                       + "\ncreatedDate2 = " + c2.getCreatedDate()
-                       + "\ndescription2 = " + c2.getDescription()
-                       + "\nmodifiedBy2 = " + c2.getModifiedBy()
-                       + "\nmodifiedDate2 = " + c2.getModifiedDate()
-                       + "\ndeleted2 = " + c2.isDeleted());
+                + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
+                + "\nversion2 = " + c2.getVersion()
+                + "\nconfigType2 = " + c2.getConfigType()
+                + "\nconfigBody2 = " + c2.getConfigBody()
+                + "\ncreatedBy2 = " + c2.getCreatedBy()
+                + "\ncreatedDate2 = " + c2.getCreatedDate()
+                + "\ndescription2 = " + c2.getDescription()
+                + "\nmodifiedBy2 = " + c2.getModifiedBy()
+                + "\nmodifiedDate2 = " + c2.getModifiedDate()
+                + "\ndeleted2 = " + c2.isDeleted());
         
         //Confirm the retrieved ConfigurationDataEntity object is the same as the persisted
         assertSame(c1,c2);
@@ -361,25 +361,25 @@ public class PolicyEntityTest {
         querya2.setParameter("aid", a1.getActionBodyId());
         
         //Get the database version of the Action Body
-               resultList = querya2.getResultList();
+        resultList = querya2.getResultList();
         ActionBodyEntity a2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             a2 = (ActionBodyEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
+            fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
         }
         
         
         logger.debug("\n\n********PolicyEntityTest: Local Action Body object after retrieving from DB BEFORE assigning to policy *********"
-                       + "\nactionBodyId2 = " + a2.getActionBodyId()
-                       + "\nactionBodyVersion2 = " + a2.getVersion()
-                       + "\nactionBody2 = " + a2.getActionBody()
-                       + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-                       + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-                       + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-                       + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-                       + "\nactionBodyDeleted2 = " + a2.isDeleted());        
+                + "\nactionBodyId2 = " + a2.getActionBodyId()
+                + "\nactionBodyVersion2 = " + a2.getVersion()
+                + "\nactionBody2 = " + a2.getActionBody()
+                + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
+                + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
+                + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
+                + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
+                + "\nactionBodyDeleted2 = " + a2.isDeleted());
 
         
         //Confirm the retrieved ActionBodyEntity object is the same as the persisted
@@ -398,67 +398,67 @@ public class PolicyEntityTest {
             // ignores multiple results
             p2 = (PolicyEntity) resultList.get(0);
         }else{
-               fail("PolicyEntityTest: No PolicyEntity DB entry found");
+            fail("PolicyEntityTest: No PolicyEntity DB entry found");
         }
         
         logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after retrieving from DB AFTER assigning configurationData*********"
-                       + "\npolicyId2 = " + p2.getPolicyId()
-                       + "\npolicyName2 = " + p2.getPolicyName()
-                       + "\nversion2 = " + p2.getVersion()
-                       + "\npolicyData2 = " + p2.getPolicyData()
-                       + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-                       + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-                       + "\nscope2 = " + p2.getScope()
-                       + "\ncreatedBy2 = " + p2.getCreatedBy()
-                       + "\ncreatedDate2 = " + p2.getCreatedDate()
-                       + "\ndescription2 = " + p2.getDescription()
-                       + "\nmodifiedBy2 = " + p2.getModifiedBy()
-                       + "\nmodifiedDate2 = " + p2.getModifiedDate()
-                       + "\ndeleted2 = " + p2.isDeleted());
+                + "\npolicyId2 = " + p2.getPolicyId()
+                + "\npolicyName2 = " + p2.getPolicyName()
+                + "\nversion2 = " + p2.getVersion()
+                + "\npolicyData2 = " + p2.getPolicyData()
+                + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
+                + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
+                + "\nscope2 = " + p2.getScope()
+                + "\ncreatedBy2 = " + p2.getCreatedBy()
+                + "\ncreatedDate2 = " + p2.getCreatedDate()
+                + "\ndescription2 = " + p2.getDescription()
+                + "\nmodifiedBy2 = " + p2.getModifiedBy()
+                + "\nmodifiedDate2 = " + p2.getModifiedDate()
+                + "\ndeleted2 = " + p2.isDeleted());
 
         //And now the ConfigurationDataEntity object
-               resultList = query2.getResultList();
+        resultList = query2.getResultList();
         c2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             c2 = (ConfigurationDataEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
+            fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
         }
         
         logger.debug("\n\n********PolicyEntityTest: Configuration object after retrieving from DB AFTER assigning to policy*********"
-                       + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-                       + "\nversion2 = " + c2.getVersion()
-                       + "\nconfigType2 = " + c2.getConfigType()
-                       + "\nconfigBody2 = " + c2.getConfigBody()
-                       + "\ncreatedBy2 = " + c2.getCreatedBy()
-                       + "\ncreatedDate2 = " + c2.getCreatedDate()
-                       + "\ndescription2 = " + c2.getDescription()
-                       + "\nmodifiedBy = " + c2.getModifiedBy()
-                       + "\nmodifiedDate = " + c2.getModifiedDate()
-                       + "\ndeleted2 = " + c2.isDeleted());
+                + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
+                + "\nversion2 = " + c2.getVersion()
+                + "\nconfigType2 = " + c2.getConfigType()
+                + "\nconfigBody2 = " + c2.getConfigBody()
+                + "\ncreatedBy2 = " + c2.getCreatedBy()
+                + "\ncreatedDate2 = " + c2.getCreatedDate()
+                + "\ndescription2 = " + c2.getDescription()
+                + "\nmodifiedBy = " + c2.getModifiedBy()
+                + "\nmodifiedDate = " + c2.getModifiedDate()
+                + "\ndeleted2 = " + c2.isDeleted());
         
         
         //Get the database version of the Action Body
-               resultList = querya2.getResultList();
+        resultList = querya2.getResultList();
         a2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             a2 = (ActionBodyEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
+            fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
         }
         
         
         logger.debug("\n\n********PolicyEntityTest: Local Action Body object after retrieving from DB AFTER assigning to policy *********"
-                       + "\nactionBodyId2 = " + a2.getActionBodyId()
-                       + "\nactionBodyVersion2 = " + a2.getVersion()
-                       + "\nactionBody2 = " + a2.getActionBody()
-                       + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-                       + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-                       + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-                       + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-                       + "\nactionBodyDeleted2 = " + a2.isDeleted());        
+                + "\nactionBodyId2 = " + a2.getActionBodyId()
+                + "\nactionBodyVersion2 = " + a2.getVersion()
+                + "\nactionBody2 = " + a2.getActionBody()
+                + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
+                + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
+                + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
+                + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
+                + "\nactionBodyDeleted2 = " + a2.isDeleted());
 
         
         //****Now lets see if the orphanRemoval=true does anything useful***
@@ -473,30 +473,30 @@ public class PolicyEntityTest {
         
         //Attempt to retrieve the configuration data object from the db. It should not be there
         //Reusing the previous query
-               resultList = query2.getResultList();
+        resultList = query2.getResultList();
         c2 = null;
         if(resultList.isEmpty()){
-               logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
-                               + "\n Success!! No ConfigurationDataEntity DB entry found");
+            logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
+                    + "\n Success!! No ConfigurationDataEntity DB entry found");
             
         }else{
-               c2 = (ConfigurationDataEntity) resultList.get(0);
-               fail("\nPolicyEntityTest: ConfigurationDataEntity DB entry found - and none should exist"
-                               + "\nconfigurationDataId = " + c2.getConfigurationDataId());
+            c2 = (ConfigurationDataEntity) resultList.get(0);
+            fail("\nPolicyEntityTest: ConfigurationDataEntity DB entry found - and none should exist"
+                    + "\nconfigurationDataId = " + c2.getConfigurationDataId());
         }
         
         //Attempt to retrieve the actionBody data object from the db. It should not be there
         //Reusing the previous query
-               resultList = querya2.getResultList();
+        resultList = querya2.getResultList();
         a2 = null;
         if(resultList.isEmpty()){
-               logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
-                               + "\n Success!! No ActionBodyEntity DB entry found");
+            logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
+                    + "\n Success!! No ActionBodyEntity DB entry found");
             
         }else{
-               a2 = (ActionBodyEntity) resultList.get(0);
-               fail("\nPolicyEntityTest: ActionBodyEntity DB entry found - and none should exist"
-                               + "\nactionBodyId = " + a2.getActionBodyId());
+            a2 = (ActionBodyEntity) resultList.get(0);
+            fail("\nPolicyEntityTest: ActionBodyEntity DB entry found - and none should exist"
+                    + "\nactionBodyId = " + a2.getActionBodyId());
         }
         
         //Now lets put the configurationData and actionBody back into the policy object and see what appears
@@ -512,86 +512,86 @@ public class PolicyEntityTest {
         em.flush();
         
         //retrieve the policy object
-               resultList = query.getResultList();
+        resultList = query.getResultList();
         p2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             p2 = (PolicyEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
+            fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
         }
         
         //output what we policy object found
         logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after again adding ConfigurationDataEntity and retrieving from DB*********"
-                       + "\npolicyId2 = " + p2.getPolicyId()
-                       + "\npolicyName2 = " + p2.getPolicyName()
-                       + "\nversion2 = " + p2.getVersion()
-                       + "\npolicyData2 = " + p2.getPolicyData()
-                       + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-                       + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-                       +  "\nscope2 = " + p2.getScope()
-                       + "\ncreatedBy2 = " + p2.getCreatedBy()
-                       + "\ncreatedDate2 = " + p2.getCreatedDate()
-                       + "\ndescription2 = " + p2.getDescription()
-                       + "\nmodifiedBy2 = " + p2.getModifiedBy()
-                       + "\nmodifiedDate2 = " + p2.getModifiedDate()
-                       + "\ndeleted2 = " + p2.isDeleted());
+                + "\npolicyId2 = " + p2.getPolicyId()
+                + "\npolicyName2 = " + p2.getPolicyName()
+                + "\nversion2 = " + p2.getVersion()
+                + "\npolicyData2 = " + p2.getPolicyData()
+                + "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
+                + "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
+                +  "\nscope2 = " + p2.getScope()
+                + "\ncreatedBy2 = " + p2.getCreatedBy()
+                + "\ncreatedDate2 = " + p2.getCreatedDate()
+                + "\ndescription2 = " + p2.getDescription()
+                + "\nmodifiedBy2 = " + p2.getModifiedBy()
+                + "\nmodifiedDate2 = " + p2.getModifiedDate()
+                + "\ndeleted2 = " + p2.isDeleted());
 
 
         //now lets see if it put the configurationData c1 back into the table
-               resultList = query2.getResultList();
+        resultList = query2.getResultList();
         c2 = null;
         if(!resultList.isEmpty()){
             // ignores multiple results
             c2 = (ConfigurationDataEntity) resultList.get(0);
         }else{
-               fail("\nPolicyEntityTest - Check re-entry of configurationData into DB"
-                               + "No ConfigurationDataEntity DB entry found");
+            fail("\nPolicyEntityTest - Check re-entry of configurationData into DB"
+                    + "No ConfigurationDataEntity DB entry found");
         }
         
         //output what configurationData object we found
         logger.debug("\n\n********PolicyEntityTest: Configuration object after re-enter into policy object and retrieving from DB *********"
-                       + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-                       + "\nversion2 = " + c2.getVersion()
-                       + "\nconfigType2 = " + c2.getConfigType()
-                       + "\nconfigBody2 = " + c2.getConfigBody()
-                       + "\ncreatedBy2 = " + c2.getCreatedBy()
-                       + "\ncreatedDate2 = " + c2.getCreatedDate()
-                       + "\ndescription2 = " + c2.getDescription()
-                       + "\nmodifiedBy = " + c2.getModifiedBy()
-                       + "\nmodifiedDate = " + c2.getModifiedDate()
-                       + "\ndeleted2 = " + c2.isDeleted());
+                + "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
+                + "\nversion2 = " + c2.getVersion()
+                + "\nconfigType2 = " + c2.getConfigType()
+                + "\nconfigBody2 = " + c2.getConfigBody()
+                + "\ncreatedBy2 = " + c2.getCreatedBy()
+                + "\ncreatedDate2 = " + c2.getCreatedDate()
+                + "\ndescription2 = " + c2.getDescription()
+                + "\nmodifiedBy = " + c2.getModifiedBy()
+                + "\nmodifiedDate = " + c2.getModifiedDate()
+                + "\ndeleted2 = " + c2.isDeleted());
 
         //now lets see if it put the actionBody a1 back into the table
         //Get the database version of the Action Body
-               resultList = querya2.getResultList();
+        resultList = querya2.getResultList();
          a2 = null;
          if(!resultList.isEmpty()){
              // ignores multiple results
              a2 = (ActionBodyEntity) resultList.get(0);
          }else{
-               fail("\nPolicyEntityTest - Check re-entry of actionBody into DB"
-                               + "No ActionBodyEntity DB entry found");
+            fail("\nPolicyEntityTest - Check re-entry of actionBody into DB"
+                    + "No ActionBodyEntity DB entry found");
          }
          
          logger.debug("\n\n********PolicyEntityTest: Local Action Body object after re-enter into policy object and retrieving from DB *********"
-                       + "\nactionBodyId2 = " + a2.getActionBodyId()
-                       + "\nactionBodyVersion2 = " + a2.getVersion()
-                       + "\nactionBody2 = " + a2.getActionBody()
-                       + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-                       + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-                       + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-                       + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-                       + "\nactionBodyDeleted2 = " + a2.isDeleted());        
+                + "\nactionBodyId2 = " + a2.getActionBodyId()
+                + "\nactionBodyVersion2 = " + a2.getVersion()
+                + "\nactionBody2 = " + a2.getActionBody()
+                + "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
+                + "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
+                + "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
+                + "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
+                + "\nactionBodyDeleted2 = " + a2.isDeleted());
 
         //I want to save all the above in the DB
         try{
-               et.commit();
-               logger.debug("\n\n***********PolicyEntityTest: et.commit Succeeded********");
+            et.commit();
+            logger.debug("\n\n***********PolicyEntityTest: et.commit Succeeded********");
         }catch(Exception e){
-               logger.debug("\n\n***********PolicyEntityTest: et.commit Failed********"
-                               + "\nTRANSACTION ROLLBACK "
-                               + "\n   with exception: " + e);
+            logger.debug("\n\n***********PolicyEntityTest: et.commit Failed********"
+                    + "\nTRANSACTION ROLLBACK "
+                    + "\n   with exception: " + e);
         }
 
         // Start a new transaction
@@ -603,58 +603,58 @@ public class PolicyEntityTest {
         PolicyEntity p3 = new PolicyEntity();
         em.persist(p3);
 
-       
-       //first let's assure that you can save with the same name but a different scope
-       p3.setPolicyName(p1.getPolicyName());
-       p3.setScope("mckiou.kevin.kory");
-       em.flush();
-       logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-                       + "\nSuccess!  PolicyEntity uniqueness constraint allowed "
-                       + "\n   policyId1 " + p1.getPolicyId() 
-                       + "\n   policyName1 " + p1.getPolicyName() 
-                       + "\n   scope1 = " + p1.getScope()
-                       + "\n   policyId3 " + p3.getPolicyId() 
-                       + "\n   policyName3 " + p3.getPolicyName() 
-                       + "\n   scope3 = " + p3.getScope());
-
-       //Assert that the policyIds are NOT the same to show that the automatic sequencing is working
-       assert(p1.getPolicyId() != p3.getPolicyId());
-
-       try{
-               //Now set the scope the same to verify the uniqueness constraint will be enforced
-               p3.setScope(p1.getScope());
-               
-               em.flush();
-               logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-                               + "\nFailed! PolicyEntity Uniqueness constraint FAILED and DID allow "
-                               + "\n   policyId1 " + p1.getPolicyId() 
-                               + "\n   policyName1 " + p1.getPolicyName() 
-                               + "\n   scope1 = " + p1.getScope()
-                               + "\n   policyId3 " + p3.getPolicyId() 
-                               + "\n   policyName3 " + p3.getPolicyName() 
-                               + "\n   scope3 = " + p3.getScope());;
+
+        //first let's assure that you can save with the same name but a different scope
+        p3.setPolicyName(p1.getPolicyName());
+        p3.setScope("mckiou.kevin.kory");
+        em.flush();
+        logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
+                + "\nSuccess!  PolicyEntity uniqueness constraint allowed "
+                + "\n   policyId1 " + p1.getPolicyId()
+                + "\n   policyName1 " + p1.getPolicyName()
+                + "\n   scope1 = " + p1.getScope()
+                + "\n   policyId3 " + p3.getPolicyId()
+                + "\n   policyName3 " + p3.getPolicyName()
+                + "\n   scope3 = " + p3.getScope());
+
+        //Assert that the policyIds are NOT the same to show that the automatic sequencing is working
+        assert(p1.getPolicyId() != p3.getPolicyId());
+
+        try{
+            //Now set the scope the same to verify the uniqueness constraint will be enforced
+            p3.setScope(p1.getScope());
+
+            em.flush();
+            logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
+                    + "\nFailed! PolicyEntity Uniqueness constraint FAILED and DID allow "
+                    + "\n   policyId1 " + p1.getPolicyId()
+                    + "\n   policyName1 " + p1.getPolicyName()
+                    + "\n   scope1 = " + p1.getScope()
+                    + "\n   policyId3 " + p3.getPolicyId()
+                    + "\n   policyName3 " + p3.getPolicyName()
+                    + "\n   scope3 = " + p3.getScope());;
         }
         catch(Exception e){
-               //Success
-               logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-                               + "\nSuccess!  PolicyEntity Uniqueness constraint SUCCEEDED and did NOT allow "
-                               + "\n   policyId1 " + p1.getPolicyId() 
-                               + "\n   policyName1 " + p1.getPolicyName() 
-                               + "\n   scope1 = " + p1.getScope()
-                               + "\n   policyId3 " + p3.getPolicyId() 
-                               + "\n   policyName3 " + p3.getPolicyName() 
-                               + "\n   scope3 = " + p3.getScope()
-                               + "\n   with excpetion: " + e);
+            //Success
+            logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
+                    + "\nSuccess!  PolicyEntity Uniqueness constraint SUCCEEDED and did NOT allow "
+                    + "\n   policyId1 " + p1.getPolicyId()
+                    + "\n   policyName1 " + p1.getPolicyName()
+                    + "\n   scope1 = " + p1.getScope()
+                    + "\n   policyId3 " + p3.getPolicyId()
+                    + "\n   policyName3 " + p3.getPolicyName()
+                    + "\n   scope3 = " + p3.getScope()
+                    + "\n   with excpetion: " + e);
         }
 
-       
+
         try{
-               et2.commit();
-               logger.debug("\n\n***********PolicyEntityTest: et2.commit Succeeded********");
+            et2.commit();
+            logger.debug("\n\n***********PolicyEntityTest: et2.commit Succeeded********");
         }catch(Exception e){
-               logger.debug("\n\n***********PolicyEntityTest: et2.commit Failed********"
-                               + "\nTRANSACTION ROLLBACK "
-                               + "\n   with exception: " + e);
+            logger.debug("\n\n***********PolicyEntityTest: et2.commit Failed********"
+                    + "\nTRANSACTION ROLLBACK "
+                    + "\n   with exception: " + e);
         }
         
         //****************Test the PolicyDBDaoEntity************************
@@ -685,63 +685,63 @@ public class PolicyEntityTest {
         
         //Print them to the log before flushing
         logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects before flush********"
-                       + "\n   policyDBDaoUrl-1 = " + pe1.getPolicyDBDaoUrl()
-                       + "\n   description-1 = " + pe1.getDescription()
-                       + "\n   createdDate-1 = " + pe1.getCreatedDate()
-                       + "\n   modifiedDate-1 " + pe1.getModifiedDate()
-                       + "\n*****************************************"
-                       + "\n   policyDBDaoUrl-2 = " + pe2.getPolicyDBDaoUrl()
-                       + "\n   description-2 = " + pe2.getDescription()
-                       + "\n   createdDate-2 = " + pe2.getCreatedDate()
-                       + "\n   modifiedDate-2 " + pe2.getModifiedDate()
-                       );
+                + "\n   policyDBDaoUrl-1 = " + pe1.getPolicyDBDaoUrl()
+                + "\n   description-1 = " + pe1.getDescription()
+                + "\n   createdDate-1 = " + pe1.getCreatedDate()
+                + "\n   modifiedDate-1 " + pe1.getModifiedDate()
+                + "\n*****************************************"
+                + "\n   policyDBDaoUrl-2 = " + pe2.getPolicyDBDaoUrl()
+                + "\n   description-2 = " + pe2.getDescription()
+                + "\n   createdDate-2 = " + pe2.getCreatedDate()
+                + "\n   modifiedDate-2 " + pe2.getModifiedDate()
+                );
         
         //push it to the DB
         em.flush();
         
         //Now let's retrieve them from the DB using the named query
         
-               resultList = em.createNamedQuery("PolicyDBDaoEntity.findAll").getResultList();
+        resultList = em.createNamedQuery("PolicyDBDaoEntity.findAll").getResultList();
+
+        PolicyDBDaoEntity pex = null;
+        PolicyDBDaoEntity pey = null;
 
-               PolicyDBDaoEntity pex = null;
-               PolicyDBDaoEntity pey = null;
-               
         if(!resultList.isEmpty()){
-               if (resultList.size() != 2){
-                       fail("\nPolicyEntityTest: Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 2");
-               }
-               for(Object policyDBDaoEntity: resultList){
-                       PolicyDBDaoEntity pdbdao = (PolicyDBDaoEntity)policyDBDaoEntity;
-                       if(pdbdao.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
-                               pex = pdbdao;
-                       }else if(pdbdao.getPolicyDBDaoUrl().equals("http://789.01.2.345:2345")){
-                               pey = pdbdao;
-                       }
-               }
-               
+            if (resultList.size() != 2){
+                fail("\nPolicyEntityTest: Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 2");
+            }
+            for(Object policyDBDaoEntity: resultList){
+                PolicyDBDaoEntity pdbdao = (PolicyDBDaoEntity)policyDBDaoEntity;
+                if(pdbdao.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
+                    pex = pdbdao;
+                }else if(pdbdao.getPolicyDBDaoUrl().equals("http://789.01.2.345:2345")){
+                    pey = pdbdao;
+                }
+            }
+
             //Print them to the log before flushing
             logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects retrieved from DB********"
-                               + "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
-                               + "\n   description-x = " + pex.getDescription()
-                               + "\n   createdDate-x = " + pex.getCreatedDate()
-                               + "\n   modifiedDate-x " + pex.getModifiedDate()
-                               + "\n*****************************************"
-                               + "\n   policyDBDaoUrl-y = " + pey.getPolicyDBDaoUrl()
-                               + "\n   description-y = " + pey.getDescription()
-                               + "\n   createdDate-y = " + pey.getCreatedDate()
-                               + "\n   modifiedDate-y " + pey.getModifiedDate()
-                       );
-               //Verify the retrieved objects are the same as the ones we stored in the DB
-               if(pex.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
-                       assertSame(pe1,pex);
-                       assertSame(pe2,pey);
-               }else{
-                       assertSame(pe2,pex);
-                       assertSame(pe1,pey);
-               }
+                    + "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
+                    + "\n   description-x = " + pex.getDescription()
+                    + "\n   createdDate-x = " + pex.getCreatedDate()
+                    + "\n   modifiedDate-x " + pex.getModifiedDate()
+                    + "\n*****************************************"
+                    + "\n   policyDBDaoUrl-y = " + pey.getPolicyDBDaoUrl()
+                    + "\n   description-y = " + pey.getDescription()
+                    + "\n   createdDate-y = " + pey.getCreatedDate()
+                    + "\n   modifiedDate-y " + pey.getModifiedDate()
+                    );
+            //Verify the retrieved objects are the same as the ones we stored in the DB
+            if(pex.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
+                assertSame(pe1,pex);
+                assertSame(pe2,pey);
+            }else{
+                assertSame(pe2,pex);
+                assertSame(pe1,pey);
+            }
             
         }else{
-               fail("\nPolicyEntityTest: No PolicyDBDaoEntity DB entry found");
+            fail("\nPolicyEntityTest: No PolicyDBDaoEntity DB entry found");
         }
        
         //Now let's see if we can do an update on the PolicyDBDaoEntity which we retrieved.
@@ -751,32 +751,32 @@ public class PolicyEntityTest {
         
         //retrieve it
         Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyDBDaoEntity p WHERE p.description=:desc");
-               resultList = createPolicyQuery.setParameter("desc", "This is pex").getResultList();
-               
-               PolicyDBDaoEntity pez = null;
+        resultList = createPolicyQuery.setParameter("desc", "This is pex").getResultList();
+
+        PolicyDBDaoEntity pez = null;
         
         if(!resultList.isEmpty()){
-               if (resultList.size() != 1){
-                       fail("\nPolicyEntityTest: Update Test - Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 1");
-               }
-               pez = (PolicyDBDaoEntity) resultList.get(0);
-               
+            if (resultList.size() != 1){
+                fail("\nPolicyEntityTest: Update Test - Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 1");
+            }
+            pez = (PolicyDBDaoEntity) resultList.get(0);
+
             //Print them to the log before flushing
             logger.debug("\n\n***********PolicyEntityTest: Update Test - PolicyDBDaoEntity objects retrieved from DB********"
-                               + "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
-                               + "\n   description-x = " + pex.getDescription()
-                               + "\n   createdDate-x = " + pex.getCreatedDate()
-                               + "\n   modifiedDate-x " + pex.getModifiedDate()
-                               + "\n*****************************************"
-                               + "\n   policyDBDaoUrl-z = " + pez.getPolicyDBDaoUrl()
-                               + "\n   description-z = " + pez.getDescription()
-                               + "\n   createdDate-z = " + pez.getCreatedDate()
-                               + "\n   modifiedDate-z " + pez.getModifiedDate()
-                       );
-               //Verify the retrieved objects are the same as the ones we stored in the DB
-                       assertSame(pex,pez);
+                    + "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
+                    + "\n   description-x = " + pex.getDescription()
+                    + "\n   createdDate-x = " + pex.getCreatedDate()
+                    + "\n   modifiedDate-x " + pex.getModifiedDate()
+                    + "\n*****************************************"
+                    + "\n   policyDBDaoUrl-z = " + pez.getPolicyDBDaoUrl()
+                    + "\n   description-z = " + pez.getDescription()
+                    + "\n   createdDate-z = " + pez.getCreatedDate()
+                    + "\n   modifiedDate-z " + pez.getModifiedDate()
+                    );
+            //Verify the retrieved objects are the same as the ones we stored in the DB
+            assertSame(pex,pez);
         }else{
-               fail("\nPolicyEntityTest: Update Test - No PolicyDBDaoEntity DB updated entry found");
+            fail("\nPolicyEntityTest: Update Test - No PolicyDBDaoEntity DB updated entry found");
         }
         
         //Clean up the DB
@@ -787,12 +787,12 @@ public class PolicyEntityTest {
         
         //Wrap up the transaction
         try{
-               et3.commit();
-               logger.debug("\n\n***********PolicyEntityTest: et3.commit Succeeded********");
+            et3.commit();
+            logger.debug("\n\n***********PolicyEntityTest: et3.commit Succeeded********");
         }catch(Exception e){
-               logger.debug("\n\n***********PolicyEntityTest: et3.commit Failed********"
-                               + "\nTRANSACTION ROLLBACK "
-                               + "\n   with exception: " + e);
+            logger.debug("\n\n***********PolicyEntityTest: et3.commit Failed********"
+                    + "\nTRANSACTION ROLLBACK "
+                    + "\n   with exception: " + e);
         }