Blueprint Generator - Refactor blueprint generation.

Issue-ID: DCAEGEN2-2529
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I72959f3e6c27d301e46ede24c015ce638d8de324

5 files changed, 156 insertions, 47 deletions

diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java
new file mode 100644
index 0000000..c1e46f2
--- /dev/null
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java
@@ -0,0 +1,114 @@
+/*
+ * ============LICENSE_START=======================================================
+ * org.onap.dcae
+ * ================================================================================
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.blueprintgenerator.service;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.blueprintgenerator.model.base.Blueprint;
+import org.onap.blueprintgenerator.model.common.Input;
+import org.onap.blueprintgenerator.model.common.OnapBlueprint;
+import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
+import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintCreatorService;
+import org.onap.blueprintgenerator.service.onap.OnapBlueprintCreatorService;
+
+public class BlueprintCreatorServiceTest {
+
+    private static final String ONAP_BP_TYPE = "o";
+    private static final String DMAAP_BP_TYPE = "d";
+    private static final String INCORRECT_BP_TYPE = "z";
+
+    private OnapBlueprintCreatorService onapBlueprintCreatorService;
+    private DmaapBlueprintCreatorService dmaapBlueprintCreatorService;
+    private BlueprintCreatorService blueprintCreatorService;
+
+    @Before
+    public void setup() {
+        onapBlueprintCreatorService = mock(OnapBlueprintCreatorService.class);
+        dmaapBlueprintCreatorService = mock(DmaapBlueprintCreatorService.class);
+        blueprintCreatorService = new BlueprintCreatorService(onapBlueprintCreatorService,
+            dmaapBlueprintCreatorService);
+    }
+
+    @Test
+    public void shouldCreateOnapBlueprint() {
+        OnapComponentSpec cs = new OnapComponentSpec();
+        Input input = new Input();
+        input.setBpType(ONAP_BP_TYPE);
+        when(onapBlueprintCreatorService.createBlueprint(any(), any())).thenReturn(new OnapBlueprint());
+
+        Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+        verify(onapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+        verify(onapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+        verifyNoInteractions(dmaapBlueprintCreatorService);
+        assertNotNull(blueprint);
+    }
+
+    @Test
+    public void shouldCreateDmaapBlueprint() {
+        OnapComponentSpec cs = new OnapComponentSpec();
+        Input input = new Input();
+        input.setBpType(DMAAP_BP_TYPE);
+        when(dmaapBlueprintCreatorService.createBlueprint(any(), any())).thenReturn(new OnapBlueprint());
+
+        Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+        verify(dmaapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+        verify(dmaapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+        verifyNoInteractions(onapBlueprintCreatorService);
+        assertNotNull(blueprint);
+    }
+
+    @Test
+    public void shouldReturnNullWhenBpTypeNotDefined(){
+        OnapComponentSpec cs = new OnapComponentSpec();
+        Input input = new Input();
+
+        Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+        verifyNoInteractions(onapBlueprintCreatorService);
+        verifyNoInteractions(dmaapBlueprintCreatorService);
+        assertNull(blueprint);
+    }
+
+    @Test
+    public void shouldReturnNullWhenBpTypeIncorrect(){
+        OnapComponentSpec cs = new OnapComponentSpec();
+        Input input = new Input();
+        input.setBpType(INCORRECT_BP_TYPE);
+
+        Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+        verifyNoInteractions(onapBlueprintCreatorService);
+        verifyNoInteractions(dmaapBlueprintCreatorService);
+        assertNull(blueprint);
+    }
+
+}
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
index d15be4d..5c90acd 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.runners.Suite;
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     OnapComponentSpecTest.class,
-    OnapBlueprintServiceTest.class,
+    OnapBlueprintCreatorServiceTest.class,
     ExternalCertificateParametersFactoryServiceTest.class /*, BlueprintJarComparatorTest.class*/
 })
 public class BlueprintGeneratorTestSuite {
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;
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java
index 8f4a1f6..866a324 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintServiceTest.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.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,38 +24,31 @@
 
 package org.onap.blueprintgenerator.test;
 
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.onap.blueprintgenerator.constants.Constants;
-import org.onap.blueprintgenerator.model.common.Input;
-import org.onap.blueprintgenerator.model.common.Node;
-import org.onap.blueprintgenerator.model.common.OnapBlueprint;
-import org.onap.blueprintgenerator.model.common.Properties;
-import org.junit.Test;
-import org.junit.jupiter.api.DisplayName;
-import picocli.CommandLine;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.io.PrintStream;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import org.junit.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.onap.blueprintgenerator.constants.Constants;
+import org.onap.blueprintgenerator.model.common.Input;
+import org.onap.blueprintgenerator.model.common.Node;
+import org.onap.blueprintgenerator.model.common.OnapBlueprint;
+import org.onap.blueprintgenerator.model.common.Properties;
 
 /**
  * @author : Ravi Mantena
  * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Blueprint Test Cases for ONAP and
  * DMAAP
  */
-public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
+
+
+public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests {
 
     private String outputfilesPath =
         Paths.get("src", "test", "resources", "outputfiles").toAbsolutePath().toString();
@@ -80,11 +74,9 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
         assertNotNull(
             "K8s Blueprint for Service Name Override Component Spec is NULL", onapComponentSpec);
 
-        OnapBlueprint onapBlueprint = onapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
-        onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
-        System.out.println(
-            onapBlueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
+        OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+        blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+        System.out.println(blueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
 
         onapTestUtils.verifyToscaDefVersion(
             "Service Name Override K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION);
@@ -173,8 +165,7 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
             "K8s Blueprint for Service Name Override with Import File Component Spec is NULL",
             onapComponentSpec);
 
-        OnapBlueprint onapBlueprint = onapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
+        OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
 
         onapTestUtils.verifyToscaDefVersion(
             "Service Name Override with Import File K8s", onapBlueprint,
@@ -276,9 +267,8 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
             onapComponentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
         assertNotNull("K8s Blueprint for DMAAP Component Spec is NULL", onapComponentSpec);
 
-        OnapBlueprint onapBlueprint = dmaapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
-        onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+        OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+        blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
     }
 
     /**
@@ -301,11 +291,9 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
             onapComponentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
         assertNotNull("K8s Blueprint for DMAAP Component Spec is NULL", onapComponentSpec);
 
-        OnapBlueprint onapBlueprint = dmaapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
-        onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
-        System.out.println(
-            onapBlueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
+        OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+        blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+        System.out.println(blueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
 
         policyModelService.createPolicyModels(onapComponentSpec.getParameters(), "models");
 
@@ -390,8 +378,7 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
         assertNotNull(
             "K8s Blueprint for DMAAP Component Spec with Import File is NULL", onapComponentSpec);
 
-        OnapBlueprint onapBlueprint = dmaapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
+        OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
 
         onapTestUtils.verifyToscaDefVersion(
             "DMAAP with Import File K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION);
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
index 984c262..433240f 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
@@ -209,8 +209,7 @@ public class TlsInfoTest extends BlueprintGeneratorTests {
     private OnapBlueprint createBlueprintFromFile(String path) {
         onapComponentSpec = onapComponentSpecService.createComponentSpecFromFile(path);
         Input input = onapTestUtils.getInput(path, "", "", "", "o", "");
-        OnapBlueprint onapBlueprint = onapBlueprintService
-            .createBlueprint(onapComponentSpec, input);
+        OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
         return onapBlueprint;
     }
 }