Merge c6863b4 into 504448e

TAMULib · Apr 12, 2022 · 814ed58 · 814ed58
2 parents 504448e + c6863b4
commit 814ed58
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 16 deletions.
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/core/pom.xml b/core/pom.xml
@@ -12,11 +12,25 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
+<dependency>
+    <groupId>javax.servlet</groupId>
+    <artifactId>servlet-api</artifactId>
+    <version>3.0-alpha-1</version>
+    <scope>provided</scope>
+</dependency>
+
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -28,11 +42,10 @@
     </dependency>
 
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-json</artifactId>
     </dependency>
 
-
   </dependencies>
 
 </project>
diff --git 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 <a href="mailto:wwelling@library.tamu.edu">William Welling</a>
  * 
  */
+@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
@@ -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<ApiResponse> {
+
+  @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<Object> values = new ArrayList<>(value.getPayload().values());
+      if (values.size() > 1) {
+        jgen.writeObject(value.getPayload());
+      } else if (values.size() > 0) {
+        jgen.writeObject(values.get(0));
+      }
+    } else {
+      jgen.writeStartObject();
+      jgen.writeObjectField("meta", value.getMeta());
+      jgen.writeObjectField("payload", value.getPayload());
+      jgen.writeEndObject();
+    }
+  }
+
+}
diff --git a/data/pom.xml b/data/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/email/pom.xml b/email/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/messaging/pom.xml b/messaging/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <artifactId>webservice-parent</artifactId>
 
-  <version>2.1.1-RC5</version>
+  <version>2.1.1-RC6</version>
 
   <name>Weaver Webservice Parent</name>
 
@@ -87,7 +87,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.2.0</version>
           <configuration>
             <delimiters>
               <delimiter>@</delimiter>

diff --git a/reporting/pom.xml b/reporting/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/token-provider/pom.xml b/token-provider/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/token/pom.xml b/token/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/user/pom.xml b/user/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>

diff --git a/wro/pom.xml b/wro/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>edu.tamu.weaver</groupId>
     <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC5</version>
+    <version>2.1.1-RC6</version>
   </parent>
 
   <dependencies>