refactoring; test inits
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java b/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
index 143aa04..05a1bb5 100644
--- a/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
+++ b/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
@@ -3,9 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.ws.rs.core.MultivaluedMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Helper class to wrapp multivaluedmap into a hashmap. Depending on the strict parameter,
@@ -59,6 +57,14 @@
return map;
}
+ public void put(String key, String value) {
+ this.form.putSingle(key, value);
+ }
+
+ public void put(String key, String... values) {
+ this.form.put(key, Arrays.asList(values));
+ }
+
}
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/FormWrapper.java b/src/main/java/de/ids_mannheim/korap/web/utils/FormWrapper.java
index 913c848..f099158 100644
--- a/src/main/java/de/ids_mannheim/korap/web/utils/FormWrapper.java
+++ b/src/main/java/de/ids_mannheim/korap/web/utils/FormWrapper.java
@@ -12,6 +12,7 @@
* @author hanl
* @date 18/05/2015
*/
+@Deprecated
public class FormWrapper extends HashMap<String, Object> {
public FormWrapper(MultivaluedMap form, boolean strict) {
diff --git a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java b/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
index c35ce5b..1a52c3d 100644
--- a/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
+++ b/src/main/java/de/ids_mannheim/korap/web/utils/KustvaktResponseHandler.java
@@ -1,8 +1,7 @@
package de.ids_mannheim.korap.web.utils;
import de.ids_mannheim.korap.auditing.AuditRecord;
-import de.ids_mannheim.korap.exceptions.BaseException;
-import de.ids_mannheim.korap.exceptions.KorAPException;
+import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.exceptions.StatusCodes;
import de.ids_mannheim.korap.interfaces.AuditingIface;
import de.ids_mannheim.korap.response.Notifications;
@@ -32,32 +31,24 @@
throw new RuntimeException("Auditing handler must be set!");
}
- public static WebApplicationException throwit(BaseException e) {
- //fixme: ??!
- e.printStackTrace();
+ public static WebApplicationException throwit(KustvaktException e) {
return new WebApplicationException(
Response.status(Response.Status.BAD_REQUEST)
.entity(buildNotification(e)).build());
}
- @Deprecated
public static WebApplicationException throwit(int code) {
- KorAPException e = new KorAPException(code);
- return new WebApplicationException(
- Response.status(Response.Status.OK).entity(buildNotification(e))
- .build());
+ return new WebApplicationException(Response.status(Response.Status.OK)
+ .entity(buildNotification(code, "", "")).build());
}
- @Deprecated
public static WebApplicationException throwit(int code, String message,
String entity) {
- KorAPException e = new KorAPException(code, message, entity);
- return new WebApplicationException(
- Response.status(Response.Status.OK).entity(buildNotification(e))
- .build());
+ return new WebApplicationException(Response.status(Response.Status.OK)
+ .entity(buildNotification(code, message, entity)).build());
}
- private static String buildNotification(BaseException e) {
+ private static String buildNotification(KustvaktException e) {
register(e.getRecords());
return buildNotification(e.getStatusCode(), e.getMessage(),
e.getEntity());
@@ -71,7 +62,8 @@
}
public static WebApplicationException throwAuthenticationException() {
- KorAPException e = new KorAPException(StatusCodes.BAD_CREDENTIALS);
+ KustvaktException e = new KustvaktException(
+ StatusCodes.BAD_CREDENTIALS);
return new WebApplicationException(
Response.status(Response.Status.UNAUTHORIZED)
.header(HttpHeaders.WWW_AUTHENTICATE,