X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-application%2Fsrc%2Fmain%2Fresources%2Fapplication.yml;h=e3ffd04d7b5137174b61b8837b538c3e33cc0c0a;hb=42cf9c4ca24b4a5990b33d6d2578a27eda230f27;hp=723e2ca1966397b266d0bb8dd8a93636d00ea779;hpb=f5cad5a6d75d0072fb3be7347cccd50ecfa120ae;p=cps.git

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 723e2ca19..e3ffd04d7 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 #  ============LICENSE_START=======================================================
 #  Copyright (C) 2021 Pantheon.tech
-#  Modifications Copyright (C) 2021 Bell Canada
+#  Modifications Copyright (C) 2021-2022 Bell Canada
 #  Modifications Copyright (C) 2021-2022 Nordix Foundation
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,7 @@ spring:
     application:
         name: "cps-application"
     jpa:
+        show-sql: false
         ddl-auto: create
         open-in-view: false
         properties:
@@ -45,7 +46,13 @@ spring:
         username: ${DB_USERNAME}
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver
-        initialization-mode: always
+        hikari:
+            minimumIdle: 5
+            maximumPoolSize: 80
+            idleTimeout: 60000
+            connectionTimeout: 120000
+            leakDetectionThreshold: 30000
+            pool-name: CpsDatabasePool
 
     cache:
         type: caffeine
@@ -70,22 +77,45 @@ spring:
         producer:
             value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
             client-id: cps-core
+        consumer:
+            group-id: ${NCMP_CONSUMER_GROUP_ID:ncmp-group}
+            key-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
+            value-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
+            properties:
+                spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer
+                spring.deserializer.value.delegate.class: org.springframework.kafka.support.serializer.JsonDeserializer
+                spring.json.value.default.type: org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent
+                spring.json.use.type.headers: false
+
+    jackson:
+      default-property-inclusion: NON_NULL
+      serialization:
+        FAIL_ON_EMPTY_BEANS: false
+    sql:
+      init:
+        mode: ALWAYS
+app:
+    ncmp:
+        async-m2m:
+            topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
+    lcm:
+        events:
+            topic: ${LCM_EVENTS_TOPIC:ncmp-events}
 
 notification:
+    enabled: true
     data-updated:
-        enabled: false
         topic: ${CPS_CHANGE_EVENT_TOPIC:cps.data-updated-events}
         filters:
             enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}
     async:
-        enabled: false
         executor:
             core-pool-size: 2
             max-pool-size: 10
             queue-capacity: 500
             wait-for-tasks-to-complete-on-shutdown: true
             thread-name-prefix: Async-
-
+            time-out-value-in-ms: 2000
 
 springdoc:
     swagger-ui:
@@ -124,15 +154,28 @@ management:
                 enabled: true
 
 logging:
+    format: json
     level:
         org:
             springframework: INFO
             onap:
                 cps: INFO
-
-dmi:
-    auth:
-        username: ${DMI_USERNAME}
-        password: ${DMI_PASSWORD}
-    api:
-        base-path: /dmi
+ncmp:
+    dmi:
+        auth:
+            username: ${DMI_USERNAME}
+            password: ${DMI_PASSWORD}
+        api:
+            base-path: dmi
+
+    timers:
+        advised-modules-sync:
+            sleep-time-ms: 5000
+        locked-modules-sync:
+            sleep-time-ms: 300000
+        cm-handle-data-sync:
+            sleep-time-ms: 30000
+
+    modules-sync-watchdog:
+        async-executor:
+            parallelism-level: 10
\ No newline at end of file