Fix bug with POJO events in APex

When an envet should be decoded entirely into a POJO
and is too complex for Avro, apex decoding breaks.

This reviuew fixes thsi issue.

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

4 files changed, 6 insertions, 7 deletions

diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsObjectEventProtocolParameters.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsObjectEventProtocolParameters.java
index 3c15a7825..86ad0009e 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsObjectEventProtocolParameters.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsObjectEventProtocolParameters.java
@@ -80,7 +80,7 @@ public class JmsObjectEventProtocolParameters extends EventProtocolParameters {
      *  parameter service.
      */
     public JmsObjectEventProtocolParameters() {
-        super(JmsObjectEventProtocolParameters.class.getCanonicalName());
+        super();
 
         // Set the event protocol properties for the JMS Text event protocol
         this.setLabel(JMS_OBJECT_EVENT_PROTOCOL_LABEL);
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsTextEventProtocolParameters.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsTextEventProtocolParameters.java
index 67b211a08..ad6675c43 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsTextEventProtocolParameters.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/JmsTextEventProtocolParameters.java
@@ -45,7 +45,7 @@ public class JmsTextEventProtocolParameters extends JsonEventProtocolParameters
      * service.
      */
     public JmsTextEventProtocolParameters() {
-        super(JmsTextEventProtocolParameters.class.getCanonicalName(), JMS_TEXT_EVENT_PROTOCOL_LABEL);
+        super(JMS_TEXT_EVENT_PROTOCOL_LABEL);
 
         // Set the event protocol properties for the JMS Text event protocol
         this.setLabel(JMS_TEXT_EVENT_PROTOCOL_LABEL);
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java
index 9f0ee0795..a65e2761b 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java
@@ -39,7 +39,7 @@ public class XmlEventProtocolParameters extends EventProtocolTextTokenDelimitedP
      * service.
      */
     public XmlEventProtocolParameters() {
-        super(XmlEventProtocolParameters.class.getCanonicalName());
+        super();
 
         // Set the event protocol properties for the XML event protocol
         this.setLabel(XML_EVENT_PROTOCOL_LABEL);
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolParameters.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolParameters.java
index 09a7f54aa..3c0011c24 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolParameters.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/YamlEventProtocolParameters.java
@@ -69,18 +69,17 @@ public class YamlEventProtocolParameters extends EventProtocolTextTokenDelimited
      * the parameter service.
      */
     public YamlEventProtocolParameters() {
-        this(YamlEventProtocolParameters.class.getCanonicalName(), YAML_EVENT_PROTOCOL_LABEL);
+        this(YAML_EVENT_PROTOCOL_LABEL);
     }
 
     /**
      * Constructor to create an event protocol parameters instance with the name of a sub class of
      * this class.
      *
-     * @param parameterClassName the class name of a sub class of this class
      * @param eventProtocolLabel the name of the event protocol for this plugin
      */
-    public YamlEventProtocolParameters(final String parameterClassName, final String eventProtocolLabel) {
-        super(parameterClassName);
+    public YamlEventProtocolParameters(final String eventProtocolLabel) {
+        super();
 
         // Set the event protocol properties for the YAML event protocol
         this.setLabel(eventProtocolLabel);