Url decode the resourceId supplied to store.getResourceInternal to fix filenames containing spaces.

[ianwallen]

Url decode the resourceId supplied to store.getResourceInternal to fix filenames containing spaces.

Without this fix, filename containing spaces may not be indexed in the data url as the file will not be found due to %20 in the filename.

Checklist

• I have read the contribution guidelines
• Pull request provided for main branch, backports managed with label
• Good housekeeping of code, cleaning up comments, tests, and documentation
• Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
• Clean commit messages, longer verbose messages are encouraged
• API Changes are identified in commit messages
• Testing provided for features or enhancements using automatic tests
• User documentation provided for new features or enhancements in manual
• Build documentation provided for development instructions in README.md files
• Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

[josegar74]

Tested with thumbnail files containing spaces in the file name and seems working fine.

[geonetworkbuild]

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply b16dd58565... Url decode the resourceId supplied to store.getResourceInternal to fix filenames containing spaces.
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout

Auto-merging core/src/main/java/org/fao/geonet/util/XslUtil.java
CONFLICT (content): Merge conflict in core/src/main/java/org/fao/geonet/util/XslUtil.java

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8581-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b16dd585656a30d5c42a97fcecd841e7e3000d65
# Push it to GitHub
git push --set-upstream origin backport-8581-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8581-to-4.2.x.

[wangf1122]

4.2 Backport conflict fixing pull request available #8587