[isis] branch master updated: ISIS-2332: fixes BeanSort classification for Array types (specloading)

[ahuber]

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 16b651f  ISIS-2332: fixes BeanSort classification for Array types 
(specloading)
16b651f is described below

commit 16b651fa151b4fd72126aa78250b19a3d7ad8284
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Sep 2 09:04:00 2020 +0200

    ISIS-2332: fixes BeanSort classification for Array types (specloading)
---
 .../java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java  | 4 +++-
 .../isis/core/metamodel/specloader/SpecificationLoaderDefault.java    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
 
b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
index 5199f12..5ce4754 100644
--- 
a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
+++ 
b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
@@ -293,7 +293,9 @@ public final class IsisBeanTypeRegistry implements 
IsisComponentScanInterceptor,
             return 
BeanClassification.delegated(BeanSort.MANAGED_BEAN_NOT_CONTRIBUTING);
         }
         
-        if(Collection.class.isAssignableFrom(type)) {
+        if(Collection.class.isAssignableFrom(type)
+                || Can.class.isAssignableFrom(type)
+                || type.isArray()) {
             return BeanClassification.selfManaged(BeanSort.COLLECTION);
         }
 
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 d4b5e5c..1ef028b 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
@@ -419,8 +419,8 @@ public class SpecificationLoaderDefault implements 
SpecificationLoader {
         return loadSpecification(
                 type, 
                 __->typeRegistry
-                .lookupBeanSortByIntrospectableType(type)
-                
.orElseGet(()->typeRegistry.quickClassify(type).getBeanSort()), 
+                    .lookupBeanSortByIntrospectableType(type)
+                    
.orElseGet(()->typeRegistry.quickClassify(type).getBeanSort()), 
                 upTo);
     }