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;
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.
*
* @throws PfModelException on errors getting policy types
*/
public ToscaServiceTemplate getPolicyTypes(@NonNull final PfDao dao, final String name, final String version)
- throws PfModelException {
+ 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;
+ }
}
/**
* @throws PfModelException on errors getting policy types
*/
public List<ToscaPolicyType> getPolicyTypeList(@NonNull final PfDao dao, final String name, final String version)
- throws PfModelException {
+ 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)
+ try {
+ policyTypeList = new ArrayList<>(new SimpleToscaProvider().getPolicyTypes(dao, name, version)
.toAuthorative().getPolicyTypes().values());
- } catch (PfModelRuntimeException pfme) {
- return handlePfModelRuntimeException(pfme);
- }
+ } 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;
+ }
}
/**
* @throws PfModelException on errors getting policy types
*/
public ToscaServiceTemplate getFilteredPolicyTypes(@NonNull final PfDao dao,
- @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException {
+ @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 =
- new ArrayList<>(dbServiceTemplate.toAuthorative().getPolicyTypes().values());
- 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,
+ if (CollectionUtils.isEmpty(filteredPolicyTypes)) {
+ throw new PfModelRuntimeException(Response.Status.NOT_FOUND,
"policy types for filter " + filter.toString() + " do not exist");
- }
+ }
- JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
+ JpaToscaServiceTemplate filteredServiceTemplate = new JpaToscaServiceTemplate();
- for (ToscaPolicyType policyType : filteredPolicyTypes) {
- JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
+ for (ToscaPolicyType policyType : filteredPolicyTypes) {
+ JpaToscaServiceTemplate cascadedServiceTemplate = simpleToscaProvider
.getCascadedPolicyTypes(dbServiceTemplate, policyType.getName(), policyType.getVersion());
- filteredServiceTemplate =
+ filteredServiceTemplate =
ToscaServiceTemplateUtils.addFragment(filteredServiceTemplate, cascadedServiceTemplate);
- }
+ }
- ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
+ ToscaServiceTemplate returnServiceTemplate = filteredServiceTemplate.toAuthorative();
- LOGGER.debug("<-getFilteredPolicyTypes: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
- return returnServiceTemplate;
+ LOGGER.debug("<-getFilteredPolicyTypes: filter={}, serviceTemplate={}", filter, returnServiceTemplate);
+ return returnServiceTemplate;
+ }
}
/**
* @throws PfModelException on errors getting policy types
*/
public List<ToscaPolicyType> getFilteredPolicyTypeList(@NonNull final PfDao dao,
- @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException {
+ @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException {
LOGGER.debug("->getFilteredPolicyTypeList: filter={}", filter);
List<ToscaPolicyType> filteredPolicyTypeList = filter.filter(getPolicyTypeList(dao, null, null));
LOGGER.debug("<-getFilteredPolicyTypeList: filter={}, filteredPolicyTypeList={}", filter,
- filteredPolicyTypeList);
+ filteredPolicyTypeList);
return filteredPolicyTypeList;
}
* @throws PfModelException on errors creating policy types
*/
public ToscaServiceTemplate createPolicyTypes(@NonNull final PfDao dao,
- @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
+ @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
- LOGGER.debug("->createPolicyTypes: serviceTemplate={}", serviceTemplate);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->createPolicyTypes: serviceTemplate={}", serviceTemplate);
- ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
+ ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
.createPolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
- LOGGER.debug("<-createPolicyTypes: createdServiceTempalate={}", createdServiceTempalate);
- return createdServiceTempalate;
+ LOGGER.debug("<-createPolicyTypes: createdServiceTempalate={}", createdServiceTempalate);
+ return createdServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors updating policy types
*/
public ToscaServiceTemplate updatePolicyTypes(@NonNull final PfDao dao,
- @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
+ @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
- LOGGER.debug("->updatePolicyTypes: serviceTempalate={}", serviceTemplate);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->updatePolicyTypes: serviceTempalate={}", serviceTemplate);
- ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
+ ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
.updatePolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
- LOGGER.debug("<-updatePolicyTypes: updatedServiceTempalate={}", updatedServiceTempalate);
- return updatedServiceTempalate;
+ LOGGER.debug("<-updatePolicyTypes: updatedServiceTempalate={}", updatedServiceTempalate);
+ return updatedServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors deleting policy types
*/
public ToscaServiceTemplate deletePolicyType(@NonNull final PfDao dao, @NonNull final String name,
- @NonNull final String version) throws PfModelException {
+ @NonNull final String version) throws PfModelException {
- LOGGER.debug("->deletePolicyType: name={}, version={}", name, version);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->deletePolicyType: name={}, version={}", name, version);
- ToscaServiceTemplate deletedServiceTempalate =
+ ToscaServiceTemplate deletedServiceTempalate =
new SimpleToscaProvider().deletePolicyType(dao, new PfConceptKey(name, version)).toAuthorative();
- LOGGER.debug("<-deletePolicyType: name={}, version={}, deletedServiceTempalate={}", name, version,
+ LOGGER.debug("<-deletePolicyType: name={}, version={}, deletedServiceTempalate={}", name, version,
deletedServiceTempalate);
- return deletedServiceTempalate;
+ return deletedServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors getting policies
*/
public ToscaServiceTemplate getPolicies(@NonNull final PfDao dao, final String name, final String version)
- throws PfModelException {
- LOGGER.debug("->getPolicies: name={}, version={}", name, version);
+ throws PfModelException {
- ToscaServiceTemplate gotServiceTempalate =
+ synchronized (providerLockObject) {
+ LOGGER.debug("->getPolicies: name={}, version={}", name, version);
+
+ ToscaServiceTemplate gotServiceTempalate =
new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative();
- LOGGER.debug("<-getPolicies: name={}, version={}, gotServiceTempalate={}", name, version, gotServiceTempalate);
- return gotServiceTempalate;
+ LOGGER.debug("<-getPolicies: name={}, version={}, gotServiceTempalate={}", name, version,
+ gotServiceTempalate);
+ return gotServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors getting policies
*/
public List<ToscaPolicy> getPolicyList(@NonNull final PfDao dao, final String name, final String version)
- throws PfModelException {
- LOGGER.debug("->getPolicyList: name={}, version={}", name, version);
+ throws PfModelException {
- List<ToscaPolicy> policyList;
+ synchronized (providerLockObject) {
+ LOGGER.debug("->getPolicyList: name={}, version={}", name, version);
- try {
- policyList = asConceptList(new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative()
+ List<ToscaPolicy> policyList;
+
+ try {
+ policyList = asConceptList(new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative()
.getToscaTopologyTemplate().getPolicies());
- } catch (PfModelRuntimeException pfme) {
- return handlePfModelRuntimeException(pfme);
- }
+ } catch (PfModelRuntimeException pfme) {
+ return handlePfModelRuntimeException(pfme);
+ }
- LOGGER.debug("<-getPolicyList: name={}, version={}, policyTypeList={}", name, version, policyList);
- return policyList;
+ LOGGER.debug("<-getPolicyList: name={}, version={}, policyTypeList={}", name, version, policyList);
+ return policyList;
+ }
}
/**
* @throws PfModelException on errors getting policies
*/
public ToscaServiceTemplate getFilteredPolicies(@NonNull final PfDao dao, @NonNull final ToscaPolicyFilter filter)
- throws PfModelException {
+ 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 simpleToscaProvider = new SimpleToscaProvider();
+ final JpaToscaServiceTemplate dbServiceTemplate =
simpleToscaProvider.getPolicies(dao, filter.getName(), version);
- List<ToscaPolicy> filteredPolicies =
- asConceptList(dbServiceTemplate.toAuthorative().getToscaTopologyTemplate().getPolicies());
- 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,
+ 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 =
+ for (ToscaPolicy policy : filteredPolicies) {
+ JpaToscaServiceTemplate cascadedServiceTemplate =
simpleToscaProvider.getCascadedPolicies(dbServiceTemplate, policy.getName(), policy.getVersion());
- filteredServiceTemplate =
+ 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;
+ }
}
/**
* @throws PfModelException on errors getting policies
*/
public List<ToscaPolicy> getFilteredPolicyList(@NonNull final PfDao dao, @NonNull final ToscaPolicyFilter filter)
- throws PfModelException {
+ throws PfModelException {
LOGGER.debug("->getFilteredPolicyList: filter={}", filter);
String version = ToscaPolicyFilter.LATEST_VERSION.equals(filter.getVersion()) ? null : filter.getVersion();
* @throws PfModelException on errors creating policies
*/
public ToscaServiceTemplate createPolicies(@NonNull final PfDao dao,
- @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
+ @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
- LOGGER.debug("->createPolicies: serviceTempalate={}", serviceTemplate);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->createPolicies: serviceTempalate={}", serviceTemplate);
- ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
+ ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider()
.createPolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
- LOGGER.debug("<-createPolicies: createdServiceTempalate={}", createdServiceTempalate);
- return createdServiceTempalate;
+ LOGGER.debug("<-createPolicies: createdServiceTempalate={}", createdServiceTempalate);
+ return createdServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors updating policies
*/
public ToscaServiceTemplate updatePolicies(@NonNull final PfDao dao,
- @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
+ @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException {
- LOGGER.debug("->updatePolicies: serviceTempalate={}", serviceTemplate);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->updatePolicies: serviceTempalate={}", serviceTemplate);
- ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
+ ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider()
.updatePolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative();
- LOGGER.debug("<-updatePolicies: updatedServiceTempalate={}", updatedServiceTempalate);
- return updatedServiceTempalate;
+ LOGGER.debug("<-updatePolicies: updatedServiceTempalate={}", updatedServiceTempalate);
+ return updatedServiceTempalate;
+ }
}
/**
* @throws PfModelException on errors deleting policies
*/
public ToscaServiceTemplate deletePolicy(@NonNull final PfDao dao, @NonNull final String name,
- @NonNull final String version) throws PfModelException {
+ @NonNull final String version) throws PfModelException {
- LOGGER.debug("->deletePolicy: name={}, version={}", name, version);
+ synchronized (providerLockObject) {
+ LOGGER.debug("->deletePolicy: name={}, version={}", name, version);
- ToscaServiceTemplate deletedServiceTempalate =
+ ToscaServiceTemplate deletedServiceTempalate =
new SimpleToscaProvider().deletePolicy(dao, new PfConceptKey(name, version)).toAuthorative();
- LOGGER.debug("<-deletePolicy: name={}, version={}, deletedServiceTempalate={}", name, version,
+ LOGGER.debug("<-deletePolicy: name={}, version={}, deletedServiceTempalate={}", name, version,
deletedServiceTempalate);
- return deletedServiceTempalate;
+ return deletedServiceTempalate;
+ }
}
/**
Code Review / policy / models.git / blobdiff