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/01/20 14:54:37 UTC
[isis] branch master updated: ISIS-2158: don't classify types twice
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 8ee7005 ISIS-2158: don't classify types twice
8ee7005 is described below
commit 8ee70054fbbf59ef211bc2410da0504bb540a35b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 20 15:54:23 2020 +0100
ISIS-2158: don't classify types twice
---
.../classsubstitutor/ClassSubstitutorForDomainObjects.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
index f968949..9ab5c75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import lombok.NonNull;
-import lombok.val;
@Component
@Named("isisMetaModel.ClassSubstitutorForDomainObjects")
@@ -47,9 +46,10 @@ public class ClassSubstitutorForDomainObjects implements ClassSubstitutor {
@Override
public Substitution getSubstitution(@NonNull Class<?> cls) {
- val beanSort = isisBeanTypeRegistry.quickClassify(cls);
-
- if(beanSort.isToBeIntrospected() && !beanSort.isCollection()) {
+ if(isisBeanTypeRegistry.getViewModelTypes().contains(cls)) {
+ return Substitution.neverReplaceClass();
+ }
+ if(isisBeanTypeRegistry.getEntityTypes().contains(cls)) {
return Substitution.neverReplaceClass();
}
return Substitution.passThrough(); // indifferent