X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Fstartstop%2FApiDatabaseInitializer.java;h=cbd89cb87966df8fa073a3361ac744480ae7bc30;hb=76a55e031b319caa4f5c0cbc47cb983f9eee3176;hp=199b6bd6745a426eb302f0f34bf0fe4f5da2e005;hpb=42870e74260239d84b048bdd23b9f113362f1a4a;p=policy%2Fapi.git

diff --git a/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java b/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
index 199b6bd6..cbd89cb8 100644
--- a/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
+++ b/main/src/main/java/org/onap/policy/api/main/startstop/ApiDatabaseInitializer.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy API
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +32,12 @@ import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardYamlCoder;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.base.PfModelException;
+import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.provider.PolicyModelsProvider;
 import org.onap.policy.models.provider.PolicyModelsProviderFactory;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaDataType;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeFilter;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
 import org.slf4j.Logger;
@@ -70,6 +72,12 @@ public class ApiDatabaseInitializer {
 
         try (PolicyModelsProvider databaseProvider =
                 factory.createPolicyModelsProvider(apiParameterGroup.getDatabaseProviderParameters())) {
+
+            if (alreadyExists(databaseProvider)) {
+                LOGGER.warn("DB already contains policy data - skipping preload");
+                return;
+            }
+
             ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate();
             serviceTemplate.setDataTypes(new LinkedHashMap<String, ToscaDataType>());
             serviceTemplate.setPolicyTypes(new LinkedHashMap<String, ToscaPolicyType>());
@@ -84,6 +92,21 @@ public class ApiDatabaseInitializer {
         }
     }
 
+    private boolean alreadyExists(PolicyModelsProvider databaseProvider) throws PfModelException {
+        try {
+            ToscaServiceTemplate serviceTemplate =
+                            databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build());
+            if (!serviceTemplate.getPolicyTypes().isEmpty()) {
+                return true;
+            }
+
+        } catch (PfModelRuntimeException e) {
+            LOGGER.trace("DB does not yet contain policy types", e);
+        }
+
+        return false;
+    }
+
     private ToscaServiceTemplate preloadServiceTemplate(ToscaServiceTemplate serviceTemplate,
             List<String> entities, FunctionWithEx<ToscaServiceTemplate, ToscaServiceTemplate> getter)
                     throws PolicyApiException, CoderException, PfModelException {