Skip to content

chore: minor code quality improvements #49

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
ruibaby merged 1 commit into from
Apr 27, 2026
Merged

chore: minor code quality improvements #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/java/run/halo/sitemap/SitemapPluginConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
import static org.springframework.web.reactive.function.server.RequestPredicates.accept;

import java.nio.charset.StandardCharsets;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -33,9 +34,12 @@ RouterFunction<ServerResponse> sitemapRouterFunction(CachedSitemapGetter cachedS
var options = SitemapGeneratorOptions.builder()
.siteUrl(url)
.build();
var xmlMediaType = new MediaType(MediaType.TEXT_XML, StandardCharsets.UTF_8);
return cachedSitemapGetter.get(options)
.filter(sitemap -> !sitemap.isBlank())
.flatMap(sitemap -> ServerResponse.ok()
.contentType(MediaType.TEXT_XML).bodyValue(sitemap));
.contentType(xmlMediaType).bodyValue(sitemap))
.switchIfEmpty(ServerResponse.noContent().build());
}
);
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/run/halo/sitemap/UrlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public final class UrlUtils {
*/
public static String escapeSitemapUrl(String url) {
Assert.notNull(url, "The url must not be null");
return url.replaceAll("&", "&amp;")
.replaceAll("'", "&apos;")
.replaceAll("\"", "&quot;")
.replaceAll(">", "&gt;")
.replaceAll("<", "&lt;");
return url.replace("&", "&amp;")
.replace("'", "&apos;")
.replace("\"", "&quot;")
.replace(">", "&gt;")
.replace("<", "&lt;");
}

public static URI toURI(String s) {
Expand Down
Loading