From 72842ff53b1e6c0fe765ff8991d241b86285af7b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 23 Feb 2023 15:59:44 +0100 Subject: [PATCH] Added support for JSON:API to item list method --- src/main/java/org/gcube/gcat/rest/Item.java | 9 ++++++++- src/main/java/org/gcube/gcat/rest/License.java | 8 ++------ src/main/java/org/gcube/gcat/rest/REST.java | 8 ++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/gcat/rest/Item.java b/src/main/java/org/gcube/gcat/rest/Item.java index d403acf..e78468f 100644 --- a/src/main/java/org/gcube/gcat/rest/Item.java +++ b/src/main/java/org/gcube/gcat/rest/Item.java @@ -248,7 +248,14 @@ public class Item extends REST implements org.gcube.gcat.api.interf } } - + @GET + @Produces(GCatConstants.APPLICATION_JSON_API) + public String listAsJsonAPI(@QueryParam(GCatConstants.LIMIT_QUERY_PARAMETER) @DefaultValue("10") int limit, + @QueryParam(GCatConstants.OFFSET_QUERY_PARAMETER) @DefaultValue("0") int offset) { + String ret = this.list(limit, offset); + return resultAsJsonAPI(ret); + } + /** * * The create API allows to create an item. diff --git a/src/main/java/org/gcube/gcat/rest/License.java b/src/main/java/org/gcube/gcat/rest/License.java index ec17633..3e8133c 100644 --- a/src/main/java/org/gcube/gcat/rest/License.java +++ b/src/main/java/org/gcube/gcat/rest/License.java @@ -49,12 +49,8 @@ public class License extends REST implements org.gcube.gcat.api.int @GET @Produces(GCatConstants.APPLICATION_JSON_API) public String listAsJsonAPI() { - String ret = super.list(-1, -1); - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("{ \"data\":"); - stringBuffer.append(ret); - stringBuffer.append("}"); - return stringBuffer.toString(); + String ret = this.list(); + return resultAsJsonAPI(ret); } } diff --git a/src/main/java/org/gcube/gcat/rest/REST.java b/src/main/java/org/gcube/gcat/rest/REST.java index e7c5149..bf9150a 100644 --- a/src/main/java/org/gcube/gcat/rest/REST.java +++ b/src/main/java/org/gcube/gcat/rest/REST.java @@ -98,4 +98,12 @@ public class REST extends BaseREST implements CRUD