Revert Spring Boot Uplift

[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 7beab2e..9f03fc2 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #  Copyright (C) 2021 Pantheon.tech
 #  Modifications Copyright (C) 2021-2022 Bell Canada
-#  Modifications Copyright (C) 2021-2023 Nordix Foundation
+#  Modifications Copyright (C) 2021-2024 Nordix Foundation
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -39,6 +39,9 @@ spring:
         properties:
             hibernate.enable_lazy_load_no_trans: true
             hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
+            # Please ensure these values match those used in integration-test/src/test/resources/application.yml
+            hibernate.id.new_generator_mappings: true
+            hibernate.jdbc.batch_size: 100
 
     datasource:
         url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
@@ -114,10 +117,6 @@ app:
 
 notification:
     enabled: true
-    data-updated:
-        topic: ${CPS_CHANGE_EVENT_TOPIC:cps.data-updated-events}
-        filters:
-            enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}
     async:
         executor:
             core-pool-size: 2
@@ -139,21 +138,19 @@ springdoc:
             - name: cps-ncmp-inventory
               url: /api-docs/cps-ncmp/openapi-inventory.yaml
 
-permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
+
 
 security:
     # comma-separated uri patterns which do not require authorization
+    permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**,/v3/api-docs/**
     auth:
         username: ${CPS_USERNAME}
         password: ${CPS_PASSWORD}
 
 # Actuator
 management:
-    server:
-        port: 8081
     endpoints:
         web:
-            base-path: /manage
             exposure:
                 include: info,health,loggers,prometheus
     endpoint:
@@ -172,6 +169,11 @@ logging:
                 cps: INFO
 ncmp:
     dmi:
+        httpclient:
+            connectionTimeoutInSeconds: 180
+            maximumConnectionsPerRoute: 50
+            maximumConnectionsTotal: 100
+            idleConnectionEvictionThresholdInSeconds: 5
         auth:
             username: ${DMI_USERNAME}
             password: ${DMI_PASSWORD}
@@ -198,7 +200,6 @@ ncmp:
             parallelism-level: 10
 
     model-loader:
-        subscription: true
         maximum-attempt-count: 20
 
 # Custom Hazelcast Config.
@@ -207,4 +208,4 @@ hazelcast:
     mode:
         kubernetes:
             enabled: ${HAZELCAST_MODE_KUBERNETES_ENABLED:false}
-            service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"}
\ No newline at end of file
+            service-name: ${CPS_NCMP_SERVICE_NAME:"cps-and-ncmp-service"}