diff options
Diffstat (limited to 'models-tosca/src')
2 files changed, 6 insertions, 9 deletions
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 2ec9ee2c8..b3284d987 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 @@ -652,15 +652,15 @@ public class AuthorativeToscaProvider { * @return the node templates found * @throws PfModelException on errors getting tosca node templates */ - public List<Map<PfConceptKey, ToscaNodeTemplate>> getToscaNodeTemplate( + public List<ToscaNodeTemplate> getToscaNodeTemplate( @NonNull final PfDao dao, final String name, final String version) throws PfModelException { LOGGER.debug("->getNodeTemplate: name={}, version={}", name, version); - List<Map<PfConceptKey, ToscaNodeTemplate>> nodeTemplates = new ArrayList<>(); + List<ToscaNodeTemplate> nodeTemplates = new ArrayList<>(); synchronized (providerLockObject) { new SimpleToscaProvider().getToscaNodeTemplates(dao, name, version) - .getConceptMap().forEach((key, value) -> nodeTemplates.add(Map.of(key, value.toAuthorative()))); + .getConceptMap().forEach((key, value) -> nodeTemplates.add(value.toAuthorative())); } LOGGER.debug("<-getNodeTemplate: name={}, version={}, nodeTemplates={}", name, version, diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderNodeTemplateTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderNodeTemplateTest.java index 21559344f..2370779af 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderNodeTemplateTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderNodeTemplateTest.java @@ -129,9 +129,6 @@ public class AuthorativeToscaProviderNodeTemplateTest { assertNotNull(toscaServiceTemplate); authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate); - List<Map<PfConceptKey, ToscaNodeTemplate>> gotPolicyMetadataSets1 = authorativeToscaProvider - .getToscaNodeTemplate(pfDao, null, null); - assertEquals(3, gotPolicyMetadataSets1.size()); //Fetch all metadataSet if id is null List<Map<ToscaEntityKey, Map<String, Object>>> gotPolicyMetadataSets = authorativeToscaProvider @@ -160,17 +157,17 @@ public class AuthorativeToscaProviderNodeTemplateTest { authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate); //Fetch all node templates if id is null - List<Map<PfConceptKey, ToscaNodeTemplate>> gotToscaNodeTemplates = authorativeToscaProvider + List<ToscaNodeTemplate> gotToscaNodeTemplates = authorativeToscaProvider .getToscaNodeTemplate(pfDao, null, null); assertEquals(3, gotToscaNodeTemplates.size()); // Get filtered node templates - List<Map<PfConceptKey, ToscaNodeTemplate>> filteredNodeTemplates = authorativeToscaProvider + List<ToscaNodeTemplate> filteredNodeTemplates = authorativeToscaProvider .getToscaNodeTemplate(pfDao, "apexMetadata_adaptive", "2.3.1"); assertEquals(1, filteredNodeTemplates.size()); //Get invalid node template - List<Map<PfConceptKey, ToscaNodeTemplate>> filteredNodeTemplatesInvalid = authorativeToscaProvider + List<ToscaNodeTemplate> filteredNodeTemplatesInvalid = authorativeToscaProvider .getToscaNodeTemplate(pfDao, "invalidname", "1.0.0"); assertThat(filteredNodeTemplatesInvalid).isEmpty(); } |