From ad588a85de44712ea9d3dce24212dd5c2edbc37f Mon Sep 17 00:00:00 2001 From: Marc Reichelt Date: Fri, 23 Sep 2016 08:51:19 +0200 Subject: [PATCH] remove ResourceNotFoundException --- src/main/java/moe/banana/jsonapi2/Document.java | 7 +++---- src/main/java/moe/banana/jsonapi2/Resource.java | 10 +++------- .../moe/banana/jsonapi2/ResourceNotFoundException.java | 9 --------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 src/main/java/moe/banana/jsonapi2/ResourceNotFoundException.java diff --git a/src/main/java/moe/banana/jsonapi2/Document.java b/src/main/java/moe/banana/jsonapi2/Document.java index b98c5e9..e70a693 100644 --- a/src/main/java/moe/banana/jsonapi2/Document.java +++ b/src/main/java/moe/banana/jsonapi2/Document.java @@ -38,17 +38,16 @@ public void addInclude(Resource resource) { * * @param type resource type. * @param id resource id. - * @return resource object. - * @throws ResourceNotFoundException when there is no matching resource. + * @return resource object, or {@code null} if not found. */ - public Resource find(String type, String id) throws ResourceNotFoundException { + public Resource find(String type, String id) { if (index != null) { final String key = indexName(type, id); if (index.containsKey(key)) { return index.get(key); } } - throw new ResourceNotFoundException(type, id); + return null; } private String indexName(String type, String id) { diff --git a/src/main/java/moe/banana/jsonapi2/Resource.java b/src/main/java/moe/banana/jsonapi2/Resource.java index 331d396..b54cf2d 100644 --- a/src/main/java/moe/banana/jsonapi2/Resource.java +++ b/src/main/java/moe/banana/jsonapi2/Resource.java @@ -131,21 +131,17 @@ public void addToIncluded(Document document) { * * @param type resource type * @param id resource identifier - * @return resource or null if resource does not exists in document + * @return resource or {@code null} if resource does not exist in document */ public Resource find(String type, String id) { - try { - return _doc.find(type, id); - } catch (ResourceNotFoundException e) { - return null; - } + return _doc.find(type, id); } /** * Find resource in document. * * @param ref ResourceLinkage like object - * @return resource or null if resource does not exists in document + * @return resource or {@code null} if resource does not exists in document */ public Resource find(ResourceRef ref) { return find(ref.getType(), ref.getId()); diff --git a/src/main/java/moe/banana/jsonapi2/ResourceNotFoundException.java b/src/main/java/moe/banana/jsonapi2/ResourceNotFoundException.java deleted file mode 100644 index 6e27c82..0000000 --- a/src/main/java/moe/banana/jsonapi2/ResourceNotFoundException.java +++ /dev/null @@ -1,9 +0,0 @@ -package moe.banana.jsonapi2; - -public class ResourceNotFoundException extends RuntimeException { - - ResourceNotFoundException(String type, String id) { - super("Resource " + type + "[id=" + id + "] could not be found."); - } - -}