[isis] branch v2 updated: ISIS-1976: cleanup, also let ServiceInjector's state be consistent when service list gets modified

[ah...@apache.org]

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 b7dd012  ISIS-1976: cleanup, also let ServiceInjector's state be consistent when service list gets modified
b7dd012 is described below

commit b7dd0126dc1c75111837fbd02f88de07c07ca007
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 4 23:31:37 2018 +0200

    ISIS-1976: cleanup, also let ServiceInjector's state be consistent when
    service list gets modified
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
 .../apache/isis/core/metamodel/services/ServicesInjector.java    | 5 ++++-
 .../org/apache/isis/core/runtime/system/context/IsisContext.java | 9 ---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index dc84c36..a3ed62b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -41,7 +41,6 @@ import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Collections;
-import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.commons.internal.collections._Multimaps;
 import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
@@ -149,6 +148,10 @@ public class ServicesInjector implements ApplicationScopedComponent, ServiceRegi
             // FixtureScriptsDefault so that appears it top of prototyping menu; not
             // more flexible than this currently just because of YAGNI).
             services.add(0, serviceInstance);
+            
+            //[ahuber] currently seems the only entry-point that modifies the services list
+            //hence we also invalidate the lazy lookup
+            serviceByConcreteType.clear();
         }
     }
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index a43383b..9e220b5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -151,15 +151,6 @@ public interface IsisContext {
             System.out.println(k+" -> "+v);
         });
         System.out.println("================================================");
-        System.out.println("=                 Meta Model                   =");
-        System.out.println("================================================");
-        
-        getServicesInjector().streamServices()
-        .forEach(service->{
-            
-        });
-        
-        System.out.println("================================================");
     }
 
 }