Sonar/Checkstyle in model/context/core

Checkstyle and sonar changes in the model, contexot
and core modules.

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

3 files changed, 11 insertions, 11 deletions

diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java
index 62663b9f1..b34d5185c 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java
@@ -45,7 +45,7 @@ public class ApexPeriodicEventGenerator extends TimerTask {
     public static final String PERIODIC_EVENT_VERSION = "0.0.1";
 
     /** The name space of the periodic event. */
-    public static final String PERIODIC_EVENT_NAMESPACE = "com.ericsson.apex.service.engine.event";
+    public static final String PERIODIC_EVENT_NAMESPACE = "org.onap.policy.apex.service.engine.event";
 
     /** The source of the periodic event. */
     public static final String PERIODIC_EVENT_SOURCE = "internal";
diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java
index 90a19fff2..34690cc7d 100644
--- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java
+++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java
@@ -90,7 +90,7 @@ public final class ApexEvent2EnEventConverter implements ApexEventConverter {
                 axEvent.getNameSpace(), axEvent.getSource(), axEvent.getTarget());
 
         // Copy the ExecutionID from the EnEvent into the ApexEvent
-        apexEvent.setExecutionID(enEvent.getExecutionID());
+        apexEvent.setExecutionID(enEvent.getExecutionId());
 
         // Copy he exception message to the Apex event if it is set
         if (enEvent.getExceptionMessage() != null) {
@@ -136,7 +136,7 @@ public final class ApexEvent2EnEventConverter implements ApexEventConverter {
         enEvent.putAll(apexEvent);
 
         // copy the ExecutionID from the ApexEvent into the EnEvent
-        enEvent.setExecutionID(apexEvent.getExecutionID());
+        enEvent.setExecutionId(apexEvent.getExecutionID());
 
         return enEvent;
     }
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java
index bfd651025..b30ad1846 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventProducer.java
@@ -43,8 +43,8 @@ public class SuperDooperEventProducer implements ApexEventProducer {
     /*
      * (non-Javadoc)
      * 
-     * @see com.ericsson.apex.service.engine.event.ApexEventProducer#init(java.lang.String,
-     * com.ericsson.apex.service.parameters.producer.ProducerParameters)
+     * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String,
+     * org.onap.policy.apex.service.parameters.producer.ProducerParameters)
      */
     @Override
     public void init(final String name, final EventHandlerParameters producerParameters) throws ApexEventException {
@@ -54,7 +54,7 @@ public class SuperDooperEventProducer implements ApexEventProducer {
     /*
      * (non-Javadoc)
      * 
-     * @see com.ericsson.apex.service.engine.event.ApexEventProducer#getName()
+     * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName()
      */
     @Override
     public String getName() {
@@ -65,7 +65,7 @@ public class SuperDooperEventProducer implements ApexEventProducer {
      * (non-Javadoc)
      * 
      * @see
-     * com.ericsson.apex.service.engine.event.ApexEventProducer#getPeeredReference(com.ericsson.apex
+     * org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex
      * .service.parameters.eventhandler.EventHandlerPeeredMode)
      */
     @Override
@@ -77,9 +77,9 @@ public class SuperDooperEventProducer implements ApexEventProducer {
      * (non-Javadoc)
      * 
      * @see
-     * com.ericsson.apex.service.engine.event.ApexEventProducer#setPeeredReference(com.ericsson.apex
+     * org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex
      * .service.parameters.eventhandler.EventHandlerPeeredMode,
-     * com.ericsson.apex.service.engine.event.PeeredReference)
+     * org.onap.policy.apex.service.engine.event.PeeredReference)
      */
     @Override
     public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) {}
@@ -88,7 +88,7 @@ public class SuperDooperEventProducer implements ApexEventProducer {
     /*
      * (non-Javadoc)
      * 
-     * @see com.ericsson.apex.service.engine.event.ApexEventProducer#sendEvent(long,
+     * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#sendEvent(long,
      * java.lang.String, java.lang.Object)
      */
     @Override
@@ -100,7 +100,7 @@ public class SuperDooperEventProducer implements ApexEventProducer {
     /*
      * (non-Javadoc)
      * 
-     * @see com.ericsson.apex.service.engine.event.ApexEventProducer#stop()
+     * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#stop()
      */
     @Override
     public void stop() {}