You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/03/07 07:12:54 UTC
[isis] branch master updated: ISIS-2553: remove
SpecificationLoader.loadSpecification(Bookmark)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 483de4e ISIS-2553: remove SpecificationLoader.loadSpecification(Bookmark)
483de4e is described below
commit 483de4ebbc3c4f6992e5f18a0da90e1e29fc0fa4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 7 08:12:42 2021 +0100
ISIS-2553: remove SpecificationLoader.loadSpecification(Bookmark)
---
.../apache/isis/core/metamodel/specloader/SpecificationLoader.java | 6 ------
.../isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 2b7cbbb..a8df5e7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -209,10 +209,4 @@ public interface SpecificationLoader {
return loadSpecification(logicalType.getCorrespondingClass(), IntrospectionState.TYPE_INTROSPECTED);
}
- @Nullable
- default ObjectSpecification loadSpecification(
- final @Nullable Bookmark bookmark) {
- return loadSpecification(bookmark.getLogicalTypeName(), IntrospectionState.TYPE_INTROSPECTED);
- }
-
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index 46ef605..856b233 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -78,7 +78,7 @@ public class BookmarkServiceDefault implements BookmarkService, SerializingAdapt
return null;
}
try {
- val spec = specificationLoader.loadSpecification(bookmark);
+ val spec = specificationLoader.specForBookmark(bookmark).orElse(null);
val identifier = bookmark.getIdentifier();
val objectLoadRequest = ObjectLoader.Request.of(spec, identifier);