dev-otitarenko
diff --git a/‎file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/controllers/AzureBlobStorageController.java‎
Lines changed: 33 additions & 1 deletion b/‎file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/controllers/AzureBlobStorageController.java‎
Lines changed: 33 additions & 1 deletion
diff --git a/‎file-storage/src/test/java/com/maestro/examples/app/azure/filestorage/services/AzureBlobStorageServiceTest.java‎
Lines changed: 4 additions & 3 deletions b/‎file-storage/src/test/java/com/maestro/examples/app/azure/filestorage/services/AzureBlobStorageServiceTest.java‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎file-storage/src/test/java/com/maestro/examples/app/azure/filestorage/utils/CurlUtils.java‎
Lines changed: 0 additions & 4 deletions b/‎file-storage/src/test/java/com/maestro/examples/app/azure/filestorage/utils/CurlUtils.java‎
Lines changed: 0 additions & 4 deletions
@@ -1,22 +1,40 @@
 package com.maestro.examples.app.azure.filestorage.controllers;
 
+import com.azure.storage.blob.models.BlobContainerItem;
+import com.azure.storage.blob.models.BlobItem;
 import com.maestro.examples.app.azure.filestorage.domains.DataBlock;
 import com.maestro.examples.app.azure.filestorage.domains.FilePrm;
 import com.maestro.examples.app.azure.filestorage.services.AzureBlobStorageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/bs")
 @Slf4j
 public class AzureBlobStorageController {
- private AzureBlobStorageService fileService;
+ private final AzureBlobStorageService fileService;
 
  public AzureBlobStorageController(AzureBlobStorageService fileService) {
  this.fileService = fileService;
  }
 
+ /**
+ * Getting document file link from Azure Blob Storage
+ *
+ * @return List of blob's name
+ */
+ @GetMapping(value = "/")
+ public List<String> listContainers() {
+ return fileService.listContainers()
+ .stream()
+ .map(BlobContainerItem::getName)
+ .collect(Collectors.toList());
+ }
+
  /**
  * Creating container in Azure Blob Storage before uploading document file
  *
@@ -71,4 +89,18 @@ public void deleteDocFile(@PathVariable String idContainer, @PathVariable String
  public String getLinkDocFile(@PathVariable String idContainer, @PathVariable String idFile) {
  return fileService.getLinkFile(idContainer, idFile);
  }
+
+ /**
+ * Getting document file link from Azure Blob Storage
+ *
+ * @param idContainer document id
+ * @return List of blob's name
+ */
+ @GetMapping(value = "/{idContainer}/files")
+ public List<String> listBlobs(@PathVariable String idContainer) {
+ return fileService.listBlobs(idContainer)
+ .stream()
+ .map(BlobItem::getName)
+ .collect(Collectors.toList());
+ }
 }
@@ -101,17 +101,18 @@ void getLinkDocFile() throws IOException {
  // exec curl
  String command = String.format("curl -X GET %s", filesService.getLinkFile(idContainer, idFile1));
  Process process = Runtime.getRuntime().exec(command);
-
+ // get content
  final String content = CurlUtils.inputStreamToString(process.getInputStream());
- System.out.println(content);
-
+ // asserts
  assertTrue(null != content && !content.isEmpty());
+ assertEquals(content.trim(), "<html><head></head><body>Test</body></html>");
  }
 
  @Order(10)
  @Test
  void listOfContainers() {
  PagedIterable<BlobContainerItem> items = filesService.listContainers();
+ assertTrue(items.stream().count() >= 1);
  for (BlobContainerItem itm : items) {
  System.out.println(itm.getName());
  //assertEquals(itm.getName(), idContainer);
 
@@ -18,8 +18,4 @@ public static String inputStreamToString(InputStream inputStream) {
  }
  return builder.toString();
  }
-
- public static void consumeInputStream(InputStream inputStream) {
- inputStreamToString(inputStream);
- }
 }
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,4 @@ public static String inputStreamToString(InputStream inputStream) {`
`18`	`18`	`}`
`19`	`19`	`return builder.toString();`
`20`	`20`	`}`
`21`		`-`
`22`		`- public static void consumeInputStream(InputStream inputStream) {`
`23`		`- inputStreamToString(inputStream);`
`24`		`- }`
`25`	`21`	`}`