Changes for Checkstyle 8.32

[policy/models.git] / models-tosca / src / main / java / org / onap / policy / models / tosca / authorative / provider / AuthorativeToscaProvider.java

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProvider.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProvider.java
index a4a6e59..c1d46bf 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProvider.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProvider.java
@@ -25,12 +25,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-
 import lombok.NonNull;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
@@ -56,6 +53,9 @@ import org.slf4j.LoggerFactory;
 public class AuthorativeToscaProvider {
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthorativeToscaProvider.class);
 
+    // TODO: In next release this locking mechanism should be removed and replaced with proper session handling
+    private static final Object providerLockObject = "providerLockObject";
+
     /**
      * Get policy types.
      *
@@ -68,14 +68,16 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate getPolicyTypes(@NonNull final PfDao dao, final String name, final String version)
         throws PfModelException {
 
-        LOGGER.debug("->getPolicyTypes: name={}, version={}", name, version);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getPolicyTypes: name={}, version={}", name, version);
 
-        JpaToscaServiceTemplate jpaServiceTemplate = new SimpleToscaProvider().getPolicyTypes(dao, name, version);
+            JpaToscaServiceTemplate jpaServiceTemplate = new SimpleToscaProvider().getPolicyTypes(dao, name, version);
 
-        ToscaServiceTemplate serviceTemplate = jpaServiceTemplate.toAuthorative();
+            ToscaServiceTemplate serviceTemplate = jpaServiceTemplate.toAuthorative();
 
-        LOGGER.debug("<-getPolicyTypes: name={}, version={}, serviceTemplate={}", name, version, serviceTemplate);
-        return serviceTemplate;
+            LOGGER.debug("<-getPolicyTypes: name={}, version={}, serviceTemplate={}", name, version, serviceTemplate);
+            return serviceTemplate;
+        }
     }
 
     /**
@@ -90,19 +92,21 @@ public class AuthorativeToscaProvider {
     public List<ToscaPolicyType> getPolicyTypeList(@NonNull final PfDao dao, final String name, final String version)
         throws PfModelException {
 
-        LOGGER.debug("->getPolicyTypeList: name={}, version={}", name, version);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getPolicyTypeList: name={}, version={}", name, version);
 
-        List<ToscaPolicyType> policyTypeList;
+            List<ToscaPolicyType> policyTypeList;
 
-        try {
-            policyTypeList = new ArrayList<>(
-                new SimpleToscaProvider().getPolicyTypes(dao, name, version).toAuthorative().getPolicyTypes().values());
-        } catch (PfModelRuntimeException pfme) {
-            return handlePfModelRuntimeException(pfme);
-        }
+            try {
+                policyTypeList = new ArrayList<>(new SimpleToscaProvider().getPolicyTypes(dao, name, version)
+                    .toAuthorative().getPolicyTypes().values());
+            } catch (PfModelRuntimeException pfme) {
+                return handlePfModelRuntimeException(pfme);
+            }
 
-        LOGGER.debug("<-getPolicyTypeList: name={}, version={}, policyTypeList={}", name, version, policyTypeList);
-        return policyTypeList;
+            LOGGER.debug("<-getPolicyTypeList: name={}, version={}, policyTypeList={}", name, version, policyTypeList);
+            return policyTypeList;
+        }
     }
 
     /**
@@ -116,34 +120,35 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate getFilteredPolicyTypes(@NonNull final PfDao dao,
         @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException {
 
-        LOGGER.debug("->getFilteredPolicyTypes: filter={}", filter);
-        SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getFilteredPolicyTypes: filter={}", filter);
+            SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
 
-        final JpaToscaServiceTemplate dbServiceTemplate = simpleToscaProvider.getPolicyTypes(dao, null, null);
+            final JpaToscaServiceTemplate dbServiceTemplate = simpleToscaProvider.getPolicyTypes(dao, null, null);
 
-        List<ToscaPolicyType> filteredPolicyTypes = dbServiceTemplate.getPolicyTypes().toAuthorativeList();
-        filteredPolicyTypes = filter.filter(filteredPolicyTypes);
+            List<ToscaPolicyType> filteredPolicyTypes = dbServiceTemplate.getPolicyTypes().toAuthorativeList();
+            filteredPolicyTypes = filter.filter(filteredPolicyTypes);
 
-        if (CollectionUtils.isEmpty(filteredPolicyTypes)) {
-            throw new PfModelRuntimeException(Response.Status.NOT_FOUND,
-                "policy types for filter " + filter.toString() + " do not exist");
-        }
-
-        JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
+            if (CollectionUtils.isEmpty(filteredPolicyTypes)) {
+                throw new PfModelRuntimeException(Response.Status.NOT_FOUND,
+                    "policy types for filter " + filter.toString() + " do not exist");
+            }
 
-        for (ToscaPolicyType policyType : filteredPolicyTypes) {
-            JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
-                .getCascadedPolicyTypes(dbServiceTemplate, policyType.getName(), policyType.getVersion());
+            JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
 
-            filteredServiceTemplate =
-                ToscaServiceTemplateUtils.addFragment(filteredServiceTemplate, cascadedServiceTemplate);
-        }
+            for (ToscaPolicyType policyType : filteredPolicyTypes) {
+                JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
+                    .getCascadedPolicyTypes(dbServiceTemplate, policyType.getName(), policyType.getVersion());
 
-        ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
+                filteredServiceTemplate =
+                    ToscaServiceTemplateUtils.addFragment(filteredServiceTemplate, cascadedServiceTemplate);
+            }
 
-        LOGGER.debug("<-getFilteredPolicyTypes: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
-        return returnServiceTemplate;
+            ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
 
+            LOGGER.debug("<-getFilteredPolicyTypes: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
+            return returnServiceTemplate;
+        }
     }
 
     /**
@@ -178,13 +183,15 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate createPolicyTypes(@NonNull final PfDao dao,
         @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
 
-        LOGGER.debug("->createPolicyTypes: serviceTemplate={}", serviceTemplate);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->createPolicyTypes: serviceTemplate={}", serviceTemplate);
 
-        ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
-            .createPolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
+            ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
+                .createPolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
 
-        LOGGER.debug("<-createPolicyTypes: createdServiceTempalate={}", createdServiceTempalate);
-        return createdServiceTempalate;
+            LOGGER.debug("<-createPolicyTypes: createdServiceTempalate={}", createdServiceTempalate);
+            return createdServiceTempalate;
+        }
     }
 
     /**
@@ -198,13 +205,15 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate updatePolicyTypes(@NonNull final PfDao dao,
         @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
 
-        LOGGER.debug("->updatePolicyTypes: serviceTempalate={}", serviceTemplate);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->updatePolicyTypes: serviceTempalate={}", serviceTemplate);
 
-        ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
-            .updatePolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
+            ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
+                .updatePolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
 
-        LOGGER.debug("<-updatePolicyTypes: updatedServiceTempalate={}", updatedServiceTempalate);
-        return updatedServiceTempalate;
+            LOGGER.debug("<-updatePolicyTypes: updatedServiceTempalate={}", updatedServiceTempalate);
+            return updatedServiceTempalate;
+        }
     }
 
     /**
@@ -219,14 +228,16 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate deletePolicyType(@NonNull final PfDao dao, @NonNull final String name,
         @NonNull final String version) throws PfModelException {
 
-        LOGGER.debug("->deletePolicyType: name={}, version={}", name, version);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->deletePolicyType: name={}, version={}", name, version);
 
-        ToscaServiceTemplate deletedServiceTempalate =
-            new SimpleToscaProvider().deletePolicyType(dao, new PfConceptKey(name, version)).toAuthorative();
+            ToscaServiceTemplate deletedServiceTempalate =
+                new SimpleToscaProvider().deletePolicyType(dao, new PfConceptKey(name, version)).toAuthorative();
 
-        LOGGER.debug("<-deletePolicyType: name={}, version={}, deletedServiceTempalate={}", name, version,
-            deletedServiceTempalate);
-        return deletedServiceTempalate;
+            LOGGER.debug("<-deletePolicyType: name={}, version={}, deletedServiceTempalate={}", name, version,
+                deletedServiceTempalate);
+            return deletedServiceTempalate;
+        }
     }
 
     /**
@@ -240,13 +251,17 @@ public class AuthorativeToscaProvider {
      */
     public ToscaServiceTemplate getPolicies(@NonNull final PfDao dao, final String name, final String version)
         throws PfModelException {
-        LOGGER.debug("->getPolicies: name={}, version={}", name, version);
 
-        ToscaServiceTemplate gotServiceTempalate =
-            new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative();
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getPolicies: name={}, version={}", name, version);
 
-        LOGGER.debug("<-getPolicies: name={}, version={}, gotServiceTempalate={}", name, version, gotServiceTempalate);
-        return gotServiceTempalate;
+            ToscaServiceTemplate gotServiceTempalate =
+                new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative();
+
+            LOGGER.debug("<-getPolicies: name={}, version={}, gotServiceTempalate={}", name, version,
+                gotServiceTempalate);
+            return gotServiceTempalate;
+        }
     }
 
     /**
@@ -260,19 +275,22 @@ public class AuthorativeToscaProvider {
      */
     public List<ToscaPolicy> getPolicyList(@NonNull final PfDao dao, final String name, final String version)
         throws PfModelException {
-        LOGGER.debug("->getPolicyList: name={}, version={}", name, version);
 
-        List<ToscaPolicy> policyList;
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getPolicyList: name={}, version={}", name, version);
 
-        try {
-            policyList = asConceptList(new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative()
-                .getToscaTopologyTemplate().getPolicies());
-        } catch (PfModelRuntimeException pfme) {
-            return handlePfModelRuntimeException(pfme);
-        }
+            List<ToscaPolicy> policyList;
 
-        LOGGER.debug("<-getPolicyList: name={}, version={}, policyTypeList={}", name, version, policyList);
-        return policyList;
+            try {
+                policyList = asConceptList(new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative()
+                    .getToscaTopologyTemplate().getPolicies());
+            } catch (PfModelRuntimeException pfme) {
+                return handlePfModelRuntimeException(pfme);
+            }
+
+            LOGGER.debug("<-getPolicyList: name={}, version={}, policyTypeList={}", name, version, policyList);
+            return policyList;
+        }
     }
 
     /**
@@ -286,35 +304,38 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate getFilteredPolicies(@NonNull final PfDao dao, @NonNull final ToscaPolicyFilter filter)
         throws PfModelException {
 
-        LOGGER.debug("->getFilteredPolicies: filter={}", filter);
-        String version = ToscaPolicyFilter.LATEST_VERSION.equals(filter.getVersion()) ? null : filter.getVersion();
+        synchronized (providerLockObject) {
+            LOGGER.debug("->getFilteredPolicies: filter={}", filter);
+            String version = ToscaPolicyFilter.LATEST_VERSION.equals(filter.getVersion()) ? null : filter.getVersion();
 
-        SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
-        final JpaToscaServiceTemplate dbServiceTemplate =
-            simpleToscaProvider.getPolicies(dao, filter.getName(), version);
+            SimpleToscaProvider simpleToscaProvider = new SimpleToscaProvider();
+            final JpaToscaServiceTemplate dbServiceTemplate =
+                simpleToscaProvider.getPolicies(dao, filter.getName(), version);
 
-        List<ToscaPolicy> filteredPolicies = dbServiceTemplate.getTopologyTemplate().getPolicies().toAuthorativeList();
-        filteredPolicies = filter.filter(filteredPolicies);
+            List<ToscaPolicy> filteredPolicies =
+                dbServiceTemplate.getTopologyTemplate().getPolicies().toAuthorativeList();
+            filteredPolicies = filter.filter(filteredPolicies);
 
-        if (CollectionUtils.isEmpty(filteredPolicies)) {
-            throw new PfModelRuntimeException(Response.Status.NOT_FOUND,
-                "policies for filter " + filter.toString() + " do not exist");
-        }
+            if (CollectionUtils.isEmpty(filteredPolicies)) {
+                throw new PfModelRuntimeException(Response.Status.NOT_FOUND,
+                    "policies for filter " + filter.toString() + " do not exist");
+            }
 
-        JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
+            JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
 
-        for (ToscaPolicy policy : filteredPolicies) {
-            JpaToscaServiceTemplate cascadedServiceTemplate =
-                simpleToscaProvider.getCascadedPolicies(dbServiceTemplate, policy.getName(), policy.getVersion());
+            for (ToscaPolicy policy : filteredPolicies) {
+                JpaToscaServiceTemplate cascadedServiceTemplate =
+                    simpleToscaProvider.getCascadedPolicies(dbServiceTemplate, policy.getName(), policy.getVersion());
 
-            filteredServiceTemplate =
-                ToscaServiceTemplateUtils.addFragment(filteredServiceTemplate, cascadedServiceTemplate);
-        }
+                filteredServiceTemplate =
+                    ToscaServiceTemplateUtils.addFragment(filteredServiceTemplate, cascadedServiceTemplate);
+            }
 
-        ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
+            ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
 
-        LOGGER.debug("<-getFilteredPolicies: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
-        return returnServiceTemplate;
+            LOGGER.debug("<-getFilteredPolicies: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
+            return returnServiceTemplate;
+        }
     }
 
     /**
@@ -348,13 +369,15 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate createPolicies(@NonNull final PfDao dao,
         @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
 
-        LOGGER.debug("->createPolicies: serviceTempalate={}", serviceTemplate);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->createPolicies: serviceTempalate={}", serviceTemplate);
 
-        ToscaServiceTemplate createdServiceTempalate =
-            new SimpleToscaProvider().createPolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
+            ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
+                .createPolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
 
-        LOGGER.debug("<-createPolicies: createdServiceTempalate={}", createdServiceTempalate);
-        return createdServiceTempalate;
+            LOGGER.debug("<-createPolicies: createdServiceTempalate={}", createdServiceTempalate);
+            return createdServiceTempalate;
+        }
     }
 
     /**
@@ -368,13 +391,15 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate updatePolicies(@NonNull final PfDao dao,
         @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
 
-        LOGGER.debug("->updatePolicies: serviceTempalate={}", serviceTemplate);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->updatePolicies: serviceTempalate={}", serviceTemplate);
 
-        ToscaServiceTemplate updatedServiceTempalate =
-            new SimpleToscaProvider().updatePolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
+            ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
+                .updatePolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
 
-        LOGGER.debug("<-updatePolicies: updatedServiceTempalate={}", updatedServiceTempalate);
-        return updatedServiceTempalate;
+            LOGGER.debug("<-updatePolicies: updatedServiceTempalate={}", updatedServiceTempalate);
+            return updatedServiceTempalate;
+        }
     }
 
     /**
@@ -389,14 +414,16 @@ public class AuthorativeToscaProvider {
     public ToscaServiceTemplate deletePolicy(@NonNull final PfDao dao, @NonNull final String name,
         @NonNull final String version) throws PfModelException {
 
-        LOGGER.debug("->deletePolicy: name={}, version={}", name, version);
+        synchronized (providerLockObject) {
+            LOGGER.debug("->deletePolicy: name={}, version={}", name, version);
 
-        ToscaServiceTemplate deletedServiceTempalate =
-            new SimpleToscaProvider().deletePolicy(dao, new PfConceptKey(name, version)).toAuthorative();
+            ToscaServiceTemplate deletedServiceTempalate =
+                new SimpleToscaProvider().deletePolicy(dao, new PfConceptKey(name, version)).toAuthorative();
 
-        LOGGER.debug("<-deletePolicy: name={}, version={}, deletedServiceTempalate={}", name, version,
-            deletedServiceTempalate);
-        return deletedServiceTempalate;
+            LOGGER.debug("<-deletePolicy: name={}, version={}, deletedServiceTempalate={}", name, version,
+                deletedServiceTempalate);
+            return deletedServiceTempalate;
+        }
     }
 
     /**