X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-rest%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Frest%2Fcontroller%2FAdminRestController.java;h=57b6771940882696db62609e5f0d34e4b0a42209;hb=c6865f33336bcdcd79eb2659b1a7df130aee9452;hp=407a7673896f22ff3fd1ed4cd09ea768907bea0b;hpb=fa56d71bb94d88f657a9d73fb91c3036220f32ab;p=cps.git diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java old mode 100644 new mode 100755 index 407a76738..57b677194 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. + * Modifications Copyright (C) 2021 Pantheon.tech * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,21 +22,28 @@ package org.onap.cps.rest.controller; import static org.onap.cps.rest.utils.MultipartFileUtil.extractYangResourcesMap; +import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED; import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; import org.modelmapper.ModelMapper; import org.onap.cps.api.CpsAdminService; import org.onap.cps.api.CpsModuleService; import org.onap.cps.rest.api.CpsAdminApi; +import org.onap.cps.rest.model.AnchorDetails; +import org.onap.cps.rest.model.SchemaSetDetails; import org.onap.cps.spi.model.Anchor; import org.onap.cps.spi.model.SchemaSet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @RestController +@RequestMapping("${rest.api.cps-base-path}") public class AdminRestController implements CpsAdminApi { @Autowired @@ -47,23 +55,69 @@ public class AdminRestController implements CpsAdminApi { @Autowired private ModelMapper modelMapper; + /** + * Create a dataspace. + * + * @param dataspaceName dataspace name + * @return a {@Link ResponseEntity} of created dataspace name & {@link HttpStatus} CREATED + */ @Override public ResponseEntity createDataspace(final String dataspaceName) { cpsAdminService.createDataspace(dataspaceName); return new ResponseEntity<>(dataspaceName, HttpStatus.CREATED); } + /** + * Delete a dataspace based on a given name. + * + * @param dataspaceName dataspace name + * @return a {@Link ResponseEntity} of {@link HttpStatus} NOT_IMPLEMENTED + */ + @Override + public ResponseEntity deleteDataspace(final String dataspaceName) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } + + /** + * Create a {@link SchemaSet}. + * + * @param multipartFile multipart file + * @param schemaSetName schemaset name + * @param dataspaceName dataspace name + * @return a {@Link ResponseEntity} of created schemaset name & {@link HttpStatus} CREATED + */ @Override - public ResponseEntity createSchemaSet(final String schemaSetName, final MultipartFile multipartFile, - final String dataspaceName) { + public ResponseEntity createSchemaSet(final MultipartFile multipartFile, + final String schemaSetName, final String dataspaceName) { cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, extractYangResourcesMap(multipartFile)); return new ResponseEntity<>(schemaSetName, HttpStatus.CREATED); } + /** + * Get {@link SchemaSetDetails} based on dataspace name & {@link SchemaSet} name. + * + * @param dataspaceName dataspace name + * @param schemaSetName schemaset name + * @return a {@Link ResponseEntity} of {@Link SchemaSetDetails} & {@link HttpStatus} OK + */ + @Override + public ResponseEntity getSchemaSet(final String dataspaceName, final String schemaSetName) { + final var schemaSet = cpsModuleService.getSchemaSet(dataspaceName, schemaSetName); + final SchemaSetDetails schemaSetDetails = modelMapper.map(schemaSet, SchemaSetDetails.class); + return new ResponseEntity<>(schemaSetDetails, HttpStatus.OK); + } + + /** + * Delete a {@link SchemaSet} based on given dataspace name & schemaset name. + * + * @param dataspaceName dataspace name + * @param schemaSetName schemaset name + * @return a {@Link ResponseEntity} of {@link HttpStatus} NO_CONTENT + */ @Override - public ResponseEntity getSchemaSet(final String dataspaceName, final String schemaSetName) { - final SchemaSet schemaSet = cpsModuleService.getSchemaSet(dataspaceName, schemaSetName); - return new ResponseEntity<>(schemaSet, HttpStatus.OK); + public ResponseEntity deleteSchemaSet(final String dataspaceName, final String schemaSetName) { + cpsModuleService.deleteSchemaSet(dataspaceName, schemaSetName, CASCADE_DELETE_PROHIBITED); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } /** @@ -72,7 +126,7 @@ public class AdminRestController implements CpsAdminApi { * @param dataspaceName dataspace name * @param schemaSetName schema set name * @param anchorName anchorName - * @return a ResponseEntity with the anchor name. + * @return a ResponseEntity with the anchor name & {@link HttpStatus} CREATED */ @Override public ResponseEntity createAnchor(final String dataspaceName, final String schemaSetName, @@ -81,24 +135,44 @@ public class AdminRestController implements CpsAdminApi { return new ResponseEntity<>(anchorName, HttpStatus.CREATED); } + /** + * Delete an {@link Anchor} based on given dataspace name & anchor name. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @return a {@Link ResponseEntity} of {@link HttpStatus} NO_CONTENT + */ @Override - public ResponseEntity deleteAnchor(final String dataspaceName, final String anchorName) { - return null; - } - - @Override - public ResponseEntity deleteDataspace(final String dataspaceName) { - return null; + public ResponseEntity deleteAnchor(final String dataspaceName, final String anchorName) { + cpsAdminService.deleteAnchor(dataspaceName, anchorName); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + /** + * Get an {@link Anchor} based on given dataspace name & anchor name. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @return a {@Link ResponseEntity} of an {@Link AnchorDetails} & {@link HttpStatus} OK + */ @Override - public ResponseEntity getAnchor(final String dataspaceName, final String anchorName) { - return null; + public ResponseEntity getAnchor(final String dataspaceName, final String anchorName) { + final var anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); + final AnchorDetails anchorDetails = modelMapper.map(anchor, AnchorDetails.class); + return new ResponseEntity<>(anchorDetails, HttpStatus.OK); } + /** + * Get all {@link Anchor} based on given dataspace name. + * + * @param dataspaceName dataspace name + * @return a {@Link ResponseEntity} of all {@Link AnchorDetails} & {@link HttpStatus} OK + */ @Override - public ResponseEntity getAnchors(final String dataspaceName) { - final Collection anchorDetails = cpsAdminService.getAnchors(dataspaceName); + public ResponseEntity> getAnchors(final String dataspaceName) { + final Collection anchors = cpsAdminService.getAnchors(dataspaceName); + final List anchorDetails = anchors.stream().map(anchor -> + modelMapper.map(anchor, AnchorDetails.class)).collect(Collectors.toList()); return new ResponseEntity<>(anchorDetails, HttpStatus.OK); } }