file-storage: small changes

Author: dev-otitarenko

file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/controllers/AzureBlobStorageController.java

@@ -42,7 +42,7 @@ public List<String> listContainers() {
  * @return String
  */
  @PostMapping(value = "/{idContainer}/files/before-upload")
- public String beforeUploadDocFile(@PathVariable String idContainer) {
+ public String beforeUpload(@PathVariable String idContainer) {
  return fileService.beforeUpload(idContainer);
  }
 
@@ -53,7 +53,7 @@ public String beforeUploadDocFile(@PathVariable String idContainer) {
  * @param idFile file id
  */
  @PutMapping(value = "{idContainer}/files/{idFile}")
- public void uploadDocFile(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated DataBlock data) {
+ public void uploadFile(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated DataBlock data) {
  fileService.uploadFile(idContainer, idFile, data);
  }
 
@@ -64,7 +64,7 @@ public void uploadDocFile(@PathVariable String idContainer, @PathVariable String
  * @param idFile file id
  */
  @PostMapping(value = "/{idContainer}/files/{idFile}")
- public void completeUploadDocFile(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated FilePrm data) {
+ public void completeUpload(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated FilePrm data) {
  fileService.completeUploadFile(idContainer, idFile, data);
  }
 
@@ -75,7 +75,7 @@ public void completeUploadDocFile(@PathVariable String idContainer, @PathVariabl
  * @param idFile file id
  */
  @DeleteMapping(value = "{idContainer}/files/{idFile}")
- public void deleteDocFile(@PathVariable String idContainer, @PathVariable String idFile) {
+ public void deleteFile(@PathVariable String idContainer, @PathVariable String idFile) {
  fileService.deleteFile(idContainer, idFile);
  }
 
@@ -86,7 +86,7 @@ public void deleteDocFile(@PathVariable String idContainer, @PathVariable String
  * @param idFile file id
  */
  @GetMapping(value = "/{idContainer}/files/{idFile}/link")
- public String getLinkDocFile(@PathVariable String idContainer, @PathVariable String idFile) {
+ public String getLinkFile(@PathVariable String idContainer, @PathVariable String idFile) {
  return fileService.getLinkFile(idContainer, idFile);
  }
 
@@ -103,4 +103,14 @@ public List<String> listBlobs(@PathVariable String idContainer) {
  .map(BlobItem::getName)
  .collect(Collectors.toList());
  }
+
+ /**
+ * Deleting a container from Azure Blob Storage
+ *
+ * @param idContainer document id
+ */
+ @DeleteMapping(value = "/{idContainer}")
+ public void deleteContainer(@PathVariable String idContainer) {
+ fileService.deleteContainer(idContainer);
+ }
 }

file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/domains/FilePrm.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * Dto class with information about file to complete upload to the storage
+ * Information about file to complete upload to the storage
  */
 @Data
 @Builder
@@ -19,7 +19,6 @@ public class FilePrm {
  * The file type
  */
  private String type;
-
  /**
  * Base64 block ids to complete upload
  */

file-storage/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
- port: 8080
+ port: 8810
  servlet:
  context-path: /api
 
@@ -13,6 +13,6 @@ spring:
 
 app:
  azure-account:
- name: aksstnahuirisdev
- key: vOH2yCO6ENzwveKet82418/iy0WQukRU1jGSRusoGMAyU3yfLE6ioOtxLkhnhbjjqr1X/lkgViM4pQiANOls8w==
+ name:
+ key:
  offsetHours: 24

file-storage/src/test/java/com/maestro/examples/app/azure/filestorage/services/AzureBlobStorageServiceTest.java

@@ -2,6 +2,7 @@
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.storage.blob.models.BlobContainerItem;
+import com.azure.storage.blob.models.BlobContainerItemProperties;
 import com.azure.storage.blob.models.BlobItem;
 import com.maestro.examples.app.azure.filestorage.utils.CurlUtils;
 import com.maestro.examples.app.azure.filestorage.domains.DataBlock;
@@ -114,8 +115,22 @@ 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);
+ StringBuilder sb = new StringBuilder()/*,
+ sb1 = new StringBuilder()*/;
+ sb.append(" -> [" + itm.getName() + "] ");
+// if (itm.getMetadata() != null) {
+// itm.getMetadata().forEach((k, v) -> { if (sb1.length() > 0) sb1.append(", "); sb1.append(String.format("%s : %s", k, v)); } );
+// }
+// sb.append(", metadata: {");
+// sb.append(sb1);
+// sb.append(" }");
+ BlobContainerItemProperties properties = itm.getProperties();
+ sb.append(String.format(", \"leaseState\": \"%s\"", properties.getLeaseState().toString()));
+ sb.append(String.format(", \"leaseStatus\": \"%s\"", properties.getLeaseStatus().toString()));
+ sb.append(String.format(", \"lastModified\": \"%s\"", properties.getLastModified()));
+ sb.append(String.format(", \"ETag\": \"%s\"", properties.getETag()));
+
+ System.out.println(sb.toString());
  }
  }