Merge "Ordering of leaf elements to support combination of AND/OR in cps-path"

[cps.git] / cps-application / src / main / resources / application.yml

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index b5b10b0..6d45835 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================\r
 #  Copyright (C) 2021 Pantheon.tech\r
 #  Modifications Copyright (C) 2021-2022 Bell Canada\r
-#  Modifications Copyright (C) 2021-2022 Nordix Foundation\r
+#  Modifications Copyright (C) 2021-2023 Nordix Foundation\r
 #  ================================================================================\r
 #  Licensed under the Apache License, Version 2.0 (the "License");\r
 #  you may not use this file except in compliance with the License.\r
@@ -84,25 +84,29 @@ spring:
             properties:\r
                 spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer\r
                 spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer\r
-                spring.json.value.default.type: org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent\r
                 spring.json.use.type.headers: false\r
 \r
     jackson:\r
-      default-property-inclusion: NON_NULL\r
-      serialization:\r
-        FAIL_ON_EMPTY_BEANS: false\r
+        default-property-inclusion: NON_NULL\r
+        serialization:\r
+            FAIL_ON_EMPTY_BEANS: false\r
     sql:\r
-      init:\r
-        mode: ALWAYS\r
+        init:\r
+            mode: ALWAYS\r
 app:\r
     ncmp:\r
         async-m2m:\r
             topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}\r
         avc:\r
             subscription-topic: ${NCMP_CM_AVC_SUBSCRIPTION:cm-avc-subscription}\r
+            cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}\r
     lcm:\r
         events:\r
             topic: ${LCM_EVENTS_TOPIC:ncmp-events}\r
+    dmi:\r
+        cm-events:\r
+            topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}\r
+\r
 \r
 notification:\r
     enabled: true\r
@@ -180,4 +184,14 @@ ncmp:
 \r
     modules-sync-watchdog:\r
         async-executor:\r
-            parallelism-level: 10
\ No newline at end of file
+            parallelism-level: 10\r
+\r
+    model-loader:\r
+        subscription: false\r
+\r
+# Custom Hazelcast Config.\r
+hazelcast:\r
+  mode:\r
+    kubernetes:\r
+      enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false}\r
+      service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"}
\ No newline at end of file