Small changes

Author: dev-otitarenko

.gitignore

@@ -55,11 +55,8 @@ hs_err_pid*
 # Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
+.idea/**/*.xml
+.idea/**/*.iml
 
 # Gradle
 .idea/**/gradle.xml

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

@@ -5,9 +5,7 @@
 
 @SpringBootApplication
 public class FileStorageApplication {
-
 public static void main(String[] args) {
 SpringApplication.run(FileStorageApplication.class, args);
 }
-
 }

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

@@ -0,0 +1,74 @@
+package com.maestro.examples.app.azure.filestorage.controllers;
+
+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.*;
+
+@RestController
+@RequestMapping("/bs")
+@Slf4j
+public class AzureBlobStorageController {
+ private AzureBlobStorageService fileService;
+
+ public AzureBlobStorageController(AzureBlobStorageService fileService) {
+ this.fileService = fileService;
+ }
+
+ /**
+ * Creating container in Azure Blob Storage before uploading document file
+ *
+ * @param idContainer document id
+ * @return String
+ */
+ @PostMapping(value = "/{idContainer}/files/before-upload")
+ public String beforeUploadDocFile(@PathVariable String idContainer) {
+ return fileService.beforeUpload(idContainer);
+ }
+
+ /**
+ * Uploading document file chunk into Azure Blob Storage
+ *
+ * @param idContainer document id
+ * @param idFile file id
+ */
+ @PutMapping(value = "{idContainer}/files/{idFile}")
+ public void uploadDocFile(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated DataBlock data) {
+ fileService.uploadFile(idContainer, idFile, data);
+ }
+
+ /**
+ * Completing uploading file;s chunk into Azure Blob Storage
+ *
+ * @param idContainer document id
+ * @param idFile file id
+ */
+ @PostMapping(value = "/{idContainer}/files/{idFile}")
+ public void completeUploadDocFile(@PathVariable String idContainer, @PathVariable String idFile, @RequestBody @Validated FilePrm data) {
+ fileService.completeUploadFile(idContainer, idFile, data);
+ }
+
+ /**
+ * Deleting file from Azure Blob Storage
+ *
+ * @param idContainer document id
+ * @param idFile file id
+ */
+ @DeleteMapping(value = "{idContainer}/files/{idFile}")
+ public void deleteDocFile(@PathVariable String idContainer, @PathVariable String idFile) {
+ fileService.deleteFile(idContainer, idFile);
+ }
+
+ /**
+ * Getting document file link from Azure Blob Storage
+ *
+ * @param idContainer document id
+ * @param idFile file id
+ */
+ @GetMapping(value = "/{idContainer}/files/{idFile}/link")
+ public String getLinkDocFile(@PathVariable String idContainer, @PathVariable String idFile) {
+ return fileService.getLinkFile(idContainer, idFile);
+ }
+}

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

@@ -4,9 +4,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class HelloController {
- @GetMapping(value = "/welcome")
+public class WelcomeController {
+ @GetMapping(value = "/")
  public String welcome () {
- return "Welcome to Spring Boot";
+ return "Welcome from Spring Boot app";
  }
 }

file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/controllers/HelloController.java renamed to file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/controllers/WelcomeController.java

@@ -1,11 +1,14 @@
-package com.maestro.examples.app.azure.filestorage.records;
+package com.maestro.examples.app.azure.filestorage.domains;
 
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * Information about uploaded file chunk
  */
 @Data
+@Builder
 public class DataBlock {
  /**
  * Base64 block id to upload

file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/records/DataBlock.java renamed to file-storage/src/main/java/com/maestro/examples/app/azure/filestorage/domains/DataBlock.java

@@ -1,5 +1,6 @@
-package com.maestro.examples.app.azure.filestorage.records;
+package com.maestro.examples.app.azure.filestorage.domains;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.List;
@@ -8,6 +9,7 @@
  * Dto class with information about file to complete upload to the storage
  */
 @Data
+@Builder
 public class FilePrm {
  /**
  * The file name