X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdc-simulator%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fsdcsimulator%2Fcontroller%2FCatalogController.java;h=eebc08c66ac7959db9fa11792de6edc9df7aff7e;hb=d2d0cdcc534eb1f08c030c1907ae14a70fd41b04;hp=f22bcf69ca37375ba277243f7881b72acba9b1df;hpb=c6e2d2268b8b95ec1fe513a31e585ad09834f867;p=integration%2Fcsit.git

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/java/org/onap/so/sdcsimulator/controller/CatalogController.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/java/org/onap/so/sdcsimulator/controller/CatalogController.java
index f22bcf69..eebc08c6 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/java/org/onap/so/sdcsimulator/controller/CatalogController.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/main/java/org/onap/so/sdcsimulator/controller/CatalogController.java
@@ -44,23 +44,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public class CatalogController {
     private static final Logger LOGGER = LoggerFactory.getLogger(CatalogController.class);
 
-    private AssetProvider resourceProvider;
+    private final AssetProvider assetProvider;
 
     @Autowired
-    public CatalogController(final AssetProvider resourceProvider) {
-        this.resourceProvider = resourceProvider;
+    public CatalogController(final AssetProvider assetProvider) {
+        this.assetProvider = assetProvider;
     }
 
     @GetMapping(value = "/resources", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> getResources() {
         LOGGER.info("Running getResources ...");
-        return ResponseEntity.ok().body(resourceProvider.getAssetInfo(AssetType.RESOURCES));
+        return ResponseEntity.ok().body(assetProvider.getAssetInfo(AssetType.RESOURCES));
     }
 
     @GetMapping(value = "/resources/{csarId}/toscaModel", produces = MediaType.APPLICATION_OCTET_STREAM)
-    public ResponseEntity<byte[]> getCsar(@PathVariable("csarId") final String csarId) {
+    public ResponseEntity<byte[]> getResourceCsar(@PathVariable("csarId") final String csarId) {
         LOGGER.info("Running getCsar for {} ...", csarId);
-        final Optional<byte[]> resource = resourceProvider.getAsset(csarId, AssetType.RESOURCES);
+        final Optional<byte[]> resource = assetProvider.getAsset(csarId, AssetType.RESOURCES);
         if (resource.isPresent()) {
             return new ResponseEntity<>(resource.get(), HttpStatus.OK);
         }
@@ -73,7 +73,7 @@ public class CatalogController {
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<Metadata> getResourceMetadata(@PathVariable("csarId") final String csarId) {
         LOGGER.info("Running getResourceMetadata for {} ...", csarId);
-        final Optional<Metadata> resource = resourceProvider.getMetadata(csarId, AssetType.RESOURCES);
+        final Optional<Metadata> resource = assetProvider.getMetadata(csarId, AssetType.RESOURCES);
         if (resource.isPresent()) {
             return new ResponseEntity<>(resource.get(), HttpStatus.OK);
         }
@@ -86,14 +86,27 @@ public class CatalogController {
     @GetMapping(value = "/services", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> getServices() {
         LOGGER.info("Running getServices ...");
-        return ResponseEntity.ok().body(resourceProvider.getAssetInfo(AssetType.SERVICES));
+        return ResponseEntity.ok().body(assetProvider.getAssetInfo(AssetType.SERVICES));
     }
 
+    @GetMapping(value = "/services/{csarId}/toscaModel", produces = MediaType.APPLICATION_OCTET_STREAM)
+    public ResponseEntity<byte[]> getServiceCsar(@PathVariable("csarId") final String csarId) {
+        LOGGER.info("Running getServiceCsar for {} ...", csarId);
+        final Optional<byte[]> resource = assetProvider.getAsset(csarId, AssetType.SERVICES);
+        if (resource.isPresent()) {
+            return new ResponseEntity<>(resource.get(), HttpStatus.OK);
+        }
+        LOGGER.error("Unable to find csar: {}", csarId);
+
+        return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+
     @GetMapping(value = "/services/{csarId}/metadata",
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<Metadata> getServiceMetadata(@PathVariable("csarId") final String csarId) {
         LOGGER.info("Running getServiceMetadata for {} ...", csarId);
-        final Optional<Metadata> resource = resourceProvider.getMetadata(csarId, AssetType.SERVICES);
+        final Optional<Metadata> resource = assetProvider.getMetadata(csarId, AssetType.SERVICES);
         if (resource.isPresent()) {
             return new ResponseEntity<>(resource.get(), HttpStatus.OK);
         }