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 2020/10/23 19:34:38 UTC

[isis] branch master updated: ISIS-2382: proposed concurrent specloading fix

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 5560fa4  ISIS-2382: proposed concurrent specloading fix
5560fa4 is described below

commit 5560fa45353f188f4de938ea84589dadbe9b8044
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 23 21:31:58 2020 +0200

    ISIS-2382: proposed concurrent specloading fix
---
 .../metamodel/specloader/SpecificationLoaderDefault.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index 1c44049..92f80b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -244,6 +244,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
         log.info(" - categorizing types from class-path scan");
 
         val domainObjectSpecs = _Lists.<ObjectSpecification>newArrayList();
+        val mixinSpecs = _Lists.<ObjectSpecification>newArrayList();
 
         isisBeanTypeRegistry.streamIntrospectableTypes()
         .forEach(type->{
@@ -259,13 +260,16 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
             
             knownSpecs.add(spec);
 
-            if(sort.isManagedBean() || sort.isEntity() || sort.isViewModel() || sort.isMixin()) {
+            if(sort.isManagedBean() || sort.isEntity() || sort.isViewModel() ) {
                 domainObjectSpecs.add(spec);   
+            } else if(sort.isMixin()) {
+                mixinSpecs.add(spec);
             }
 
         });
 
-
+        //XXX[ISIS-2382] when parallel introspecting, make sure we have the mixins before their holders
+        
         SpecificationLoaderDefault_debug.logBefore(log, cache, knownSpecs);
 
         log.info(" - introspecting {} type hierarchies", knownSpecs.size());
@@ -274,8 +278,10 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
         log.info(" - introspecting {} value types", valueTypeSpecs.size());
         introspect(Can.ofCollection(valueTypeSpecs), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
 
-        log.info(" - introspecting {} managed beans contributing (aka domain services)", isisBeanTypeRegistry.getManagedBeansContributing().size());
         log.info(" - introspecting {} mixins", isisBeanTypeRegistry.getMixinTypes().size());
+        introspect(Can.ofCollection(mixinSpecs), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+        
+        log.info(" - introspecting {} managed beans contributing (aka domain services)", isisBeanTypeRegistry.getManagedBeansContributing().size());
         log.info(" - introspecting {}/{} entities (JDO/JPA)",
                 isisBeanTypeRegistry.getEntityTypesJdo().size(),
                 isisBeanTypeRegistry.getEntityTypesJpa().size());
@@ -287,7 +293,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
         if(isFullIntrospect()) {
             val snapshot = cache.snapshotSpecs();
             log.info(" - introspecting all {} types eagerly (FullIntrospect=true)", snapshot.size());
-            introspect(snapshot, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+            introspect(snapshot.filter(x->x.getBeanSort().isMixin()), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
+            introspect(snapshot.filter(x->!x.getBeanSort().isMixin()), IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
         }
         
         log.info(" - running remaining validators");