From d0f378288adfd05420f11e7a777d46a07ae9cdb0 Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Wed, 28 Aug 2024 17:57:57 +0100
Subject: Fix database support with latest spring boot upgrade

Database support fixed with the latest spring boot upgrade.

Issue-ID: CCSDK-4033
Change-Id: I852d8e4f7476c602be6e976b14c735cd1409ee6d
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---
 a1-policy-management/pom.xml                                           | 3 ++-
 .../oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java | 2 +-
 .../database/DatabaseDependentBeanFactory.java                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 87cc8977..cd8b31f5 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -104,7 +104,8 @@
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java
index 305499d0..9c489a30 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java
@@ -46,7 +46,7 @@ public class DatabaseIndependentBeanFactory {
     @Bean
     public PolicyTypes getPolicyTypes(@Autowired ApplicationConfig applicationConfig) {
         PolicyTypes types = new PolicyTypes(applicationConfig);
-        types.restoreFromDatabase().blockLast();
+        types.restoreFromDatabase().subscribe();
         return types;
     }
 
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/database/DatabaseDependentBeanFactory.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/database/DatabaseDependentBeanFactory.java
index f463ecd0..426e1c47 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/database/DatabaseDependentBeanFactory.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/database/DatabaseDependentBeanFactory.java
@@ -45,7 +45,7 @@ public class DatabaseDependentBeanFactory {
     @DependsOn({ "springContextProvider", "flywayInitializer" })
     public PolicyTypes getPolicyTypes(@Autowired ApplicationConfig applicationConfig) {
         PolicyTypes types = new PolicyTypes(applicationConfig);
-        types.restoreFromDatabase().blockLast();
+        types.restoreFromDatabase().subscribe();
         return types;
     }
 
-- 
cgit 1.2.3-korg