Merge branch 'release/v4.1.1'

Author: Valandur

build.gradle

@@ -65,12 +65,6 @@ shadowJar {
 }
 shadowJar.dependsOn([':webapi-api:build'])
 
-task cleanJars() {
-    project.file('artifacts').listFiles().each {
-        x -> if (x.name.endsWith("jar")) { x.delete() }
-    }
-}
-
 task copyJars(type: Copy, dependsOn: ':webapi-api:build') {
     from([subprojects.jar, shadowJar])
     into project.file('artifacts')
@@ -80,7 +74,5 @@ artifacts {
     archives shadowJar
 }
 
-clean.dependsOn(cleanJars)
-copyJars.mustRunAfter(cleanJars)
 build.dependsOn(shadowJar)
 build.dependsOn(copyJars)

gradle.properties

@@ -1,3 +1,3 @@
-version=4.1.0
+version=4.1.1
 minecraftVersion=1.11.2
 spongeVersion=6.1

src/main/java/valandur/webapi/servlet/ServletData.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import valandur.webapi.api.servlet.IServletData;
 import valandur.webapi.json.JsonConverter;
 import valandur.webapi.misc.TreeNode;
 import valandur.webapi.misc.Util;
@@ -17,7 +18,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-public class ServletData {
+public class ServletData implements IServletData {
 
     private HttpServletRequest req;
     private HttpServletResponse resp;

src/main/java/valandur/webapi/servlet/Servlets.java

@@ -6,6 +6,7 @@
 import valandur.webapi.api.annotation.WebAPIRoute;
 import valandur.webapi.api.annotation.WebAPIServlet;
 import valandur.webapi.api.servlet.IServlet;
+import valandur.webapi.api.servlet.IServletData;
 import valandur.webapi.misc.Util;
 
 import java.lang.reflect.Method;
@@ -46,6 +47,15 @@ public static void init() {
                 for (Tuple<WebAPIRoute, Method> tuple : newMethods) {
                     WebAPIRoute route = tuple.getFirst();
                     Method method = tuple.getSecond();
+                    if (method.getParameterTypes().length != 1) {
+                        logger.error("    Method " + method.getName() + " may only have 1 argument");
+                        continue;
+                    }
+                    if (method.getParameterTypes()[0] != IServletData.class &&
+                            method.getParameterTypes()[0] != ServletData.class) {
+                        logger.error("    Method " + method.getName() + " parameter is not of type IServletData");
+                        continue;
+                    }
                     method.setAccessible(true);
                     logger.debug("    [" + route.method() + "] " + route.path() + " -> " +method.getName());
                 }

webapi-api/src/main/java/valandur/webapi/api/servlet/IServletData.java

@@ -0,0 +1,31 @@
+package valandur.webapi.api.servlet;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import java.util.Optional;
+
+public interface IServletData {
+
+    ObjectNode getNode();
+
+    Exception getLastParseError();
+
+    boolean isErrorSent();
+
+    JsonNode getRequestBody();
+
+    <T> Optional<T> getRequestBody(Class<T> clazz);
+
+    void setHeader(String name, String value);
+
+    void setStatus(int status);
+
+    void addJson(String key, Object value, boolean details);
+
+    String getPathParam(String key);
+
+    Optional<String> getQueryParam(String key);
+
+    void sendError(int error, String message);
+}