return JSON string in the cookie api (#22)

Co-authored-by: rick <LinuxSuRen@users.noreply.github.com>

Author: LinuxSuRen

e2e/test-suite.yaml

@@ -16,7 +16,7 @@ items:
       Authorization: "{{ .param.auth }}"
   expect:
     body: |
-      {"message":"OK"}
+      {"message":"OK","data":null}
 - name: toLowerWithoutParam
   request:
     api: /lower
@@ -65,4 +65,17 @@ items:
     header:
       Authorization: "{{ .param.auth }}"
   expect:
-    body: cookies are empty
+    bodyFieldsExpect:
+      message: cookies are empty
+- name: have-cookie
+  request:
+    api: /cookies/echo
+    query:
+      name: name
+    header:
+      Authorization: "{{ .param.auth }}"
+    cookie:
+      name: rick
+  expect:
+    bodyFieldsExpect:
+      message: rick

src/main/java/io/github/devopsws/demo/model/Message.java

@@ -1,7 +1,10 @@
 package io.github.devopsws.demo.model;
 
-public class Message {
+import java.util.List;
+
+public class Message<T> {
     private String message;
+    private List<T> data;
 
     // avoid the following error
     // JSON parse error: Cannot construct instance of
@@ -18,4 +21,12 @@ public String getMessage() {
     public void setMessage(String message) {
         this.message=message;
     }
+
+    public List<T> getData() {
+        return this.data;
+    }
+
+    public void setData(List<T> data) {
+        this.data = data;
+    }
 }

src/main/java/io/github/devopsws/demo/service/CookieService.java

@@ -5,23 +5,28 @@
 import org.springframework.web.bind.annotation.RestController;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
+import io.github.devopsws.demo.model.Message;
 
 @RestController
 @RequestMapping("/cookies")
 public class CookieService {
     @GetMapping("/echo")
-    public String cookie(HttpServletRequest request, String name) {
-        Cookie[] cookies=        request.getCookies();
+    public Message<?> cookie(HttpServletRequest request, String name) {
+        Message<String> message = new Message<String>();
+        Cookie[] cookies = request.getCookies();
         if (cookies == null) {
-            return "cookies are empty";
-        }
+            message.setMessage("cookies are empty");
+        } else {
+            message.setMessage("not found");
 
-        for (int i = 0; i < cookies.length; i++) {
-            if (cookies[i].getName().equals(name)) {
-                return cookies[i].getValue();
+            for (int i = 0; i < cookies.length; i++) {
+                if (cookies[i].getName().equals(name)) {
+                    message.setMessage(cookies[i].getValue());
+                    break;
+                }
             }
         }
 
-        return "not found";
+        return message;
     }   
 }

src/main/java/io/github/devopsws/demo/service/HealthService.java

@@ -11,8 +11,9 @@ public String health() {
 		return "OK";
 	}
 
+	@SuppressWarnings("rawtypes")
 	@GetMapping("/health.json")
-	public Message healthJSON() {
+	public Message<?> healthJSON() {
 		return new Message("OK");
 	}
 }