Checkstyle changes for apex model

Fix checkstyle warnings in the apex mode
and knock on changes.

Issue-ID: POLICY-1034
Change-Id: I10537e4288e9cad5ef18165ed2cdc1d3ab3139c1
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

4 files changed, 206 insertions, 78 deletions

diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java
index dbff0666d..a5d3a349a 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java
@@ -34,6 +34,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEventModel;
 import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
 
 /**
+ * Test event models.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class TestEventModel {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java
index 309359fa2..36ef6ade5 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java
@@ -40,6 +40,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
 import org.onap.policy.apex.model.eventmodel.concepts.AxField;
 
 /**
+ * Test events.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class TestEvents {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java
index 8d2e8a686..75fced1b0 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java
@@ -36,6 +36,8 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxInputField;
 import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
 
 /**
+ * Test fields.
+ * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class TestField {
@@ -106,9 +108,9 @@ public class TestField {
         field.clean();
 
         final AxField clonedField = new AxField(field);
-        assertEquals(
-                "AxField:(key=AxReferenceKey:(parentKeyName=FieldName,parentKeyVersion=0.0.1,parentLocalName=PLN,localName=LN),fieldSchemaKey=AxArtifactKey:(name=SchemaName,version=0.0.1),optional=true)",
-                clonedField.toString());
+        assertEquals("AxField:(key=AxReferenceKey:(parentKeyName=FieldName,parentKeyVersion=0.0.1,"
+                        + "parentLocalName=PLN,localName=LN),fieldSchemaKey="
+                        + "AxArtifactKey:(name=SchemaName,version=0.0.1),optional=true)", clonedField.toString());
 
         assertFalse(field.hashCode() == 0);
 
@@ -126,7 +128,7 @@ public class TestField {
         assertNotEquals(0, field.compareTo(new AxArtifactKey()));
         assertNotEquals(0, field.compareTo(null));
         assertNotEquals(0,
-                field.compareTo(new AxField(AxReferenceKey.getNullKey(), AxArtifactKey.getNullKey(), false)));
+                        field.compareTo(new AxField(AxReferenceKey.getNullKey(), AxArtifactKey.getNullKey(), false)));
         assertNotEquals(0, field.compareTo(new AxField(fieldKey, AxArtifactKey.getNullKey(), false)));
         assertNotEquals(0, field.compareTo(new AxField(fieldKey, schemaKey, false)));
         assertEquals(0, field.compareTo(new AxField(fieldKey, schemaKey, true)));
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java
index abb3a3480..643bdfaa2 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java
@@ -38,6 +38,11 @@ public class TestApexEventModel {
     private Connection connection;
     TestApexModel<AxEventModel> testApexModel;
 
+    /**
+     * Set up the test.
+     * 
+     * @throws Exception exceptions from the test
+     */
     @Before
     public void setup() throws Exception {
         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
@@ -83,17 +88,17 @@ public class TestApexEventModel {
     }
 
     @Test
-    public void testModelWriteReadXML() throws Exception {
+    public void testModelWriteReadXml() throws Exception {
         testApexModel.testApexModelWriteReadXml();
     }
 
     @Test
-    public void testModelWriteReadJSON() throws Exception {
+    public void testModelWriteReadJson() throws Exception {
         testApexModel.testApexModelWriteReadJson();
     }
 
     @Test
-    public void testModelWriteReadJPA() throws Exception {
+    public void testModelWriteReadJpa() throws Exception {
         final DaoParameters DaoParameters = new DaoParameters();
         DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao");
         DaoParameters.setPersistenceUnit("DAOTest");
@@ -104,81 +109,200 @@ public class TestApexEventModel {
     private static final String VALID_MODEL_STRING = "***validation of model successful***";
 
     private static final String OBSERVATION_MODEL_STRING = "\n"
-            + "***observations noted during validation of model***\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event2,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event2,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "********************************";
+                    + "***observations noted during validation of model***\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event2,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event2,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "********************************";
 
     private static final String WARNING_MODEL_STRING = "\n" + "***warnings issued during validation of model***\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event2,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
-            + "AxArtifactKey:(name=event2,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event2,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "********************************";
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event2,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:WARNING:nameSpace on event is blank\n"
+                    + "AxArtifactKey:(name=event2,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event2,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "********************************";
 
     private static final String INVALID_MODEL_STRING = "\n" + "***validation of model failed***\n"
-            + "AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1):org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation:INVALID:keyInfoMap may not be empty\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=smallEventModel,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=Schemas,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=BigIntType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=BooleanType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=IntType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=MapType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=SetType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=StringType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=smallEventMap,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=event0,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par0)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par2)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par3)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par4)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par5)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par6)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:duplicate key AxArtifactKey:(name=event1,version=0.0.1) found\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:duplicate key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar) found\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event0,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:INVALID:parent key on parameter field AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar) does not equal event key\n"
-            + "AxArtifactKey:(name=smallEventMap,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvents:INVALID:key on event entry key AxArtifactKey:(name=event2,version=0.0.1) does not equal event value key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:INVALID:parent key on parameter field AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar) does not equal event key\n"
-            + "********************************";
+                    + "AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1):"
+                    + "org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation:INVALID:"
+                    + "keyInfoMap may not be empty\n" + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=smallEventModel,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=Schemas,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=BigIntType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=BooleanType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=IntType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=MapType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=SetType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=StringType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=smallEventMap,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=event0,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par0)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par2)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par3)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par4)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par5)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=par6)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "duplicate key AxArtifactKey:(name=event1,version=0.0.1) found\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "duplicate key AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,"
+                    + "localName=theOnlyPar) found\n" + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event0,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event0,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:INVALID:"
+                    + "parent key on parameter field AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,"
+                    + "parentLocalName=NULL,localName=theOnlyPar) does not equal event key\n"
+                    + "AxArtifactKey:(name=smallEventMap,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvents:INVALID:"
+                    + "key on event entry key AxArtifactKey:(name=event2,version=0.0.1) does not equal event value key "
+                    + "AxArtifactKey:(name=event1,version=0.0.1)\n" + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:INVALID:"
+                    + "parent key on parameter field AxReferenceKey:(parentKeyName=event0,parentKeyVersion=0.0.1,"
+                    + "parentLocalName=NULL,localName=theOnlyPar) does not equal event key\n"
+                    + "********************************";
 
     private static final String INVALID_MODEL_MALSTRUCTURED_STRING = "\n" + "***validation of model failed***\n"
-            + "AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1):org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation:INVALID:keyInfoMap may not be empty\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=smallEventModel,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=Schemas,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=SetType,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=smallEventMap,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event1,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:duplicate key AxArtifactKey:(name=event1,version=0.0.1) found\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:duplicate key AxReferenceKey:(parentKeyName=event1,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar) found\n"
-            + "AxArtifactKey:(name=smallEventModel,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:key information not found for parent key of key AxReferenceKey:(parentKeyName=event1,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "AxArtifactKey:(name=smallEventMap,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvents:INVALID:key on event entry key AxArtifactKey:(name=event2,version=0.0.1) does not equal event value key AxArtifactKey:(name=event1,version=0.0.1)\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
-            + "AxArtifactKey:(name=event1,version=0.0.1):org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
-            + "********************************";
+                    + "AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1):"
+                    + "org.onap.policy.apex.model.basicmodel.concepts.AxKeyInformation:INVALID:"
+                    + "keyInfoMap may not be empty\n" + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=smallEventModel,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=KeyInfoMapKey,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=Schemas,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=SetType,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=smallEventMap,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event1,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "duplicate key AxArtifactKey:(name=event1,version=0.0.1) found\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for key AxArtifactKey:(name=event1,version=0.0.1)\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "duplicate key AxReferenceKey:(parentKeyName=event1,parentKeyVersion=0.0.1,"
+                    + "parentLocalName=NULL,localName=theOnlyPar) found\n"
+                    + "AxArtifactKey:(name=smallEventModel,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEventModel:INVALID:"
+                    + "key information not found for parent key of key AxReferenceKey:"
+                    + "(parentKeyName=event1,parentKeyVersion=0.0.1,parentLocalName=NULL,localName=theOnlyPar)\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "AxArtifactKey:(name=smallEventMap,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvents:INVALID:"
+                    + "key on event entry key AxArtifactKey:(name=event2,version=0.0.1) does not equal event value key "
+                    + "AxArtifactKey:(name=event1,version=0.0.1)\n" + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:source on event is blank\n"
+                    + "AxArtifactKey:(name=event1,version=0.0.1):"
+                    + "org.onap.policy.apex.model.eventmodel.concepts.AxEvent:OBSERVATION:target on event is blank\n"
+                    + "********************************";
 }