You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/03/08 13:20:04 UTC

(causeway) 01/01: CAUSEWAY-3620: throws 404, hopefully, if object not found

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch CAUSEWAY-3620
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 314eaa17157d852554983b8cca3f55c3557977f2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 8 13:19:05 2024 +0000

    CAUSEWAY-3620: throws 404, hopefully, if object not found
---
 .../viewer/resources/ResourceAbstract.java          | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 07fe8e8fd6..6a5ac384f8 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -31,6 +31,8 @@ import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
 
+import org.apache.causeway.core.metamodel.object.ManagedObjects;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.apache.causeway.applib.annotation.Where;
@@ -148,12 +150,23 @@ implements HasMetaModelContext {
         final String instanceIdDecoded = UrlDecoderUtils.urlDecode(instanceIdEncoded);
 
         val bookmark = Bookmark.forLogicalTypeNameAndIdentifier(domainType, instanceIdDecoded);
-        return metaModelContext.getObjectManager().loadObject(bookmark)
-                .orElseThrow(()->onRoException.apply(
-                        RestfulObjectsApplicationException
+        val managedObjectIfAny = metaModelContext.getObjectManager().loadObject(bookmark);
+        if (managedObjectIfAny.isEmpty()) {
+            throwNotFound(bookmark, onRoException);
+        }
+        val managedObject = managedObjectIfAny.get();
+        if (ManagedObjects.isNullOrUnspecifiedOrEmpty(managedObject)) {
+            throwNotFound(bookmark, onRoException);
+        }
+        return managedObject;
+    }
+
+    private static void throwNotFound(Bookmark bookmark, UnaryOperator<RestfulObjectsApplicationException> onRoException) {
+        throw onRoException.apply(
+                RestfulObjectsApplicationException
                         .createWithMessage(HttpStatusCode.NOT_FOUND,
                                 "Could not determine adapter for bookmark: '%s'",
-                                bookmark)));
+                                bookmark));
     }
 
     // -- HELPER