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 2019/10/10 12:01:40 UTC
[isis] branch v2 updated: ISIS-2158: minor polishing
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 502036f ISIS-2158: minor polishing
502036f is described below
commit 502036f66cf5631f6d64a2ffa72cffcde96b8218
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 10 14:01:32 2019 +0200
ISIS-2158: minor polishing
---
.../apache/isis/applib/services/registry/ServiceRegistry.java | 9 +++++++--
.../viewer/memento/ObjectAdapterMementoSupportUsingSpring.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index 7d16343..5e5de03 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -72,7 +72,7 @@ public interface ServiceRegistry {
}
/**
- * Streams all bean adapters implementing the requested type.
+ * Streams all registered bean adapters implementing the requested type.
*/
default Stream<ManagedBeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType) {
return streamRegisteredBeans()
@@ -92,7 +92,12 @@ public interface ServiceRegistry {
public Optional<ManagedBeanAdapter> lookupRegisteredBeanById(String id);
- public default ManagedBeanAdapter lookupManagedBeanByNameElseFail(String id) {
+ /**
+ * Returns a registered bean of given {@code name}, or throws when no such bean.
+ *
+ * @param id - corresponds to the ObjectSpecificationId of the bean's type
+ */
+ public default ManagedBeanAdapter lookupRegisteredBeanByNameElseFail(String id) {
return lookupRegisteredBeanById(id).orElseThrow(
()->_Exceptions.unrecoverable(
"Failed to lookup BeanAdapter by id '" + id + "'"));
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
index f514f7f..018a850 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/memento/ObjectAdapterMementoSupportUsingSpring.java
@@ -159,7 +159,7 @@ public class ObjectAdapterMementoSupportUsingSpring implements ObjectAdapterMeme
switch (sort) {
case MANAGED_BEAN:
- val bean = serviceRegistry.lookupManagedBeanByNameElseFail(specId.asString());
+ val bean = serviceRegistry.lookupRegisteredBeanByNameElseFail(specId.asString());
return ObjectAdapterForBean.of(bean, specificationLoader);
case ENTITY: