From c0cb38d48e79c3461a369e0ba78e3fdcaf11c3c1 Mon Sep 17 00:00:00 2001 From: ThisBirchWood Date: Mon, 19 May 2025 14:52:39 +0200 Subject: [PATCH] ADD prefix to all API controllers --- bruno/VoD-System/Download Input.bru | 2 +- bruno/VoD-System/Download Output.bru | 2 +- bruno/VoD-System/Edit.bru | 2 +- bruno/VoD-System/Process.bru | 2 +- bruno/VoD-System/Progress.bru | 2 +- bruno/VoD-System/Upload.bru | 2 +- .../ddf/vodsystem/controllers/DownloadController.java | 11 ++++++----- .../com/ddf/vodsystem/controllers/EditController.java | 1 + .../ddf/vodsystem/controllers/UploadController.java | 2 ++ 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bruno/VoD-System/Download Input.bru b/bruno/VoD-System/Download Input.bru index fdf2b5b..1e10802 100644 --- a/bruno/VoD-System/Download Input.bru +++ b/bruno/VoD-System/Download Input.bru @@ -5,7 +5,7 @@ meta { } get { - url: {{base_url}}/download/input/{{video_uuid}} + url: {{base_url}}/api/v1/download/input/{{video_uuid}} body: none auth: inherit } diff --git a/bruno/VoD-System/Download Output.bru b/bruno/VoD-System/Download Output.bru index f6ff94e..a85fc85 100644 --- a/bruno/VoD-System/Download Output.bru +++ b/bruno/VoD-System/Download Output.bru @@ -5,7 +5,7 @@ meta { } get { - url: {{base_url}}/download/output/{{video_uuid}} + url: {{base_url}}/api/v1/download/output/{{video_uuid}} body: none auth: inherit } diff --git a/bruno/VoD-System/Edit.bru b/bruno/VoD-System/Edit.bru index 0aa5c80..ca2ec0c 100644 --- a/bruno/VoD-System/Edit.bru +++ b/bruno/VoD-System/Edit.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{base_url}}/edit/{{video_uuid}} + url: {{base_url}}/api/v1/edit/{{video_uuid}} body: formUrlEncoded auth: inherit } diff --git a/bruno/VoD-System/Process.bru b/bruno/VoD-System/Process.bru index 3d03dc5..2a1595c 100644 --- a/bruno/VoD-System/Process.bru +++ b/bruno/VoD-System/Process.bru @@ -5,7 +5,7 @@ meta { } get { - url: {{base_url}}/process/{{video_uuid}} + url: {{base_url}}/api/v1/process/{{video_uuid}} body: none auth: inherit } diff --git a/bruno/VoD-System/Progress.bru b/bruno/VoD-System/Progress.bru index 192dcd9..d7bb165 100644 --- a/bruno/VoD-System/Progress.bru +++ b/bruno/VoD-System/Progress.bru @@ -5,7 +5,7 @@ meta { } get { - url: {{base_url}}/progress/{{video_uuid}} + url: {{base_url}}/api/v1/progress/{{video_uuid}} body: none auth: inherit } diff --git a/bruno/VoD-System/Upload.bru b/bruno/VoD-System/Upload.bru index 1b0461a..48de474 100644 --- a/bruno/VoD-System/Upload.bru +++ b/bruno/VoD-System/Upload.bru @@ -5,7 +5,7 @@ meta { } post { - url: {{base_url}}/upload + url: {{base_url}}/api/v1/upload body: multipartForm auth: inherit } diff --git a/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java b/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java index 6dd6be4..608b048 100644 --- a/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java +++ b/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; +import org.springframework.http.MediaTypeFactory; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/download") +@RequestMapping("api/v1/download") public class DownloadController { private final DownloadService downloadService; @@ -30,8 +31,8 @@ public class DownloadController { } return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"") - .contentType(MediaType.APPLICATION_OCTET_STREAM) + .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + resource.getFilename() + "\"") + .contentType(MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM)) .body(resource); } @@ -44,8 +45,8 @@ public class DownloadController { } return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"") - .contentType(MediaType.APPLICATION_OCTET_STREAM) + .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + resource.getFilename() + "\"") + .contentType(MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM)) .body(resource); } } diff --git a/src/main/java/com/ddf/vodsystem/controllers/EditController.java b/src/main/java/com/ddf/vodsystem/controllers/EditController.java index 425a147..dc51809 100644 --- a/src/main/java/com/ddf/vodsystem/controllers/EditController.java +++ b/src/main/java/com/ddf/vodsystem/controllers/EditController.java @@ -8,6 +8,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @RestController +@RequestMapping("api/v1/") public class EditController { private final EditService editService; diff --git a/src/main/java/com/ddf/vodsystem/controllers/UploadController.java b/src/main/java/com/ddf/vodsystem/controllers/UploadController.java index c37df8c..d53e8e8 100644 --- a/src/main/java/com/ddf/vodsystem/controllers/UploadController.java +++ b/src/main/java/com/ddf/vodsystem/controllers/UploadController.java @@ -5,11 +5,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @RestController +@RequestMapping("api/v1/") public class UploadController { private final UploadService uploadService;