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/01/26 11:01:34 UTC

[isis] branch 2033-IoC updated: ISIS-2033: phase out ServiceRegistry#streamServices

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 0dbed57  ISIS-2033: phase out ServiceRegistry#streamServices
0dbed57 is described below

commit 0dbed5776bef96e55ab4d26f7ee76543c4a2ddaf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 26 12:01:25 2019 +0100

    ISIS-2033: phase out ServiceRegistry#streamServices
    
    marked for deprecation
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
 .../core/metamodel/services/registry/ServiceRegistryDefault.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 85c2caa..87d0ead 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
@@ -80,7 +80,10 @@ public final class ServiceRegistryDefault implements ServiceRegistry {
     
    
     
-    @Override
+    /**
+     * @deprecated TODO [2033] don't register concrete instances, registering Beans should be sufficient!
+     */
+    @Override 
     public Stream<Object> streamServices() {
         
         if(registeredServiceInstances.isEmpty()) {
@@ -92,6 +95,10 @@ public final class ServiceRegistryDefault implements ServiceRegistry {
             	// or categorize them ?
             	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());