X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-tosca%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Ftosca%2Fauthorative%2Fprovider%2FAuthorativeToscaProvider.java;h=e41281d7fbe3f338ea707f0514d379fc4310edaa;hb=8b0db1349f7367f94586d237f2fa2a500e9beec7;hp=2b6c25e7a9ab3b9b79d9613c34b69e352e9533cd;hpb=defa996aa95c11a6252604498a1e775134c34f2e;p=policy%2Fmodels.git 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 2b6c25e7a..e41281d7f 100644 --- 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 @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,18 +22,23 @@ package org.onap.policy.models.tosca.authorative.provider; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; - +import java.util.Map; import lombok.NonNull; - import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.dao.PfDao; +import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyFilter; 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.simple.concepts.JpaToscaServiceTemplate; import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class provides the provision of information on TOSCA concepts in the database to callers. @@ -40,6 +46,8 @@ import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider; * @author Liam Fallon (liam.fallon@est.tech) */ public class AuthorativeToscaProvider { + private static final Logger LOGGER = LoggerFactory.getLogger(AuthorativeToscaProvider.class); + /** * Get policy types. * @@ -52,7 +60,13 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate getPolicyTypes(@NonNull final PfDao dao, final String name, final String version) throws PfModelException { - return new SimpleToscaProvider().getPolicyTypes(dao, new PfConceptKey(name, version)).toAuthorative(); + LOGGER.debug("->getPolicyTypes: name={}, version={}", name, version); + + ToscaServiceTemplate serviceTemplate = + new SimpleToscaProvider().getPolicyTypes(dao, name, version).toAuthorative(); + + LOGGER.debug("<-getPolicyTypes: name={}, version={}, serviceTemplate={}", name, version, serviceTemplate); + return serviceTemplate; } /** @@ -66,33 +80,59 @@ public class AuthorativeToscaProvider { */ public List getPolicyTypeList(@NonNull final PfDao dao, final String name, final String version) throws PfModelException { - return new ArrayList<>(); + + LOGGER.debug("->getPolicyTypeList: name={}, version={}", name, version); + + List policyTypeList = asConceptList( + new SimpleToscaProvider().getPolicyTypes(dao, name, version).toAuthorative().getPolicyTypes()); + + LOGGER.debug("<-getPolicyTypeList: name={}, version={}, policyTypeList={}", name, version, policyTypeList); + return policyTypeList; } /** - * Get latest policy types. + * Get filtered policy types. * * @param dao the DAO to use to access the database - * @param name the name of the policy type to get, set to null to get all policy types + * @param filter the filter for the policy types to get * @return the policy types found * @throws PfModelException on errors getting policy types */ - public ToscaServiceTemplate getLatestPolicyTypes(@NonNull final PfDao dao, final String name) - throws PfModelException { - return null; + public ToscaServiceTemplate getFilteredPolicyTypes(@NonNull final PfDao dao, + @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException { + + LOGGER.debug("->getFilteredPolicyTypes: filter={}", filter); + + ToscaServiceTemplate serviceTemplate = + new SimpleToscaProvider().getPolicyTypes(dao, null, null).toAuthorative(); + + List filteredPolicyTypes = asConceptList(serviceTemplate.getPolicyTypes()); + filteredPolicyTypes = filter.filter(filteredPolicyTypes); + + serviceTemplate.setPolicyTypes(asConceptMap(filteredPolicyTypes)); + + LOGGER.debug("<-getFilteredPolicyTypes: filter={}, serviceTemplate={}", filter, serviceTemplate); + return serviceTemplate; } /** - * Get latest policy types. + * Get filtered policy types. * * @param dao the DAO to use to access the database - * @param name the name of the policy type to get, set to null to get all policy types + * @param filter the filter for the policy types to get * @return the policy types found * @throws PfModelException on errors getting policy types */ - public List getLatestPolicyTypeList(@NonNull final PfDao dao, final String name) - throws PfModelException { - return new ArrayList<>(); + public List getFilteredPolicyTypeList(@NonNull final PfDao dao, + @NonNull final ToscaPolicyTypeFilter filter) throws PfModelException { + + LOGGER.debug("->getFilteredPolicyTypeList: filter={}", filter); + + List filteredPolicyTypeList = filter.filter(getPolicyTypeList(dao, null, null)); + + LOGGER.debug("<-getFilteredPolicyTypeList: filter={}, filteredPolicyTypeList={}", filter, + filteredPolicyTypeList); + return filteredPolicyTypeList; } /** @@ -106,8 +146,13 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate createPolicyTypes(@NonNull final PfDao dao, @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException { - return new SimpleToscaProvider().createPolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)) - .toAuthorative(); + LOGGER.debug("->createPolicyTypes: serviceTemplate={}", serviceTemplate); + + ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider() + .createPolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative(); + + LOGGER.debug("<-createPolicyTypes: createdServiceTempalate={}", createdServiceTempalate); + return createdServiceTempalate; } /** @@ -121,8 +166,13 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate updatePolicyTypes(@NonNull final PfDao dao, @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException { - return new SimpleToscaProvider().updatePolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)) - .toAuthorative(); + LOGGER.debug("->updatePolicyTypes: serviceTempalate={}", serviceTemplate); + + ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider() + .updatePolicyTypes(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative(); + + LOGGER.debug("<-updatePolicyTypes: updatedServiceTempalate={}", updatedServiceTempalate); + return updatedServiceTempalate; } /** @@ -137,7 +187,14 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate deletePolicyType(@NonNull final PfDao dao, @NonNull final String name, @NonNull final String version) throws PfModelException { - return new SimpleToscaProvider().deletePolicyType(dao, new PfConceptKey(name, version)).toAuthorative(); + LOGGER.debug("->deletePolicyType: name={}, version={}", name, version); + + ToscaServiceTemplate deletedServiceTempalate = + new SimpleToscaProvider().deletePolicyType(dao, new PfConceptKey(name, version)).toAuthorative(); + + LOGGER.debug("<-deletePolicyType: name={}, version={}, deletedServiceTempalate={}", name, version, + deletedServiceTempalate); + return deletedServiceTempalate; } /** @@ -149,10 +206,15 @@ public class AuthorativeToscaProvider { * @return the policies found * @throws PfModelException on errors getting policies */ - public ToscaServiceTemplate getPolicies(@NonNull final PfDao dao, @NonNull final String name, - @NonNull final String version) throws PfModelException { + public ToscaServiceTemplate getPolicies(@NonNull final PfDao dao, final String name, final String version) + throws PfModelException { + LOGGER.debug("->getPolicies: name={}, version={}", name, version); - return new SimpleToscaProvider().getPolicies(dao, new PfConceptKey(name, version)).toAuthorative(); + ToscaServiceTemplate gotServiceTempalate = + new SimpleToscaProvider().getPolicies(dao, name, version).toAuthorative(); + + LOGGER.debug("<-getPolicies: name={}, version={}, gotServiceTempalate={}", name, version, gotServiceTempalate); + return gotServiceTempalate; } /** @@ -166,61 +228,59 @@ public class AuthorativeToscaProvider { */ public List getPolicyList(@NonNull final PfDao dao, final String name, final String version) throws PfModelException { - return new ArrayList<>(); - } + LOGGER.debug("->getPolicyList: name={}, version={}", name, version); - /** - * Get policies for a policy type name. - * - * @param dao the DAO to use to access the database - * @param policyTypeName the name of the policy type for which to get policies - * @param policyTypeVersion the version of the policy type, null returns all versions of deployed policies for - * policy types - * @return the policies found - * @throws PfModelException on errors getting policies - */ - public ToscaServiceTemplate getPolicies4PolicyType(@NonNull final PfDao dao, @NonNull final String policyTypeName, - final String policyTypeVersion) throws PfModelException { - return null; - } + List policyList = asConceptList(new SimpleToscaProvider().getPolicies(dao, name, version) + .toAuthorative().getToscaTopologyTemplate().getPolicies()); - /** - * Get policies for a policy type name. - * - * @param dao the DAO to use to access the database - * @param policyTypeName the name of the policy type for which to get policies - * @param policyTypeVersion the version of the policy type, null returns all versions of deployed policies for - * policy types - * @return the policies found - * @throws PfModelException on errors getting policies - */ - public List getPolicyList4PolicyType(@NonNull final PfDao dao, @NonNull final String policyTypeName, - final String policyTypeVersion) throws PfModelException { - return new ArrayList<>(); + LOGGER.debug("<-getPolicyList: name={}, version={}, policyTypeList={}", name, version, policyList); + return policyList; } /** - * Get latest policies. + * Get filtered policies. * * @param dao the DAO to use to access the database - * @param name the name of the policy to get, null to get all policies + * @param filter the filter for the policies to get * @return the policies found * @throws PfModelException on errors getting policies */ - public ToscaServiceTemplate getLatestPolicies(@NonNull final PfDao dao, final String name) throws PfModelException { - return null; + 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(); + + ToscaServiceTemplate serviceTemplate = + new SimpleToscaProvider().getPolicies(dao, filter.getName(), version).toAuthorative(); + + List filteredPolicies = asConceptList(serviceTemplate.getToscaTopologyTemplate().getPolicies()); + filteredPolicies = filter.filter(filteredPolicies); + + serviceTemplate.getToscaTopologyTemplate().setPolicies(asConceptMap(filteredPolicies)); + + LOGGER.debug("<-getFilteredPolicies: filter={}, serviceTemplate={}", filter, serviceTemplate); + return serviceTemplate; } /** - * Get latest policies. + * Get filtered policies. * * @param dao the DAO to use to access the database - * @param name the name of the policy to get, null to get all policies + * @param filter the filter for the policies to get * @return the policies found * @throws PfModelException on errors getting policies */ - public List getLatestPolicyList(@NonNull final PfDao dao, final String name) throws PfModelException { - return new ArrayList<>(); + public List getFilteredPolicyList(@NonNull final PfDao dao, @NonNull final ToscaPolicyFilter filter) + throws PfModelException { + + LOGGER.debug("->getFilteredPolicyList: filter={}", filter); + String version = ToscaPolicyFilter.LATEST_VERSION.equals(filter.getVersion()) ? null : filter.getVersion(); + + List policyList = filter.filter(getPolicyList(dao, filter.getName(), version)); + + LOGGER.debug("<-getFilteredPolicyList: filter={}, policyList={}", filter, policyList); + return policyList; } /** @@ -234,8 +294,13 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate createPolicies(@NonNull final PfDao dao, @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException { - return new SimpleToscaProvider().createPolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)) - .toAuthorative(); + LOGGER.debug("->createPolicies: serviceTempalate={}", serviceTemplate); + + ToscaServiceTemplate createdServiceTempalate = new SimpleToscaProvider() + .createPolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative(); + + LOGGER.debug("<-createPolicies: createdServiceTempalate={}", createdServiceTempalate); + return createdServiceTempalate; } /** @@ -249,8 +314,13 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate updatePolicies(@NonNull final PfDao dao, @NonNull final ToscaServiceTemplate serviceTemplate) throws PfModelException { - return new SimpleToscaProvider().updatePolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)) - .toAuthorative(); + LOGGER.debug("->updatePolicies: serviceTempalate={}", serviceTemplate); + + ToscaServiceTemplate updatedServiceTempalate = new SimpleToscaProvider() + .updatePolicies(dao, new JpaToscaServiceTemplate(serviceTemplate)).toAuthorative(); + + LOGGER.debug("<-updatePolicies: updatedServiceTempalate={}", updatedServiceTempalate); + return updatedServiceTempalate; } /** @@ -265,6 +335,47 @@ public class AuthorativeToscaProvider { public ToscaServiceTemplate deletePolicy(@NonNull final PfDao dao, @NonNull final String name, @NonNull final String version) throws PfModelException { - return new SimpleToscaProvider().deletePolicy(dao, new PfConceptKey(name, version)).toAuthorative(); + LOGGER.debug("->deletePolicy: name={}, version={}", name, version); + + ToscaServiceTemplate deletedServiceTempalate = + new SimpleToscaProvider().deletePolicy(dao, new PfConceptKey(name, version)).toAuthorative(); + + LOGGER.debug("<-deletePolicy: name={}, version={}, deletedServiceTempalate={}", name, version, + deletedServiceTempalate); + return deletedServiceTempalate; + } + + /** + * Return the contents of a list of maps as a plain list. + * + * @param listOfMaps the list of maps + * @return the plain list + */ + private List asConceptList(final List> listOfMaps) { + List returnList = new ArrayList<>(); + for (Map conceptMap : listOfMaps) { + for (T concept : conceptMap.values()) { + returnList.add(concept); + } + } + + return returnList; + } + + /** + * Return the contents of a list of concepts as a list of maps of concepts. + * + * @param conceptList the concept list + * @return the list of concept map + */ + private List> asConceptMap(List conceptList) { + List> toscaEntityMapList = new ArrayList<>(); + for (T concept : conceptList) { + Map conceptMap = new LinkedHashMap<>(); + conceptMap.put(concept.getName(), concept); + toscaEntityMapList.add(conceptMap); + } + + return toscaEntityMapList; } }