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=4237846ee751106404deac555044d80dcc35367c;hb=001e7738f4968ec390ea8af36de019aa87e3c2f2;hp=6dc2cee72a9de3c8455baab2b7a0c24e78bcc2fa;hpb=acfb2078d510f5cec7b6ce57c03ba42663b8f3ee;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 6dc2cee72..4237846ee 100644 --- 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 @@ -28,6 +28,7 @@ import org.onap.cps.api.CpsAdminService; import org.onap.cps.api.CpsModuleService; import org.onap.cps.rest.api.CpsAdminApi; 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; @@ -47,12 +48,24 @@ public class AdminRestController implements CpsAdminApi { private ModelMapper modelMapper; @Override - public ResponseEntity createSchemaSet(final String schemaSetName, final MultipartFile multipartFile, - final String dataspaceName) { + public ResponseEntity createDataspace(final String dataspaceName) { + cpsAdminService.createDataspace(dataspaceName); + return new ResponseEntity<>(dataspaceName, HttpStatus.CREATED); + } + + @Override + public ResponseEntity createSchemaSet(final MultipartFile multipartFile, + final String schemaSetName, final String dataspaceName) { cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, extractYangResourcesMap(multipartFile)); return new ResponseEntity<>(schemaSetName, HttpStatus.CREATED); } + @Override + public ResponseEntity getSchemaSet(final String dataspaceName, final String schemaSetName) { + final SchemaSet schemaSet = cpsModuleService.getSchemaSet(dataspaceName, schemaSetName); + return new ResponseEntity<>(schemaSet, HttpStatus.OK); + } + /** * Create a new anchor. *