You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2018/04/20 13:23:17 UTC
[2/4] deltaspike git commit: DELTASPIKE-1337 optional ClassFilter
DELTASPIKE-1337 optional ClassFilter
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b7808929
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b7808929
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b7808929
Branch: refs/heads/master
Commit: b7808929786eee130e9a724390ff148644d0b127
Parents: a67888d
Author: gpetracek <gp...@apache.org>
Authored: Fri Apr 20 13:07:28 2018 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Fri Apr 20 15:22:40 2018 +0200
----------------------------------------------------------------------
.../deltaspike/core/spi/filter/ClassFilter.java | 26 +++++++++++
.../exclude/extension/ExcludeExtension.java | 45 +++++++++++++++++---
2 files changed, 64 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b7808929/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
new file mode 100644
index 0000000..6a891da
--- /dev/null
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/filter/ClassFilter.java
@@ -0,0 +1,26 @@
+/*
+ * 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.deltaspike.core.spi.filter;
+
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+
+public interface ClassFilter extends Deactivatable
+{
+ boolean isFiltered(Class<?> currentClass);
+}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b7808929/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index ade000d..183d1d9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -18,21 +18,23 @@
*/
package org.apache.deltaspike.core.impl.exclude.extension;
+import org.apache.deltaspike.core.api.config.ConfigResolver;
import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
-import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
-import org.apache.deltaspike.core.util.ServiceUtils;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
-import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.filter.ClassFilter;
import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
+import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
import org.apache.deltaspike.core.impl.interpreter.PropertyExpressionInterpreter;
+import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
+import org.apache.deltaspike.core.spi.activation.Deactivatable;
+import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.core.util.ServiceUtils;
+import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Alternative;
@@ -80,6 +82,10 @@ public class ExcludeExtension implements Extension, Deactivatable
private Map<String, String> globalAlternatives = new HashMap<String, String>();
private Annotation priorityAnnotationInstance;
+ //overruling the filter is supported via config-ordinal - for now only one is supported to keep it simple
+ //a custom filter can always delegate to multiple filters
+ //(e.g. in combination with ServiceUtils or querying all config-sources explicitly)
+ private ClassFilter classFilter;
@SuppressWarnings("UnusedDeclaration")
protected void init(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager)
@@ -107,6 +113,20 @@ public class ExcludeExtension implements Extension, Deactivatable
priorityAnnotationInstance = AnnotationInstanceUtils.getPriorityAnnotationInstance(priorityValue);
}
}
+
+ boolean isClassFilterActivated = ClassDeactivationUtils.isActivated(ClassFilter.class);
+
+ if (isClassFilterActivated)
+ {
+ String classFilterClassName = ClassFilter.class.getName();
+ String activeClassFilterName =
+ ConfigResolver.getProjectStageAwarePropertyValue(classFilterClassName, classFilterClassName);
+
+ if (!classFilterClassName.equals(activeClassFilterName))
+ {
+ classFilter = ClassUtils.tryToInstantiateClassForName(activeClassFilterName, ClassFilter.class);
+ }
+ }
}
private void loadGlobalAlternativeConfigs()
@@ -164,6 +184,17 @@ public class ExcludeExtension implements Extension, Deactivatable
return;
}
+ if (classFilter != null)
+ {
+ Class<?> beanClass = processAnnotatedType.getAnnotatedType().getJavaClass();
+
+ if (classFilter.isFiltered(beanClass))
+ {
+ veto(processAnnotatedType, classFilter.getClass().getName());
+ return;
+ }
+ }
+
//TODO needs further discussions for a different feature CodiStartupBroadcaster.broadcastStartup();
//also forces deterministic project-stage initialization