aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--a1-policy-management/pom.xml3
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/DatabaseIndependentBeanFactory.java2
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/database/DatabaseDependentBeanFactory.java2
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;
}