X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mod%2Fbpgenerator%2Fonap%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fblueprintgenerator%2Fservice%2Fcommon%2FAppConfigService.java;h=a64c297faca72608e8e626a283161c39e571d1de;hb=72c2d38329865afa6692454b4fb90ab6f8a70638;hp=f0d0e5031ae19508db5acfb579911fc7983709fd;hpb=6558bd6870e650dbd6232ab129dc82aebe5f8fba;p=dcaegen2%2Fplatform.git

diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java
index f0d0e50..a64c297 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java
@@ -4,6 +4,7 @@
  *  *  org.onap.dcae
  *  *  ================================================================================
  *  *  Copyright (c) 2020  AT&T Intellectual Property. All rights reserved.
+ *  *  Copyright (c) 2021  Nokia. All rights reserved.
  *  *  ================================================================================
  *  *  Modifications Copyright (c) 2021 Nokia
  *  *  ================================================================================
@@ -25,15 +26,12 @@
 
 package org.onap.blueprintgenerator.service.common;
 
-import org.onap.blueprintgenerator.constants.Constants;
 import org.onap.blueprintgenerator.model.common.Appconfig;
-import org.onap.blueprintgenerator.model.common.Dmaap;
+import org.onap.blueprintgenerator.model.common.BaseStream;
 import org.onap.blueprintgenerator.model.common.GetInput;
 import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
 import org.onap.blueprintgenerator.model.componentspec.common.Calls;
 import org.onap.blueprintgenerator.model.componentspec.common.Parameters;
-import org.onap.blueprintgenerator.model.componentspec.common.Publishes;
-import org.onap.blueprintgenerator.model.componentspec.common.Subscribes;
 import org.onap.blueprintgenerator.service.base.BlueprintHelperService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,8 +43,7 @@ import java.util.TreeMap;
 
 /**
  * @author : Ravi Mantena
- * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service used to create App
- * Config
+ * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service used to create App Config
  */
 @Service("onapAppConfigService")
 public class AppConfigService {
@@ -60,20 +57,19 @@ public class AppConfigService {
     @Autowired
     private StreamService streamService;
 
+
     /**
-     * Creates Inputs section under App Config with Publishes, Subscribes, Parameters sections by
-     * checking Datarouter/MessageRouter/override/Dmaap values
+     * Creates Inputs section under App Config with Publishes, Subscribes, Parameters sections by checking
+     * Datarouter/MessageRouter/override/Dmaap values
      *
-     * @param inputs Inputs
+     * @param inputs            Inputs
      * @param onapComponentSpec Onap Component Specification
-     * @param override Parameter to Service Component Override
-     * @param isDmaap Dmaap Argument
+     * @param isDmaap           Dmaap Argument
      * @return
      */
     public Map<String, Object> createAppconfig(
-        Map<String, LinkedHashMap<String, Object>> inputs,
+        Map<String, Map<String, Object>> inputs,
         OnapComponentSpec onapComponentSpec,
-        String override,
         boolean isDmaap) {
 
         Map<String, Object> response = new HashMap<>();
@@ -82,9 +78,9 @@ public class AppConfigService {
         Calls[] call = new Calls[0];
         appconfig.setService_calls(call);
 
-        Map<String, Dmaap> streamPublishes = streamService.createStreamPublishes(
+        Map<String, BaseStream> streamPublishes = streamService.createStreamPublishes(
             onapComponentSpec, blueprintHelperService, dmaapService, inputs, isDmaap);
-        Map<String, Dmaap> streamSubscribes = streamService.createStreamSubscribes(
+        Map<String, BaseStream> streamSubscribes = streamService.createStreamSubscribes(
             onapComponentSpec, blueprintHelperService, dmaapService, inputs, isDmaap);
 
         appconfig.setStreams_publishes(streamPublishes);
@@ -98,8 +94,7 @@ public class AppConfigService {
                 paramInput.setBpInputName(pName);
                 parameters.put(pName, paramInput);
                 if (!"".equals(p.getValue())) {
-                    LinkedHashMap<String, Object> pInputs =
-                        blueprintHelperService.createStringInput(p.getValue());
+                    Map<String, Object> pInputs = createInputFromParameter(p);
                     inputs.put(pName, pInputs);
                 } else {
                     LinkedHashMap<String, Object> pInputs = new LinkedHashMap<>();
@@ -119,17 +114,17 @@ public class AppConfigService {
                 }
             }
         }
-        if (override != null) {
-            GetInput ov = new GetInput();
-            ov.setBpInputName(Constants.SERVICE_COMPONENT_NAME_OVERRIDE);
-            parameters.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE, ov);
-            LinkedHashMap<String, Object> over = blueprintHelperService.createStringInput(override);
-            inputs.put(Constants.SERVICE_COMPONENT_NAME_OVERRIDE, over);
-        }
+
         appconfig.setParams(parameters);
 
         response.put("appconfig", appconfig);
         response.put("inputs", inputs);
         return response;
     }
+
+    private Map<String, Object> createInputFromParameter(Parameters parameter) {
+        String inputType = parameter.getType() == null ? "string" : parameter.getType();
+
+        return blueprintHelperService.createInputByType(inputType, parameter.getValue());
+    }
 }