aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/templates
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/templates')
-rw-r--r--controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties4
-rw-r--r--controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties6
2 files changed, 5 insertions, 5 deletions
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
index cc95d5530..edb828676 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
@@ -26,7 +26,7 @@ dmaap.source.topics.${dcaeTopic}.servers=${dcaeServers}
dmaap.source.topics.${dcaeTopic}.apiKey=
dmaap.source.topics.${dcaeTopic}.apiSecret=
dmaap.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
+dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)]
dmaap.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
dmaap.source.topics.${dcaeTopic}.https=true
@@ -34,7 +34,7 @@ dmaap.source.topics.APPC-CL.servers=${dmaapServers}
dmaap.source.topics.APPC-CL.apiKey=
dmaap.source.topics.APPC-CL.apiSecret=
dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)]
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)]
dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
dmaap.source.topics.APPC-CL.https=true
diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
index fb516ed13..8314f4861 100644
--- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
@@ -26,14 +26,14 @@ dmaap.source.topics.${brmsgwTopic}.servers=${brmsgwServers}
dmaap.source.topics.${brmsgwTopic}.apiKey=
dmaap.source.topics.${brmsgwTopic}.apiSecret=
dmaap.source.topics.${brmsgwTopic}.events=org.onap.policy.controlloop.params.ControlLoopParams
-dmaap.source.topics.${brmsgwTopic}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName =~ /.*/ && $.controlLoopYaml =~ /.*/)]
+dmaap.source.topics.${brmsgwTopic}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName && $.controlLoopYaml)]
dmaap.source.topics.${brmsgwTopic}.https=true
dmaap.source.topics.${dcaeTopic}.servers=${dcaeServers}
dmaap.source.topics.${dcaeTopic}.apiKey=
dmaap.source.topics.${dcaeTopic}.apiSecret=
dmaap.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)]
+dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)]
dmaap.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
dmaap.source.topics.${dcaeTopic}.https=true
@@ -41,7 +41,7 @@ dmaap.source.topics.APPC-CL.servers=${dmaapServers}
dmaap.source.topics.APPC-CL.apiKey=
dmaap.source.topics.APPC-CL.apiSecret=
dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)]
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)]
dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
dmaap.source.topics.APPC-CL.https=true