From c166c55c0b1674edc8e91ed1c270657473bf7f2b Mon Sep 17 00:00:00 2001 From: Ravi Mantena Date: Fri, 4 Dec 2020 11:23:42 -0500 Subject: Changing the snapshot and fixing Componentspec Issue-ID: DCAEGEN2-2529 Issue-ID: DCAEGEN2-2529 Change-Id: I4fb5eda94386c808c28431c9f8dbc7d5af2f8fc9 Signed-off-by: Ravi Mantena --- .../service/common/ComponentSpecService.java | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ComponentSpecService.java') diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ComponentSpecService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ComponentSpecService.java index e8d648d..4991bda 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ComponentSpecService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ComponentSpecService.java @@ -34,12 +34,9 @@ import java.io.File; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * Common ONAP Service used by ONAP and DMAAP Blueprint to create Component Spec from File + * @date 10/16/2020 Application: ONAP - Blueprint Generator Common ONAP Service used by ONAP and + * DMAAP Blueprint to create Component Spec from File */ - - @Service("onapComponentSpecService") public class ComponentSpecService { @@ -51,16 +48,41 @@ public class ComponentSpecService { @Autowired private ObjectMapper yamlComponentMapper; + /** + * Creates ComponentSpec from given file path and validates if the input is json file or not + * + * @param componentSpecPath + * @return + */ public OnapComponentSpec createComponentSpecFromFile(String componentSpecPath) { OnapComponentSpec componentSpec; try { - if(!componentSpecPath.endsWith(".json")) - componentMapper = yamlComponentMapper; - componentSpec = componentMapper.readValue(new File(componentSpecPath), OnapComponentSpec.class); + if (!componentSpecPath.endsWith(".json")) { + componentSpec = yamlComponentMapper.readValue(new File(componentSpecPath), OnapComponentSpec.class); + }else{ + componentSpec = componentMapper.readValue(new File(componentSpecPath), OnapComponentSpec.class); + } } catch (Exception ex) { throw new ComponentSpecException("Unable to create ONAP Component Spec from the input file: "+ componentSpecPath, ex); } return componentSpec; } + /** + * Creates the component spec from string. + * This method is used by RuntimeAPI + * @param specString the spec string + */ + public OnapComponentSpec createComponentSpecFromString(String specString) { + OnapComponentSpec componentSpec; + try { + componentSpec = componentMapper.readValue(specString, OnapComponentSpec.class); + } catch (Exception ex) { + throw new ComponentSpecException( + "Unable to create ONAP Component Spec from the input string: " + specString, + ex); + } + return componentSpec; + } + } -- cgit 1.2.3-korg