From 8bfb0c3b39b97d573f5fb49060fb0bbe36e9b834 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 17 Feb 2023 17:45:02 +0100 Subject: [PATCH] Improved code efficiency --- .../java/org/gcube/gcat/rest/License.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gcube/gcat/rest/License.java b/src/main/java/org/gcube/gcat/rest/License.java index 9c564e5..ec17633 100644 --- a/src/main/java/org/gcube/gcat/rest/License.java +++ b/src/main/java/org/gcube/gcat/rest/License.java @@ -1,15 +1,11 @@ package org.gcube.gcat.rest; import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.xml.ws.WebServiceException; -import org.gcube.com.fasterxml.jackson.databind.JsonNode; -import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; -import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.gcat.api.GCatConstants; import org.gcube.gcat.persistence.ckan.CKANLicense; @@ -52,18 +48,13 @@ public class License extends REST implements org.gcube.gcat.api.int */ @GET @Produces(GCatConstants.APPLICATION_JSON_API) - public String listAsJsonAPI() throws WebServiceException { + public String listAsJsonAPI() { String ret = super.list(-1, -1); - ObjectMapper objectMapper = new ObjectMapper(); - ObjectNode objectNode = objectMapper.createObjectNode(); - try { - JsonNode licenses = objectMapper.readTree(ret); - objectNode.set(GCatConstants.JSON_API_DATA_FIELD_NAME, licenses); - ret = objectMapper.writeValueAsString(objectNode); - }catch (Exception e) { - throw new InternalServerErrorException(e); - } - return ret; + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("{ \"data\":"); + stringBuffer.append(ret); + stringBuffer.append("}"); + return stringBuffer.toString(); } }