| commit | d0f378288adfd05420f11e7a777d46a07ae9cdb0 | [log] [tgz] |
|---|---|---|
| author | aravind.est <aravindhan.a@est.tech> | Wed Aug 28 17:57:57 2024 +0100 |
| committer | aravind.est <aravindhan.a@est.tech> | Thu Aug 29 14:01:37 2024 +0100 |
| tree | 82d2954f6bfc0ad352df5a2650497a38b2087a5e | |
| parent | aa14206e61fe230a65dbc8ca0b46d9155b5736ff [diff] |
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>
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index 87cc897..cd8b31f 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 305499d..9c489a3 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 @@ @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 f463ecd..426e1c4 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 @@ @DependsOn({ "springContextProvider", "flywayInitializer" }) public PolicyTypes getPolicyTypes(@Autowired ApplicationConfig applicationConfig) { PolicyTypes types = new PolicyTypes(applicationConfig); - types.restoreFromDatabase().blockLast(); + types.restoreFromDatabase().subscribe(); return types; }