Branch: refs/heads/backport-1261-to-stable-16.10.x Home: https://github.com/xwiki/xwiki-commons Commit: 6199b6f63569b2ecd22e2aacae74d9fbd87f4289 https://github.com/xwiki/xwiki-commons/commit/6199b6f63569b2ecd22e2aacae74d… Author: Michael Hamann <michael.hamann(a)xwiki.com> Date: 2025-03-20 (Thu, 20 Mar 2025) Changed paths: M xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/pom.xml A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/AbstractJobStatusFolderResolver.java M xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStore.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/JobStatusFolderResolver.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/Version1JobStatusFolderResolver.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/Version2JobStatusFolderResolver.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/Version3JobStatusFolderResolver.java M xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/resources/META-INF/components.txt M xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/DefaultJobStatusStoreTest.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/Version1JobStatusFolderResolverTest.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/Version2JobStatusFolderResolverTest.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/Version3JobStatusFolderResolverTest.java A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/3/correct/location/log.index A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/3/correct/location/log.xml A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/3/correct/location/status.xml A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location/log.index A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location/log.xml A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location/status.xml.zip A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location2/log.index A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location2/log.xml A xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/wrong/location2/status.xml.zip Log Message: ----------- XCOMMONS-3276: NPE Warnings after upgrading XWiki to 16.10.3 related to DefaultJobStatusStore - Failed to load job status (#1261) * Handle null values as before. * Also fix XCOMMONS-3275: Job status of jobs executed before the upgrade to 16.10.x cannot be loaded anymore * Improve the repair step: * Move the job log along with the job status during repair. * Delete empty directories during repair. * Handle duplicate job statuses by keeping the most recent one. * Revert the filename generation to use URL encoding but avoid problematic characters and add a version prefix. * Instead of moving all job statuses at startup, move them only when accessed and check old locations. * Add implementations of the previous job folder status names. * Add and improve tests. * Don't delete the whole directory on remove() but just the job files. * Move the checkstyle ignore into the Java file. (cherry picked from commit efcf062d4940c77839210c921383e5ccd0278fc8) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-commons/settings/notifications