Merge branch 'main' into refactor-tests

# Conflicts: # app/core/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java
2025-08-29 13:48:46 +02:00 · 2025-08-01 23:11:07 +02:00 · 2025-08-01 23:11:07 +02:00 · 5505130a36
commit 5505130a36
parent 79021b69f6 a5d219ed05
16 changed files with 69 additions and 101 deletions
--- a/.github/workflows/ai_pr_title_review.yml
+++ b/.github/workflows/ai_pr_title_review.yml
@ -87,7 +87,7 @@ jobs:
      - name: AI PR Title Analysis
        if: steps.actor.outputs.is_repo_dev == 'true'
        id: ai-title-analysis
-        uses: actions/ai-inference@d645f067d89ee1d5d736a5990e327e504d1c5a4a # v1.1.0
+        uses: actions/ai-inference@9693b137b6566bb66055a713613bf4f0493701eb # v1.2.3
        with:
          model: openai/gpt-4o
          system-prompt-file: ".github/config/system-prompt.txt"
--- a/.github/workflows/pre_commit.yml
+++ b/.github/workflows/pre_commit.yml
@ -2,8 +2,9 @@ name: Pre-commit

 on:
  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - main

 permissions:
  contents: read
@ -46,6 +47,15 @@ jobs:
      - run: pre-commit run --all-files -c .pre-commit-config.yaml
        continue-on-error: true

+      - name: Set up JDK
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          java-version: 17
+          distribution: "temurin"
+
+      - name: Build with Gradle
+        run: ./gradlew clean build
+
      - name: git add
        run: |
          git add .
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@ -74,6 +74,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
        with:
          sarif_file: results.sarif
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
+    rev: v0.12.7
    hooks:
      - id: ruff
        args:
@ -22,7 +22,7 @@ repos:
        files: \.(html|css|js|py|md)$
        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.27.2
+    rev: v8.28.0
    hooks:
      - id: gitleaks
  - repo: https://github.com/pre-commit/pre-commit-hooks
--- a/3
+++ b/3
@ -78,7 +78,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    # URW Base 35 fonts for better PDF rendering
    font-urw-base35 && \
    python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade pip setuptools && \
    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
    ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
@ -89,7 +89,6 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
    fc-cache -f -v && \
    chmod +x /scripts/* && \
-    chmod +x /scripts/init.sh && \
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@ -36,7 +36,7 @@ ENV SETUPTOOLS_USE_DISTUTILS=local \
 # Installation der benötigten Python-Pakete
 RUN python3 -m venv --system-site-packages /opt/venv \
  && . /opt/venv/bin/activate \
-  && pip install --upgrade pip setuptools \
+  && pip install --no-cache-dir --upgrade pip setuptools \
  && pip install --no-cache-dir WeasyPrint pdf2image pillow unoserver opencv-python-headless pre-commit

 # Füge den venv-Pfad zur globalen PATH-Variable hinzu, damit die Tools verfügbar sind
@ -54,8 +54,7 @@ RUN echo "devuser ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devuser \
 # Setze das Arbeitsverzeichnis (wird später per Bind-Mount überschrieben)
 WORKDIR /workspace

-RUN chmod +x /workspace/.devcontainer/git-init.sh
-RUN sudo chmod +x /workspace/.devcontainer/init-setup.sh
+RUN chmod +x /workspace/.devcontainer/git-init.sh /workspace/.devcontainer/init-setup.sh

 # Wechsel zum Nicht‑Root Benutzer
 USER devuser
--- a/Dockerfile.fat
+++ b/Dockerfile.fat
@ -91,7 +91,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    py3-pillow@testing \
    py3-pdf2image@testing && \
    python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade pip setuptools && \
    /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
    ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
    ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
@ -102,7 +102,6 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
    ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
    fc-cache -f -v && \
    chmod +x /scripts/* && \
-    chmod +x /scripts/init.sh && \
    # User permissions
    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
--- a/README.md
+++ b/README.md
@ -152,7 +152,7 @@ Stirling-PDF currently supports 40 languages!
 | Swedish (Svenska) (sv_SE)                    | ![67%](https://geps.dev/progress/67)   |
 | Thai (ไทย) (th_TH)                           | ![60%](https://geps.dev/progress/60)   |
 | Tibetan (བོད་ཡིག་) (bo_CN)                     | ![66%](https://geps.dev/progress/66) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![77%](https://geps.dev/progress/77)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
 | Turkish (Türkçe) (tr_TR)                     | ![82%](https://geps.dev/progress/82)   |
 | Ukrainian (Українська) (uk_UA)               | ![72%](https://geps.dev/progress/72)   |
 | Vietnamese (Tiếng Việt) (vi_VN)              | ![58%](https://geps.dev/progress/58)   |
--- a/app/common/build.gradle
+++ b/app/common/build.gradle
@ -5,6 +5,7 @@ bootRun {
 spotless {
    java {
        target sourceSets.main.allJava
+        target sourceSets.test.allJava
        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)

        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
--- a/app/core/build.gradle
+++ b/app/core/build.gradle
@ -15,6 +15,7 @@ configurations {
 spotless {
    java {
        target sourceSets.main.allJava
+        target sourceSets.test.allJava
        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)

        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
@ -62,7 +63,7 @@ dependencies {
        exclude group: 'com.google.code.gson', module: 'gson'
    }
    implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
-    implementation 'com.opencsv:opencsv:5.11.2' // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation 'com.opencsv:opencsv:5.12.0' // https://mvnrepository.com/artifact/com.opencsv/opencsv

    // Batik
    implementation 'org.apache.xmlgraphics:batik-all:1.19'
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@ -108,9 +108,13 @@ public class PipelineProcessor {
            if (inputFileTypes == null) {
                inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
            }
-            if (!operation.matches("^[a-zA-Z0-9_-]+$")) {
-                throw new IllegalArgumentException("Invalid operation value received.");
+
+            if (!apiDocService.isValidOperation(operation, parameters)) {
+                log.error("Invalid operation or parameters: o:{} p:{}", operation, parameters);
+                throw new IllegalArgumentException(
+                        "Invalid operation: " + operation + " with parameters: " + parameters);
            }
+
            String url = getBaseUrl() + operation;
            List<Resource> newOutputFiles = new ArrayList<>();
            if (!isMultiInputOperation) {
@ -136,7 +140,7 @@ public class PipelineProcessor {
                            // skip
                            // this
                            // file
-                            if (operation.startsWith("filter-")
+                            if (operation.startsWith("/api/v1/filter/filter-")
                                    && (response.getBody() == null
                                            || response.getBody().length == 0)) {
                                filtersApplied = true;
--- a/app/core/src/main/resources/static/css/edit-table-of-contents.css
+++ b/app/core/src/main/resources/static/css/edit-table-of-contents.css
@ -1,6 +1,6 @@
 /* Main bookmark container styles */
 .bookmark-editor {
-  margin-top: 20px;
+  margin-bottom: 20px;
  padding: 20px;
  border: 1px solid var(--border-color, #ced4da);
  border-radius: 0.25rem;
@ -273,4 +273,4 @@
  --text-muted: var(--md-sys-color-on-surface-variant, #adb5bd);
  --bg-empty: var(--md-sys-color-surface-container-low, #24282e);
  --border-empty: var(--md-sys-color-outline, #495057);
-}
+}
--- a/app/core/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java
+++ b/app/core/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java
@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.pipeline;

-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;

@ -8,8 +9,6 @@ import java.util.List;
 import java.util.Map;

 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@ -28,7 +27,6 @@ import stirling.software.SPDF.model.PipelineResult;
 import stirling.software.SPDF.service.ApiDocService;

@ExtendWith(MockitoExtension.class)
-@DisplayName("PipelineProcessor Tests")
 class PipelineProcessorTest {

    @Mock ApiDocService apiDocService;
@ -44,85 +42,40 @@ class PipelineProcessorTest {
        pipelineProcessor = spy(new PipelineProcessor(apiDocService, userService, servletContext));
    }

-    @Nested
-    @DisplayName("Pipeline Execution with Filter Tests")
-    class PipelineExecutionWithFilterTests {
+    @Test
+    void runPipelineWithFilterSetsFlag() throws Exception {
+        PipelineOperation op = new PipelineOperation();
+        op.setOperation("/api/v1/filter/filter-page-count");
+        op.setParameters(Map.of());
+        PipelineConfig config = new PipelineConfig();
+        config.setOperations(List.of(op));

-        @Test
-        @DisplayName("Sets filtersApplied flag to true when filter operation is applied")
-        void runPipelineWithFilterSetsFlag() throws Exception {
-            // Arrange
-            PipelineOperation op = new PipelineOperation();
-            op.setOperation("filter-page-count");
-            op.setParameters(Map.of());
-            PipelineConfig config = new PipelineConfig();
-            config.setOperations(List.of(op));
+        Resource file =
+                new ByteArrayResource("data".getBytes()) {
+                    @Override
+                    public String getFilename() {
+                        return "test.pdf";
+                    }
+                };

-            Resource file = new ByteArrayResource("data".getBytes()) {
-                @Override
-                public String getFilename() {
-                    return "test.pdf";
-                }
-            };
+        List<Resource> files = List.of(file);

-            List<Resource> files = List.of(file);
-
-            when(apiDocService.isMultiInput("filter-page-count")).thenReturn(false);
-            when(apiDocService.getExtensionTypes(false, "filter-page-count"))
+        when(apiDocService.isMultiInput("/api/v1/filter/filter-page-count")).thenReturn(false);
+        when(apiDocService.getExtensionTypes(false, "/api/v1/filter/filter-page-count"))
                .thenReturn(List.of("pdf"));
+        when(apiDocService.isValidOperation(eq("/api/v1/filter/filter-page-count"), anyMap()))
+                .thenReturn(true);

-            doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
+        doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
                .when(pipelineProcessor)
                .sendWebRequest(anyString(), any());

-            // Act
-            PipelineResult result = pipelineProcessor.runPipelineAgainstFiles(files, config);
+        PipelineResult result = pipelineProcessor.runPipelineAgainstFiles(files, config);

-            // Assert
-            assertTrue(result.isFiltersApplied(), "Filter flag should be true when operation filters file");
-            assertFalse(result.isHasErrors(), "No errors should occur");
-            assertTrue(result.getOutputFiles().isEmpty(), "Filtered file list should be empty");
-        }
-    }
-
-    @Nested
-    @DisplayName("Pipeline Execution without Filter Tests")
-    class PipelineExecutionWithoutFilterTests {
-
-        @Test
-        @DisplayName("Does not set filtersApplied flag for non-filter operations")
-        void runPipelineWithoutFilterDoesNotSetFlag() throws Exception {
-            // Arrange
-            PipelineOperation op = new PipelineOperation();
-            op.setOperation("some-non-filter-operation");
-            op.setParameters(Map.of());
-            PipelineConfig config = new PipelineConfig();
-            config.setOperations(List.of(op));
-
-            Resource file = new ByteArrayResource("data".getBytes()) {
-                @Override
-                public String getFilename() {
-                    return "test.pdf";
-                }
-            };
-
-            List<Resource> files = List.of(file);
-
-            when(apiDocService.isMultiInput("some-non-filter-operation")).thenReturn(false);
-            when(apiDocService.getExtensionTypes(false, "some-non-filter-operation"))
-                .thenReturn(List.of("pdf"));
-
-            doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
-                .when(pipelineProcessor)
-                .sendWebRequest(anyString(), any());
-
-            // Act
-            PipelineResult result = pipelineProcessor.runPipelineAgainstFiles(files, config);
-
-            // Assert
-            assertFalse(result.isFiltersApplied(), "Filter flag should be false for non-filter operations");
-            assertFalse(result.isHasErrors(), "No errors should occur");
-            assertFalse(result.getOutputFiles().isEmpty(), "Output files should not be empty for non-filter operations");
-        }
+        assertTrue(
+                result.isFiltersApplied(),
+                "Filter flag should be true when operation filters file");
+        assertFalse(result.isHasErrors(), "No errors should occur");
+        assertTrue(result.getOutputFiles().isEmpty(), "Filtered file list should be empty");
    }
 }
--- a/app/proprietary/build.gradle
+++ b/app/proprietary/build.gradle
@ -7,6 +7,7 @@ bootRun {
 spotless {
    java {
        target sourceSets.main.allJava
+        target sourceSets.test.allJava
        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)

        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
--- a/build.gradle
+++ b/build.gradle
@ -2,10 +2,10 @@ plugins {
    id "java"
    id "jacoco"
    id "io.spring.dependency-management" version "1.1.7"
-    id "org.springframework.boot" version "3.5.3"
+    id "org.springframework.boot" version "3.5.4"
    id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
    id "io.swagger.swaggerhub" version "1.3.2"
-    id "edu.sc.seis.launch4j" version "3.0.6"
+    id "edu.sc.seis.launch4j" version "3.0.7"
    id "com.diffplug.spotless" version "7.2.1"
    id "com.github.jk1.dependency-license-report" version "2.9"
    //id "nebula.lint" version "19.0.3"
@ -21,7 +21,7 @@ import java.nio.file.Files
 import java.time.Year

 ext {
-    springBootVersion = "3.5.3"
+    springBootVersion = "3.5.4"
    pdfboxVersion = "3.0.5"
    imageioVersion = "3.12.0"
    lombokVersion = "1.18.38"
@ -530,9 +530,13 @@ launch4j {
 spotless {
    java {
        target sourceSets.main.allJava
+        target sourceSets.test.allJava
        target project(':common').sourceSets.main.allJava
+        target project(':common').sourceSets.test.allJava
        target project(':proprietary').sourceSets.main.allJava
+        target project(':proprietary').sourceSets.test.allJava
        target project(':stirling-pdf').sourceSets.main.allJava
+        target project(':stirling-pdf').sourceSets.test.allJava

        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)

--- a/scripts/ignore_translation.toml
+++ b/scripts/ignore_translation.toml
@ -1026,8 +1026,5 @@ ignore = [

 [zh_TW]
 ignore = [
-    'lang.dzo',
-    'lang.iku',
-    'lang.que',
    'language.direction',
 ]