feat: add Cloudflare R2 support via account-id and optional list caching#77
Merged
Conversation
Ports the useful parts of Tresillo2017's R2 fork (compare/main...Tresillo2017:BlueMapS3Storage:main) cleanly: that fork's diff turned out to contain no actual Java changes despite its CHANGELOG_R2.md describing new R2Storage/R2Configuration classes, just three overlapping markdown files and an accidentally committed node_modules/. R2 is S3-compatible, so it already works through the existing themeinerlp:s3 storage type. Rather than duplicating that as a parallel R2-specific implementation, this adds: - account-id: optional Cloudflare account ID. When set (and endpoint-url is left empty), the endpoint is derived automatically as https://<account-id>.r2.cloudflarestorage.com and path-style access is forced on, since R2 only supports path-style. - list-cache-ttl-seconds: optional TTL cache for mapIds() (map enumeration), since directory listings are a billed "Class A" operation on R2. Off by default (0); only affects map enumeration at init/reload, not tile reads/writes. (Fixes a pre-existing resource leak in mapIds() along the way — the underlying DirectoryStream was never closed.) Consolidates the fork's R2_GUIDE.md/R2_QUICK_START.md/CHANGELOG_R2.md into a single docs/cloudflare-r2.md, and documents both new options plus the existing checksum-validation option (added in #73 but never added to the README) in the main config table.
This was referenced Jul 13, 2026
TheMeinerLP
added a commit
that referenced
this pull request
Jul 13, 2026
Resolves the squash-merge ancestry gap left by #77's squash-merge: this branch had #78's ProviderProfile refactor on top of the pre-squash commit, so a normal merge against main's post-squash tip showed spurious conflicts on lines that were actually already superseded (main's version) by this branch's version (confirmed identical file-by-file diff before this merge).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Ports the useful parts of Tresillo2017's R2 fork (
compare/main...Tresillo2017:BlueMapS3Storage:main) cleanly. That fork's diff turned out to contain no actual Java changes despite itsCHANGELOG_R2.mddescribing newR2Storage/R2Configuration/R2FileSystemFactoryclasses: just three overlapping markdown files and an accidentally-committednode_modules/(295 files).R2 is S3-compatible, so it already works through the existing
themeinerlp:s3storage type (their own docs even note this as a "workaround"). Rather than duplicating that as a parallel R2-specific implementation, this adds two small, real conveniences to the existing config instead:account-id: optional Cloudflare account ID. When set (andendpoint-urlis left empty), the endpoint is derived automatically ashttps://<account-id>.r2.cloudflarestorage.comand path-style access is forced on, since R2 only supports path-style.list-cache-ttl-seconds: optional TTL cache formapIds()(map enumeration), since directory listings are a billed "Class A" operation on R2. Off by default (0); only affects map enumeration at init/reload, not tile reads/writes. Fixed a pre-existing resource leak inmapIds()along the way, the underlyingDirectoryStreamwas never closed.Consolidates the fork's
R2_GUIDE.md/R2_QUICK_START.md/CHANGELOG_R2.mdinto a singledocs/cloudflare-r2.md, and documents both new options plus the existingchecksum-validationoption (added in #73 but never added to the README) in the main config table.Test plan
./gradlew compileJavapasses./gradlew spotlessApply— no formatting changes beyond this featureaccount-idagainst a real R2 bucket and confirm the endpoint/path-style derivation works end to end