From 9e34db4166287c48d8aaccc680eee0f0d5714f8b Mon Sep 17 00:00:00 2001 From: romaingimbert Date: Fri, 3 Aug 2018 10:04:46 +0200 Subject: rollback EXTAPI-108 call tosca Change-Id: Icfe3594f7b34b7dabdc7941ce5fff3b52fd4703f Issue-ID: EXTAPI-108 Signed-off-by: romaingimbert --- .../servicecatalog/ServiceSpecificationResource.java | 7 ++++++- .../servicecatalog/ServiceSpecificationService.java | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java index d4a53a4..e8ef9e3 100644 --- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java +++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java @@ -43,7 +43,12 @@ public class ServiceSpecificationResource extends ResourceManagement { @RequestParam MultiValueMap params) { Map response = serviceSpecificationService.get(serviceSpecId); JsonRepresentation filter = new JsonRepresentation(params); - return this.getResponse(response, filter); + if (response.get("serviceSpecCharacteristic") != null) { + return this.getResponse(response, filter); + } else { + return this.getPartialResponse(response, filter); + + } } @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java index 3094f7b..69e4a51 100644 --- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java +++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java @@ -23,6 +23,8 @@ import org.apache.commons.collections.CollectionUtils; import org.onap.nbi.apis.servicecatalog.jolt.FindServiceSpecJsonTransformer; import org.onap.nbi.apis.servicecatalog.jolt.GetServiceSpecJsonTransformer; import org.onap.nbi.apis.serviceorder.ServiceCatalogUrl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.MultiValueMap; @@ -45,16 +47,23 @@ public class ServiceSpecificationService { @Autowired private ServiceCatalogUrl serviceCatalogUrl; - private static final String SERVICE_SPEC_INPUT_SCHEMA = "serviceSpecInputSchema"; + + private static final Logger LOGGER = LoggerFactory.getLogger(ServiceSpecificationService.class); public Map get(String serviceSpecId) { Map sdcResponse = sdcClient.callGet(serviceSpecId); - sdcResponse.put(SERVICE_SPEC_INPUT_SCHEMA,serviceCatalogUrl.getServiceCatalogUrl()+serviceSpecId+"/"+SERVICE_SPEC_INPUT_SCHEMA); - return (LinkedHashMap) getServiceSpecJsonTransformer.transform(sdcResponse); + LinkedHashMap serviceCatalogResponse = (LinkedHashMap) getServiceSpecJsonTransformer.transform(sdcResponse); + Map toscaInfosTopologyTemplate = toscaInfosProcessor.getToscaInfos(serviceCatalogResponse); + if (toscaInfosTopologyTemplate != null) { + LOGGER.debug("tosca file found, retrieving informations"); + toscaInfosProcessor.buildResponseWithToscaInfos(toscaInfosTopologyTemplate, serviceCatalogResponse); + } else { + LOGGER.debug("no tosca file found, partial response"); + } + return serviceCatalogResponse; } - public List find(MultiValueMap parametersMap) { List sdcResponse = sdcClient.callFind(parametersMap); List serviceCatalogResponse = new ArrayList<>(); -- cgit 1.2.3-korg