You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/03 14:43:58 UTC
[isis] 01/04: ISIS-2202: exclude org.springframework from the
metamodel:
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2597fef670c7f7ed9db6e1ab64927dd4049ce445
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 14:34:05 2019 +0000
ISIS-2202: exclude org.springframework from the metamodel:
---
.../services/classsubstitutor/ClassSubstitutorDefault.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index 7e5638c..874ca97 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -28,6 +28,7 @@ public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
ignoreCglib();
ignoreJavassist();
+ ignoreApacheIsisInternals();
ignoreSpringFramework();
ignoreJacksonAndGson();
skipDataNucleusProxy();
@@ -47,6 +48,12 @@ public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
protected void ignoreSpringFramework() {
ignoreClass("org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator");
+ ignorePackage("org.springframework.");
+ }
+
+ private void ignoreApacheIsisInternals() {
+ // can't ignoring this class ... will result in NPEs...
+ // ignoreClass("org.apache.isis.commons.internal.ioc.spring.BeanAdapterSpring");
}
protected void ignoreJacksonAndGson() {