diff --git a/auth/pom.xml b/auth/pom.xml
index b7939c35..b0bd8993 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -12,7 +12,7 @@
edu.tamu.weaver
webservice-parent
- 2.1.1-RC5
+ 2.1.1-RC6
diff --git a/core/pom.xml b/core/pom.xml
index 678380b3..ffb66f62 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,11 +12,25 @@
edu.tamu.weaver
webservice-parent
- 2.1.1-RC5
+ 2.1.1-RC6
+
+ org.springframework
+ spring-web
+
+
+
+
+ javax.servlet
+ servlet-api
+ 3.0-alpha-1
+ provided
+
+
+
org.springframework
spring-context
@@ -28,11 +42,10 @@
- com.fasterxml.jackson.core
- jackson-annotations
+ org.springframework.boot
+ spring-boot-starter-json
-
diff --git a/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java b/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java
index b5a9be93..f5bbb8f3 100644
--- a/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java
+++ b/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java
@@ -4,6 +4,7 @@
import java.util.HashMap;
import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
* Abstract class for an API response.
@@ -15,6 +16,7 @@
* @author William Welling
*
*/
+@JsonSerialize(using = ApiResponseSerializer.class)
public class ApiResponse {
@JsonView(ApiView.Partial.class)
diff --git a/core/src/main/java/edu/tamu/weaver/response/ApiResponseSerializer.java b/core/src/main/java/edu/tamu/weaver/response/ApiResponseSerializer.java
new file mode 100644
index 00000000..a19f502c
--- /dev/null
+++ b/core/src/main/java/edu/tamu/weaver/response/ApiResponseSerializer.java
@@ -0,0 +1,38 @@
+package edu.tamu.weaver.response;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import org.springframework.boot.jackson.JsonComponent;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@JsonComponent
+public class ApiResponseSerializer extends JsonSerializer {
+
+ @Override
+ public void serialize(ApiResponse value, JsonGenerator jgen, SerializerProvider serializers) throws IOException {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ if (request.getHeader("x-wvr-unwrap") != null) {
+ List