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/02/24 16:01:46 UTC
[isis] branch 2033-IoC updated: ISIS-2033: minor: cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new 5bf27d9 ISIS-2033: minor: cleanup
5bf27d9 is described below
commit 5bf27d999546f5205d3c2364faf2f139bdcaf464
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 24 17:01:37 2019 +0100
ISIS-2033: minor: cleanup
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../applib/services/registry/ServiceRegistry.java | 8 ++++-
.../services/registry/ServiceRegistryDefault.java | 35 ----------------------
2 files changed, 7 insertions(+), 36 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 a309d3a..3e6771a 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
@@ -81,6 +81,9 @@ public interface ServiceRegistry {
.filter(beanAdapter->beanAdapter.isCandidateFor(requiredType));
}
+ /**
+ * Returns all bean adapters that have been registered.
+ */
public Stream<BeanAdapter> streamRegisteredBeans();
/**
@@ -116,13 +119,16 @@ public interface ServiceRegistry {
new NoSuchElementException("Could not locate service of type '" + serviceClass + "'"));
}
+ @Deprecated //TODO [2033] as long as services are wrapped into ObjectAdapters that require a
+ // pojo, this is still required
Stream<Object> streamServices();
/**
* @param cls
* @return whether the exact type is registered as service
*/
- @Deprecated
+ @Deprecated //TODO [2033] marked deprecated, because this should not be required by the
+ // framework at all, its also hard to implement correctly
boolean isRegisteredBean(Class<?> cls);
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 6656ed7..b5b1c3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -44,41 +44,6 @@ public final class ServiceRegistryDefault implements ServiceRegistry {
private final Set<BeanAdapter> registeredBeans = _Sets.newHashSet();
private final Set<Object> serviceCache = _Sets.newHashSet();
- // @Override
- // public Stream<Object> streamServices() {
- //
- // if(registeredServiceInstances.isEmpty()) {
- //
- // registeredBeans.stream()
- // .forEach(beanAdapter->{
- //
- // val scope = bean.getScope().getSimpleName();
- // val type = bean.getBeanClass();
- // if("RequestScoped".equals(scope)) {
- // log.info("skipping registering {}-scoped service {}", scope, type);
- // return;
- // }
- //
- // Optional<?> managedObject =
- // _CDI.getManagedBean(type, bean.getQualifiers());
- //
- // if(managedObject.isPresent()) {
- // registeredServiceInstances.add(managedObject.get());
- //
- // log.info("registering as a {}-scoped service {}", scope, managedObject.get());
- //
- // } else {
- //
- // log.warn("failed to register bean {}-scoped as a service {}", scope, bean);
- //
- // }
- // });
- // }
- //
- // return registeredServiceInstances.stream();
- // }
-
-
@Override
public boolean isDomainServiceType(Class<?> cls) {
if(cls.isAnnotationPresent(DomainService.class)) {