Client API fix

OPSILab · Oct 15, 2018 · 4e0eba0 · 4e0eba0
1 parent 37efa35
commit 4e0eba0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Idra/src/main/java/it/eng/idra/api/ClientAPI.java b/Idra/src/main/java/it/eng/idra/api/ClientAPI.java
@@ -744,7 +744,7 @@ public Response getCataloguesInfo(@Context HttpServletRequest httpRequest) {
 	@Produces("application/json")
 	public Response getODMSCatalogues(
 			@QueryParam("withImage") @DefaultValue("true") boolean withImage,
-			@QueryParam("orderType") @DefaultValue("name") String orderType,
+			@QueryParam("orderType") @DefaultValue("asc") String orderType,
 			@QueryParam("orderBy") @DefaultValue("id") String orderBy,
 			@QueryParam("rows") @DefaultValue("10") String rows,
 			@QueryParam("offset") @DefaultValue("0") String offset,
@@ -968,15 +968,17 @@ public Response getSingleDataset(@Context HttpServletRequest httpRequest,@PathPa
 	public Response getDatasetByID(@Context HttpServletRequest httpRequest,@PathParam("id") String id) {
 
 		try {
-			DCATDataset result = MetadataCacheManager.getDatasetByID(id);
-			return Response.status(Response.Status.OK).entity(GsonUtil.obj2Json(result, GsonUtil.datasetType)).build();
-
+			try {
+				DCATDataset result = MetadataCacheManager.getDatasetByID(id);
+				return Response.status(Response.Status.OK).entity(GsonUtil.obj2Json(result, GsonUtil.datasetType)).build();
+			}catch (DatasetNotFoundException e) {
+				// TODO Auto-generated catch block
+				ErrorResponse err = new ErrorResponse(String.valueOf(Response.Status.NOT_FOUND.getStatusCode()), "Dataset with id: "+id+" not found", String.valueOf(Response.Status.NOT_FOUND.getStatusCode()), "Dataset with id: "+id+" not found");
+				return Response.status(Response.Status.NOT_FOUND).entity(GsonUtil.obj2Json(err, GsonUtil.errorResponseSetType)).build();
+			} 
 		} catch (NumberFormatException e) {
 			// TODO Auto-generated catch block
 			return handleErrorResponse500(e);
-		} catch (DatasetNotFoundException e) {
-			// TODO Auto-generated catch block
-			return handleErrorResponse500(e);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			return handleErrorResponse500(e);