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=52e64a95bdd116fe9edfaa5ad3f47535a16b09f5;hb=09c6b6e1fa2684c913d7b904f7c7ad6b26b04ef1;hp=d74e9b1cf8fc5705fcc36990b1cd0bd05ddc9eb8;hpb=50f56b64870ac6c988cf75e84da3836ca015c1e6;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 index d74e9b1cf..52e64a95b 100755 --- 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 @@ -1,13 +1,15 @@ /* - * ============LICENSE_START======================================================= + * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation - * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. + * Modifications Copyright (C) 2020-2021 Bell Canada. + * 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. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,10 +26,16 @@ 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 javax.validation.Valid; +import javax.validation.constraints.NotNull; 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; @@ -50,25 +58,66 @@ 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) { + public ResponseEntity createDataspace(@NotNull @Valid final String dataspaceName) { cpsAdminService.createDataspace(dataspaceName); return new ResponseEntity<>(dataspaceName, HttpStatus.CREATED); } + /** + * Delete a dataspace. + * + * @param dataspaceName name of dataspace to be deleted + * @return a {@Link ResponseEntity} of {@link HttpStatus} NO_CONTENT + */ @Override - public ResponseEntity createSchemaSet(final MultipartFile multipartFile, - final String schemaSetName, final String dataspaceName) { + public ResponseEntity deleteDataspace(final String dataspaceName) { + cpsAdminService.deleteDataspace(dataspaceName); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + /** + * 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(@NotNull @Valid final String schemaSetName, + final String dataspaceName, @Valid final MultipartFile multipartFile) { 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 SchemaSet schemaSet = cpsModuleService.getSchemaSet(dataspaceName, schemaSetName); - return new ResponseEntity<>(schemaSet, HttpStatus.OK); + public ResponseEntity getSchemaSet(final String dataspaceName, final String schemaSetName) { + final var schemaSet = cpsModuleService.getSchemaSet(dataspaceName, schemaSetName); + final var 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 deleteSchemaSet(final String dataspaceName, final String schemaSetName) { cpsModuleService.deleteSchemaSet(dataspaceName, schemaSetName, CASCADE_DELETE_PROHIBITED); @@ -81,34 +130,53 @@ 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, - final String anchorName) { + public ResponseEntity createAnchor(final String dataspaceName, @NotNull @Valid final String schemaSetName, + @NotNull @Valid final String anchorName) { cpsAdminService.createAnchor(dataspaceName, schemaSetName, anchorName); 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) { - final Anchor anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); - return new ResponseEntity<>(anchor, HttpStatus.OK); + public ResponseEntity getAnchor(final String dataspaceName, final String anchorName) { + final var anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); + final var 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); } }