From aef83200a4c363b1916e97d7ec7bbe92b6631158 Mon Sep 17 00:00:00 2001
From: Ethan <ethan@MacBook-Pro.local>
Date: Tue, 15 Jul 2025 12:13:38 +0100
Subject: [PATCH] merge main

---
 .../stirling/software/common/aop/AutoJobAspect.java   | 11 +++++++----
 .../stirling/software/common/model/job/JobResult.java |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java b/app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java
index 9f01c4558..2ee10ebcd 100644
--- a/app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java
+++ b/app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java
@@ -43,7 +43,11 @@ public class AutoJobAspect {
         // This aspect will run before any audit aspects due to @Order(0)
         // Extract parameters from the request and annotation
         boolean async = Boolean.parseBoolean(request.getParameter("async"));
-        log.debug("AutoJobAspect: Processing {} {} with async={}", request.getMethod(), request.getRequestURI(), async);
+        log.debug(
+                "AutoJobAspect: Processing {} {} with async={}",
+                request.getMethod(),
+                request.getRequestURI(),
+                async);
         long timeout = autoJobPostMapping.timeout();
         int retryCount = autoJobPostMapping.retryCount();
         boolean trackProgress = autoJobPostMapping.trackProgress();
@@ -219,10 +223,9 @@ public class AutoJobAspect {
                 resourceWeight);
     }
 
-
     /**
-     * Processes arguments in-place to handle file resolution and async file persistence.
-     * This approach avoids type mismatch issues by modifying the original objects directly.
+     * Processes arguments in-place to handle file resolution and async file persistence. This
+     * approach avoids type mismatch issues by modifying the original objects directly.
      *
      * @param originalArgs The original arguments
      * @param async Whether this is an async operation
diff --git a/app/common/src/main/java/stirling/software/common/model/job/JobResult.java b/app/common/src/main/java/stirling/software/common/model/job/JobResult.java
index e4eb456fd..52c0826e2 100644
--- a/app/common/src/main/java/stirling/software/common/model/job/JobResult.java
+++ b/app/common/src/main/java/stirling/software/common/model/job/JobResult.java
@@ -30,8 +30,7 @@ public class JobResult {
     private String error;
 
     /** List of result files for jobs that produce files */
-    @JsonIgnore
-    private List<ResultFile> resultFiles;
+    @JsonIgnore private List<ResultFile> resultFiles;
 
     /** Time when the job was created */
     private LocalDateTime createdAt;