X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2Fvalidation%2FProjectValidator.java;h=a25aa9deaaba8214da6643b9f21fdd93560796f8;hp=2e03e6c34a57c2e9124cd5efea2f3af488084fde;hb=fd3bd2c16b6d9d617bb70478c11ac756a726999f;hpb=2d6256e4191697fdc4d033e93d53a59308a516fe diff --git a/src/main/java/de/todesbaum/jsite/application/validation/ProjectValidator.java b/src/main/java/de/todesbaum/jsite/application/validation/ProjectValidator.java index 2e03e6c..a25aa9d 100644 --- a/src/main/java/de/todesbaum/jsite/application/validation/ProjectValidator.java +++ b/src/main/java/de/todesbaum/jsite/application/validation/ProjectValidator.java @@ -10,6 +10,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Stream; import de.todesbaum.jsite.application.FileOption; import de.todesbaum.jsite.application.Project; @@ -44,8 +45,7 @@ public class ProjectValidator { } String indexFile = project.getIndexFile(); boolean hasIndexFile = (indexFile != null) && (indexFile.length() > 0); - List allowedIndexContentTypes = Arrays.asList("text/html", "application/xhtml+xml"); - if (hasIndexFile && !allowedIndexContentTypes.contains(project.getFileOption(indexFile).getMimeType())) { + if (hasIndexFile && indexFileIsNotHtml(project, indexFile)) { checkReport.addIssue("warning.index-not-html", false); } Map fileOptions = project.getFileOptions(); @@ -104,4 +104,9 @@ public class ProjectValidator { return checkReport; } + private static boolean indexFileIsNotHtml(Project project, String indexFile) { + return Stream.of("text/html", "application/xhtml+xml") + .noneMatch(mimeType -> project.getFileOption(indexFile).getMimeType().startsWith(mimeType)); + } + }