From 11a93717a4292c30c71de950fb39637f9c8efd17 Mon Sep 17 00:00:00 2001 From: shaaban Altanany Date: Wed, 25 Dec 2019 11:13:46 +0200 Subject: add package creation component and fixing designer compilation and linting Issue-ID: CCSDK-2014 Issue-ID: CCSDK-1780 Signed-off-by: shaaban Altanany Change-Id: I65e02ba498516edb27eefd2448d50a61779cc22c --- .../blueprintsprocessor/designer/api/BlueprintModelController.kt | 9 +++++++-- .../designer/api/handler/BluePrintModelHandler.kt | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'ms') diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt index f257157c8..0eb29f4cc 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt @@ -30,6 +30,7 @@ import org.springframework.core.io.Resource import org.springframework.data.domain.Page import org.springframework.data.domain.PageRequest import org.springframework.data.domain.Sort +import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity import org.springframework.http.codec.multipart.FilePart @@ -129,8 +130,12 @@ open class BlueprintModelController(private val bluePrintModelHandler: BluePrint @PathVariable(value = "name") name: String, @PathVariable(value = "version") version: String ): - Mono = monoMdc { - bluePrintModelHandler.getBlueprintModelSearchByNameAndVersion(name, version) + Mono> = monoMdc { + var bluePrintModel: BlueprintModelSearch? = bluePrintModelHandler.getBlueprintModelSearchByNameAndVersion(name, version) + if (bluePrintModel != null) + ResponseEntity(bluePrintModel, HttpStatus.OK) + else + ResponseEntity(HttpStatus.NO_CONTENT) } @GetMapping("/download/by-name/{name}/version/{version}", produces = [MediaType.APPLICATION_JSON_VALUE]) diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/BluePrintModelHandler.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/BluePrintModelHandler.kt index 392fa0bb4..274650ae4 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/BluePrintModelHandler.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/BluePrintModelHandler.kt @@ -145,12 +145,12 @@ open class BluePrintModelHandler( * @throws BluePrintException BluePrintException */ @Throws(BluePrintException::class) - open fun getBlueprintModelSearchByNameAndVersion(name: String, version: String): BlueprintModelSearch { + open fun getBlueprintModelSearchByNameAndVersion(name: String, version: String): BlueprintModelSearch? { return blueprintModelSearchRepository.findByArtifactNameAndArtifactVersion(name, version) - ?: throw BluePrintException( + /*?: throw BluePrintException( ErrorCode.RESOURCE_NOT_FOUND.value, String.format(BLUEPRINT_MODEL_NAME_VERSION_FAILURE_MSG, name, version) - ) + )*/ } /** -- cgit 1.2.3-korg