Fixing multiple policies with optional event fields fails execution in APEX

Policy execution fails when multiple policy models are running and the policies have optional fields.

Change-Id: Ifb1a45a25e3a88b8707fb8b76f8279b6ec0b91ce
Issue-ID: POLICY-2211
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java
index e7a9a2a..1766991 100644 (file)
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
@@ -99,6 +98,6 @@ public class AxInputField extends AxField {
      * @param field the input field to copy from
      */
     public AxInputField(final AxInputField field) {
-        super(new AxReferenceKey(field.getKey()), new AxArtifactKey(field.getSchema()));
+        super(new AxReferenceKey(field.getKey()), new AxArtifactKey(field.getSchema()), field.getOptional());
     }
 }

diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java
index 1dd2ecb..f224739 100644 (file)
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
 
@@ -99,6 +98,6 @@ public class AxOutputField extends AxField {
      * @param field the output field to copy from
      */
     public AxOutputField(final AxOutputField field) {
-        super(new AxReferenceKey(field.getKey()), new AxArtifactKey(field.getSchema()));
+        super(new AxReferenceKey(field.getKey()), new AxArtifactKey(field.getSchema()), field.getOptional());
     }
 }