scaled changes

Stirling-Tools · May 31, 2023 · 15d3941 · 15d3941
1 parent 5e01946
commit 15d3941
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -165,7 +165,7 @@ public void init() {
         addEndpointToGroup("Java", "change-metadata");
         addEndpointToGroup("Java", "cert-sign");
         addEndpointToGroup("Java", "multi-page-layout");
-
+        addEndpointToGroup("Java", "scale-pages");
 
 
         //Javascript

diff --git a/.../api/other/MultiPageLayoutController.java → ...roller/api/MultiPageLayoutController.java b/.../api/other/MultiPageLayoutController.java → ...roller/api/MultiPageLayoutController.java
@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...oller/api/other/ScalePagesController.java → .../controller/api/ScalePagesController.java b/...oller/api/other/ScalePagesController.java → .../controller/api/ScalePagesController.java
@@ -1,4 +1,4 @@
-package stirling.software.SPDF.controller.api.other;
+package stirling.software.SPDF.controller.api;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,6 +25,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
+import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
 public class ScalePagesController {
@@ -81,8 +82,6 @@ public ResponseEntity<byte[]> mergeMultiplePagesIntoOne(
 		outputPdf.close();
 		byte[] pdfContent = baos.toByteArray();
 		pdfDoc.close();
-		return ResponseEntity.ok()
-				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_modified.pdf\"")
-				.body(pdfContent);
+		return WebResponseUtils.bytesToWebResponse(pdfContent, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_scaled.pdf");
 	}
 }
diff --git a/src/main/resources/static/images/scale-pages.svg b/src/main/resources/static/images/scale-pages.svg
diff --git a/src/main/resources/templates/other/scale-pages.html b/src/main/resources/templates/other/scale-pages.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 
-<th:block th:insert="~{fragments/common :: head(title=#{pageLayout.title})}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{scalePages.title})}"></th:block>
 
 
 <body>