summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-11-05 12:21:42 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-05 12:21:42 +0000
commit262c8cbc5d92d22afee12451dca72d13b514f826 (patch)
treefdc8dce37d16a0ec1e9228e8f7e22bdfae26b811
parentd7eda87db76d8afafb59b88c2ca22e6e89cbada0 (diff)
parent8fb42ecb71ef40366af515c06ba5c31571a95caa (diff)
Merge "Fixing multiple policies with optional event fields fails execution in APEX"
-rw-r--r--model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java3
-rw-r--r--model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java3
2 files changed, 2 insertions, 4 deletions
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 e7a9a2af5..176699184 100644
--- 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 1dd2ecb7a..f224739eb 100644
--- 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());
}
}