Skip to content

deprecate old toUri method and use toURL to make clear what its about #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 2 commits into from
Jun 14, 2025
Merged

deprecate old toUri method and use toURL to make clear what its about #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf16e7
deprecate old toUri method and use toURL to make clear what its about
thmarx Jun 13, 2025
48b34dc
update changelog
thmarx Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ see wiki for more information: [wiki](https://github.com/thmarx/cms/wiki)
* **BUGFIX** TemplateEngine should use cache only if activated [456](https://github.com/CondationCMS/cms-server/issues/456)
* **MAINTENANCE** multiple dependencies updated
* **MAINTENANCE** maven wrapper added to project
* **MAINTENANCE** Deprecate/replace PathUtil.toURI with PathUtil.toURL [462](https://github.com/CondationCMS/cms-server/issues/462)
* **FEATURE** Developer Experience [PR-440](https://github.com/CondationCMS/cms-server/pull/440)
* **FEATURE** Aliases for content [442](https://github.com/CondationCMS/cms-server/issues/442)
* **FEATURE** Add redirect support for aliases [454](https://github.com/CondationCMS/cms-server/issues/454)
Expand Down
46 changes: 28 additions & 18 deletions cms-api/src/main/java/com/condation/cms/api/utils/PathUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,40 @@ public static String toRelativeFile(ReadOnlyFile contentFile, final ReadOnlyFile
return uri;
}

/**
*
* @param contentFile
* @param contentBase
* @return
* @deprecated use PathUtil.toURL instead
*/
@Deprecated(since = "8.0.0")
public static String toURI (final Path contentFile, final Path contentBase) {
return toURL(contentFile, contentBase);
}
/**
*
* @param contentFile
* @param contentBase
* @return
* @deprecated use PathUtil.toURL instead
*/
@Deprecated(since = "8.0.0")
public static String toURI(final ReadOnlyFile contentFile, final ReadOnlyFile contentBase) {
return toURL(contentFile, contentBase);
}

public static String toURL(final Path contentFile, final Path contentBase) {
var relFile = toRelativeFile(contentFile, contentBase);
if (relFile.endsWith("index.md")) {
relFile = relFile.replace("index.md", "");
}

if (relFile.equals("")) {
relFile = "/";
} else if (relFile.endsWith("/")) {
relFile = relFile.substring(0, relFile.lastIndexOf("/"));
}

if (!relFile.startsWith("/")) {
relFile = "/" + relFile;
}
if (relFile.endsWith(".md")) {
relFile = relFile.substring(0, relFile.lastIndexOf(".md"));
}

return relFile;
return toURL(relFile);
}

public static String toURL(final ReadOnlyFile contentFile, final ReadOnlyFile contentBase) {
var relFile = toRelativeFile(contentFile, contentBase);
return toURL(relFile);
}

private static String toURL (String relFile) {
if (relFile.endsWith("index.md")) {
relFile = relFile.replace("index.md", "");
}
Expand Down