From 62d519f3e02a8dbeb95d16a1db9bff84e49d76d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCchner?= Date: Wed, 24 Feb 2021 09:57:52 +0100 Subject: [PATCH] Error messages improved --- src/main/java/de/ddb/labs/ef2so/Ef2soService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/ddb/labs/ef2so/Ef2soService.java b/src/main/java/de/ddb/labs/ef2so/Ef2soService.java index a7d5239..9dc85af 100644 --- a/src/main/java/de/ddb/labs/ef2so/Ef2soService.java +++ b/src/main/java/de/ddb/labs/ef2so/Ef2soService.java @@ -75,9 +75,11 @@ public Response getRoot(@Context HttpHeaders headers) { @Produces(MediaType.APPLICATION_JSON) public Response get(@Context HttpHeaders headers, @PathParam("idn") String idn) { try { - + if (idn.isBlank()) { + throw new InvalidParameterException("No IDN passed"); + } if (!gndIdnPattern.matcher(idn).matches()) { - throw new InvalidParameterException("Invalid IDN given."); + throw new InvalidParameterException("Invalid IDN passed"); } LOG.info("Execute request for IDN '{}'...", idn); final URL url = new URL(EF_URL + idn); @@ -105,7 +107,7 @@ public Response get(@Context HttpHeaders headers, @PathParam("idn") String idn) if (result.isEmpty()) { return Response .status(501) - .entity("{\"Error\":\"Requested resource '" + idn + "' NOT supported by Schema.org.\"}") + .entity("{\"Error\":\"Requested resource '" + idn + "' is NOT supported by Schema.org\"}") .build(); } @@ -115,7 +117,7 @@ public Response get(@Context HttpHeaders headers, @PathParam("idn") String idn) .build(); } catch (Exception e) { - LOG.error(e.getLocalizedMessage(), e); + LOG.error(e.getMessage(), e); return Response .status(500) .entity("{\"Error\":\"" + e.getMessage() + "\"}")