🔀 Merge “release/v81” into “master”

[Sone.git] / src / main / java / net / pterodactylus / sone / main / DefaultLoaders.java

diff --git a/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java b/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
index 0f73216..2a2bd8c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
+++ b/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
@@ -1,11 +1,10 @@
 package net.pterodactylus.sone.main;
 
-import static net.pterodactylus.util.template.TemplateParser.parse;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import javax.annotation.Nonnull;
 
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.io.Closer;
@@ -16,15 +15,16 @@ import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Request;
 import net.pterodactylus.util.web.StaticPage;
 
+import static net.pterodactylus.util.template.TemplateParser.parse;
+
 /**
  * Default {@link Loaders} implementation that loads resources from the classpath.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class DefaultLoaders implements Loaders {
 
+       @Nonnull
        @Override
-       public Template loadTemplate(String path) {
+       public Template loadTemplate(@Nonnull String path) {
                InputStream templateInputStream = null;
                Reader reader = null;
                try {
@@ -39,11 +39,14 @@ public class DefaultLoaders implements Loaders {
                }
        }
 
+       @Nonnull
        @Override
-       public <REQ extends Request> Page<REQ> loadStaticPage(String pathPrefix, String basePath, String mimeType) {
-               return new StaticPage<REQ>(pathPrefix, basePath, mimeType);
+       public <REQ extends Request> Page<REQ> loadStaticPage(@Nonnull String pathPrefix, @Nonnull String basePath, @Nonnull String mimeType) {
+               return new StaticPage<REQ>(pathPrefix, basePath, mimeType) {
+               };
        }
 
+       @Nonnull
        @Override
        public TemplateProvider getTemplateProvider() {
                return new ClassPathTemplateProvider(WebInterface.class, "/templates/");