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 2019/10/02 14:27:07 UTC
[isis] branch v2 updated: ISIS-2158: removes the scan-filter as its
no longer required
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 9a23647 ISIS-2158: removes the scan-filter as its no longer required
9a23647 is described below
commit 9a23647a424bf1024d9b3da15321a106c65d1033
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 16:26:59 2019 +0200
ISIS-2158: removes the scan-filter as its no longer required
---
.../beans/IsisBeanScanInterceptorForSpring.java | 64 ----------------------
.../org/apache/isis/runtime/spring/IsisBoot.java | 9 +--
.../restfulobjects/IsisBootWebRestfulObjects.java | 6 --
.../viewer/wicket/viewer/IsisBootWebWicket.java | 6 --
.../conf/SimpleAppConfigurationForTesting.java | 6 --
.../integtests/SimpleModuleManifestForTesting.java | 6 --
.../secman/model/IsisBootSecmanModel.java | 7 ---
.../secman/jdo/IsisBootSecmanPersistenceJdo.java | 7 ---
8 files changed, 2 insertions(+), 109 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanScanInterceptorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanScanInterceptorForSpring.java
deleted file mode 100644
index 0b3482b..0000000
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanScanInterceptorForSpring.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.config.beans;
-
-import java.io.IOException;
-
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.filter.TypeFilter;
-
-import org.apache.isis.config.registry.IsisBeanTypeRegistry;
-import org.apache.isis.config.registry.TypeMetaData;
-
-import lombok.Getter;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2 @Deprecated
-public class IsisBeanScanInterceptorForSpring implements TypeFilter {
-
- @Getter(lazy=true)
- private final IsisBeanTypeRegistry typeRegistry = IsisBeanTypeRegistry.current();
-
- @Override
- public boolean match(
- MetadataReader metadataReader,
- MetadataReaderFactory metadataReaderFactory)
- throws IOException {
-
- return false; //NOOP
-
-// val classMetadata = metadataReader.getClassMetadata();
-// if(!classMetadata.isConcrete()) {
-// return false;
-// }
-//
-// //val annotationMetadata = metadataReader.getAnnotationMetadata();
-// //val annotationTypes = annotationMetadata.getAnnotationTypes();
-// val typeMetaData = TypeMetaData.of(classMetadata.getClassName()/*, annotationTypes*/);
-//
-// if(log.isDebugEnabled()) {
-// log.debug("scanning concrete type {} -> {}", classMetadata.getClassName(), typeMetaData);
-// }
-//
-// return getTypeRegistry().isIoCManagedType(typeMetaData);
- }
-
-}
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
index f504939..ef136c1 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
@@ -25,9 +25,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -35,7 +33,6 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.apache.isis.applib.IsisApplibModule;
import org.apache.isis.config.IsisConfigModule;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.metamodel.IsisMetamodelModule;
import org.apache.isis.runtime.IsisRuntimeModule;
import org.apache.isis.runtime.services.IsisRuntimeServicesModule;
@@ -52,10 +49,8 @@ import org.apache.isis.wrapper.IsisWrapperModule;
IsisMetamodelModule.class,
IsisRuntimeModule.class,
IsisRuntimeServicesModule.class,
- IsisWrapperModule.class},
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
- })
+ IsisWrapperModule.class
+ })
public class IsisBoot implements ApplicationContextAware {
@Override
diff --git a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
index 94c5f5f..befc5ac 100644
--- a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
+++ b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootWebRestfulObjects.java
@@ -20,12 +20,9 @@
package org.apache.isis.viewer.restfulobjects;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.webapp.IsisBootWebApp;
/**
@@ -39,9 +36,6 @@ import org.apache.isis.webapp.IsisBootWebApp;
@ComponentScan(
basePackageClasses= {
IsisBootWebRestfulObjects.class,
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class IsisBootWebRestfulObjects {
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
index 4f93222..fdaa3f6 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootWebWicket.java
@@ -20,12 +20,9 @@
package org.apache.isis.viewer.wicket.viewer;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.webapp.IsisBootWebApp;
/**
@@ -39,9 +36,6 @@ import org.apache.isis.webapp.IsisBootWebApp;
@ComponentScan(
basePackageClasses= {
IsisBootWebWicket.class,
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class IsisBootWebWicket {
diff --git a/examples/apps/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java b/examples/apps/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
index e1f79cc..ae25e5e 100644
--- a/examples/apps/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
+++ b/examples/apps/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
@@ -19,15 +19,12 @@
package domainapp.conf;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.IsisPresets;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.IsisBootSecurityBypass;
@@ -54,9 +51,6 @@ import domainapp.modules.simple.SimpleModule;
basePackageClasses= {
DomainAppApplicationModule.class,
SimpleModule.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class SimpleAppConfigurationForTesting {
diff --git a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
index 17ca124..115dff8 100644
--- a/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
+++ b/examples/apps/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
@@ -22,15 +22,12 @@ import javax.inject.Singleton;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.IsisPresets;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.extensions.fixtures.IsisBootFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
@@ -58,9 +55,6 @@ import domainapp.modules.simple.SimpleModule;
@ComponentScan(
basePackageClasses= {
SimpleModule.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class SimpleModuleManifestForTesting {
diff --git a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java b/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
index 249b7ed..2b1acb7 100644
--- a/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
+++ b/extensions/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisBootSecmanModel.java
@@ -19,19 +19,12 @@
package org.apache.isis.extensions.secman.model;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
@Configuration
@ComponentScan(
basePackageClasses= {
IsisBootSecmanModel.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class IsisBootSecmanModel {
diff --git a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java b/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
index 7ba336d..5b6d082 100644
--- a/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
+++ b/extensions/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisBootSecmanPersistenceJdo.java
@@ -19,19 +19,12 @@
package org.apache.isis.extensions.secman.jdo;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
@Configuration
@ComponentScan(
basePackageClasses= {
IsisBootSecmanPersistenceJdo.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class IsisBootSecmanPersistenceJdo {