Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-11-16 01:21:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply defaults and enforce validation for mode, orientation, and pageOrder

Browse Source 
Ensure null or blank values fall back to defaults and reject unsupported
options with IllegalArgumentException.
This commit is contained in:
OUNZAR Aymane 2025-11-05 11:17:52 +01:00
parent 0508ae4aa6
commit bdf3878eeb
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/core/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
View File

@ -50,6 +50,10 @@ public class MultiPageLayoutController {
@ModelAttribute MergeMultiplePagesRequest request) throws IOException { @ModelAttribute MergeMultiplePagesRequest request) throws IOException {
String mode = request.getMode(); String mode = request.getMode();
if (mode == null || mode.trim().isEmpty()) {
mode = "DEFAULT";
}
int rows = 0; int rows = 0;
int cols = 0; int cols = 0;
int pagesPerSheet = 0; int pagesPerSheet = 0;
@ -82,11 +86,24 @@ public class MultiPageLayoutController {
} }
pagesPerSheet = cols * rows; pagesPerSheet = cols * rows;
break; break;
default:
throw new IllegalArgumentException(
"Mode must be CUSTOM or DEFAULT. Null value rolls back to DEFAULT");
} }
MultipartFile file = request.getFileInput(); MultipartFile file = request.getFileInput();
String orientation = request.getOrientation(); String orientation = request.getOrientation();
if (orientation == null || orientation.trim().isEmpty()) {
orientation = "PORTRAIT";
}
if (!"PORTRAIT".equals(orientation) && !"LANDSCAPE".equals(orientation)) {
throw new IllegalArgumentException("Orientation must be PORTRAIT or LANDSCAPE");
}
String pageOrder = request.getPageOrder(); String pageOrder = request.getPageOrder();
if (pageOrder == null || pageOrder.trim().isEmpty()) {
pageOrder = "LR_TD";
}
boolean addBorder = Boolean.TRUE.equals(request.getAddBorder()); boolean addBorder = Boolean.TRUE.equals(request.getAddBorder());
PDDocument sourceDocument = pdfDocumentFactory.load(file); PDDocument sourceDocument = pdfDocumentFactory.load(file);
@ -96,7 +113,6 @@ public class MultiPageLayoutController {
// Create a new A4 landscape rectangle that we use when orientation is landscape // Create a new A4 landscape rectangle that we use when orientation is landscape
PDRectangle a4Landscape = PDRectangle a4Landscape =
new PDRectangle(PDRectangle.A4.getHeight(), PDRectangle.A4.getWidth()); new PDRectangle(PDRectangle.A4.getHeight(), PDRectangle.A4.getWidth());
PDPage newPage = PDPage newPage =
"PORTRAIT".equals(orientation) "PORTRAIT".equals(orientation)
? new PDPage(PDRectangle.A4) ? new PDPage(PDRectangle.A4)
@ -166,6 +182,9 @@ public class MultiPageLayoutController {
colIndex = cols - 1 - (adjustedPageIndex / rows); colIndex = cols - 1 - (adjustedPageIndex / rows);
rowIndex = adjustedPageIndex % rows; rowIndex = adjustedPageIndex % rows;
break; break;
default:
throw new IllegalArgumentException(
"Page order must be one of the following supported options: LR_TD, RL_TD, TD_LR, or TD_RL.");
} }
float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2; float x = colIndex * cellWidth + (cellWidth - rect.getWidth() * scale) / 2;