XCOMMONS-3249: Allow storing job status and logs in a shared location

xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/src/main/java/org/xwiki/job/internal/JobUtils.java

@@ -41,7 +41,8 @@ private JobUtils()
      */
     public static boolean isSerializable(JobStatus status)
     {
-        if (status.getRequest().getId() == null || !status.isSerialized()) {
+        if (status == null || status.getRequest() == null || status.getRequest().getId() == null
+            || !status.isSerialized()) {
             return false;
         }
 

xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/AbstractJobStatusFolderResolver.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -51,18 +52,29 @@ public abstract class AbstractJobStatusFolderResolver implements JobStatusFolder
     @Override
     public File getFolder(List<String> id)
     {
-        File folder = getBaseFolder();
+        File folder = this.configuration.getStorage();
 
-        if (id != null) {
-            // Create a different folder for each element
-            for (String fullIdElement : id) {
-                folder = addIDElement(fullIdElement, folder);
-            }
+        for (String pathSegment : getFolderSegments(id)) {
+            folder = new File(folder, pathSegment);
         }
 
         return folder;
     }
 
+    @Override
+    public List<String> getFolderSegments(List<String> jobID)
+    {
+        List<String> result = new ArrayList<>(getBaseFolderSegments());
+
+        if (jobID != null) {
+            for (String idElement : jobID) {
+                result.addAll(encodeAndSplit(idElement));
+            }
+        }
+
+        return result;
+    }
+
     protected String nullAwareURLEncode(String value)
     {
         String encoded;
@@ -76,10 +88,17 @@ protected String nullAwareURLEncode(String value)
         return encoded;
     }
 
-    protected File getBaseFolder()
+    /**
+     * @return the base folder segments for the job status folder, override to provide a custom base folder
+     */
+    protected List<String> getBaseFolderSegments()
     {
-        return this.configuration.getStorage();
+        return List.of();
     }
 
-    protected abstract File addIDElement(String idElement, File folder);
+    /**
+     * @param idElement the id element to encode and split
+     * @return the encoded and split id element
+     */
+    protected abstract List<String> encodeAndSplit(String idElement);
 }

xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java

@@ -34,7 +34,7 @@
  *
  * @version $Id$
  * @since 4.0M1
- * @deprecated since 6.1M2, use {@link org.xwiki.job.internal.DefaultJobStatusStore} instead
+ * @deprecated since 6.1M2, use {@link DefaultJobStatusStore} instead
  */
 @Component
 @Singleton