From a3c8fc0395e9518c5f0f064a033f4ab4d7040c61 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Thu, 17 Dec 2020 14:27:01 +0100 Subject: Blueprint Generator - Refactor blueprint generation. Issue-ID: DCAEGEN2-2529 Signed-off-by: Remigiusz Janeczek Change-Id: I72959f3e6c27d301e46ede24c015ce638d8de324 --- .../test/BlueprintGeneratorTests.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java') diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java index 81aaa60..86d257a 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2020 Nokia. 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. @@ -23,14 +24,16 @@ package org.onap.blueprintgenerator.test; -import org.onap.blueprintgenerator.BlueprintGeneratorMainApplication; -import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec; -import org.onap.blueprintgenerator.service.OnapBlueprintService; -import org.onap.blueprintgenerator.service.common.ComponentSpecService; -import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintService; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Ignore; import org.junit.runner.RunWith; +import org.onap.blueprintgenerator.BlueprintGeneratorMainApplication; +import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec; +import org.onap.blueprintgenerator.service.BlueprintCreatorService; +import org.onap.blueprintgenerator.service.base.BlueprintService; +import org.onap.blueprintgenerator.service.common.ComponentSpecService; +import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintCreatorService; +import org.onap.blueprintgenerator.service.onap.OnapBlueprintCreatorService; import org.onap.policycreate.service.PolicyModelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -90,10 +93,16 @@ public class BlueprintGeneratorTests { protected ComponentSpecService onapComponentSpecService; @Autowired - protected DmaapBlueprintService dmaapBlueprintService; + protected DmaapBlueprintCreatorService dmaapBlueprintCreatorService; + + @Autowired + protected OnapBlueprintCreatorService onapBlueprintCreatorService; + + @Autowired + protected BlueprintCreatorService blueprintCreatorService; @Autowired - protected OnapBlueprintService onapBlueprintService; + protected BlueprintService blueprintService; @Autowired protected PolicyModelService policyModelService; -- cgit 1.2.3-korg