diff options
author | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-01-18 09:39:44 +0100 |
---|---|---|
committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-01-21 11:34:46 +0100 |
commit | 4a39a56b42b5ee8586cf91f79187e317491ec003 (patch) | |
tree | c7c9c05c05b4df59bf9e2da96525a5f6382a8b05 /mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java | |
parent | 6345bc31e13829b84115b3f1de9e384b1f91c2ab (diff) |
BPGenerator - fix placement of service component name override
Issue-ID: DCAEGEN2-2481
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I32c3d2eb1e08dbcfe5b8ec57394a000a76150f00
Diffstat (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java')
-rw-r--r-- | mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java | 14 |
1 files changed, 2 insertions, 12 deletions
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..494620c 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.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; @@ -66,14 +64,12 @@ public class AppConfigService { * * @param inputs Inputs * @param onapComponentSpec Onap Component Specification - * @param override Parameter to Service Component Override * @param isDmaap Dmaap Argument * @return */ public Map<String, Object> createAppconfig( Map<String, LinkedHashMap<String, Object>> inputs, OnapComponentSpec onapComponentSpec, - String override, boolean isDmaap) { Map<String, Object> response = new HashMap<>(); @@ -119,13 +115,7 @@ 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); |