You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/11/13 21:31:07 UTC
git commit: Remove support for ignored classes,
Weld no longer logs warnings for those classes
Updated Branches:
refs/heads/wicket-6.x 39b5e6421 -> 49840c02b
Remove support for ignored classes, Weld no longer logs warnings for those classes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/49840c02
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/49840c02
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/49840c02
Branch: refs/heads/wicket-6.x
Commit: 49840c02b3daa3e7bc13119b9534b98d14a9fb45
Parents: 39b5e64
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Wed Nov 13 21:30:25 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Wed Nov 13 21:30:44 2013 +0100
----------------------------------------------------------------------
.../org/apache/wicket/cdi/AbstractInjector.java | 46 +----------
.../org/apache/wicket/cdi/CdiConfiguration.java | 85 --------------------
.../wicket/cdi/ConfigurationParameters.java | 13 ---
.../java/org/apache/wicket/cdi/IgnoreList.java | 37 ---------
.../apache/wicket/cdi/AbstractInjectorTest.java | 57 -------------
.../cdi/util/tester/TestCdiConfiguration.java | 9 ---
6 files changed, 2 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
index bec113a..a7f3ddc 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/AbstractInjector.java
@@ -16,12 +16,8 @@
*/
package org.apache.wicket.cdi;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Base class for injectors
*
@@ -29,57 +25,19 @@ import org.slf4j.LoggerFactory;
*/
public class AbstractInjector<T>
{
-
- private static final Logger LOG = LoggerFactory.getLogger(AbstractInjector.class);
-
- @Inject
- AbstractCdiContainer cdiContainer;
-
@Inject
INonContextualManager nonContextualManager;
@Inject
CdiConfiguration cdiConfiguration;
- @Inject
- @IgnoreList
- Instance<String[]> ignorePackages;
-
protected void postConstruct(T instance)
{
- if (!ignore(instance.getClass()))
- {
- nonContextualManager.postConstruct(instance);
- }
+ nonContextualManager.postConstruct(instance);
}
protected void inject(T instance)
{
-
- if (!ignore(instance.getClass()))
- {
- nonContextualManager.inject(instance);
- }
- }
-
- protected boolean ignore(Class<?> instanceClass)
- {
- String packageName = instanceClass.getPackage().getName();
- for (String ignore : ignorePackages.get())
- {
-
- if (instanceClass.getName().equals(ignore) || packageName.contains(ignore))
- {
- LOG.debug("Skipping {} which is set to ignore {}", instanceClass, packageName);
- return true;
- }
- }
- return false;
- }
-
- public String[] getIgnorePackages()
- {
- return ignorePackages.get();
+ nonContextualManager.inject(instance);
}
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index dc23e1e..99b1880 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.cdi;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
@@ -53,9 +52,6 @@ import org.slf4j.LoggerFactory;
public class CdiConfiguration
{
private static final Logger logger = LoggerFactory.getLogger(CdiConfiguration.class);
- private static final String[] defaultIgnoredPackages = new String[] {
- "org.apache.wicket.markup", "org.apache.wicket.protocol.http",
- "org.apache.wicket.behavior", };
@Inject
AbstractCdiContainer container;
@@ -308,85 +304,6 @@ public class CdiConfiguration
return getApplicationParameters().isConfigured();
}
- public @Produces
- @IgnoreList
- String[] getPackagesToIgnore()
- {
- ConfigurationParameters params = getApplicationParameters();
-
- String[] ignore = new String[params.getIgnoredPackages().size()];
- return params.getIgnoredPackages().toArray(ignore);
- }
-
- /**
- * Allows for addition of individual classes to be ignored during injection.
- *
- * @param classes
- * @return {@code this} for easy chaining
- */
- public CdiConfiguration addClassesToIgnore(Class<?>... classes)
- {
- if (classes != null && classes.length > 0)
- {
- ConfigurationParameters params = getApplicationParameters();
- for (Class<?> clazz : classes)
- {
- params.getIgnoredPackages().add(clazz.getName());
- }
- }
- return this;
- }
-
- /**
- * Remove one or more Classes from Ignore list
- *
- * @param classes
- * @return {@code this} for easy chaining
- */
- public CdiConfiguration removeClassesToIgnore(Class<?>... classes)
- {
- if (classes != null && classes.length > 0)
- {
- ConfigurationParameters params = getApplicationParameters();
- for (Class<?> clazz : classes)
- {
- params.getIgnoredPackages().remove(clazz.getName());
- }
- }
- return this;
- }
-
- /**
- * Allows for addition of one or more packages to be ignored during
- * injection.
- *
- * @param packageNames
- * @return {@code this} for easy chaining
- */
- public CdiConfiguration addPackagesToIgnore(String... packageNames)
- {
- if (packageNames != null && packageNames.length > 0)
- {
- getApplicationParameters().getIgnoredPackages().addAll(Arrays.asList(packageNames));
- }
- return this;
- }
-
- /**
- * Remove one or more Package from Ignore list
- *
- * @param packageNames
- * @return {@code this} for easy chaining
- */
- public CdiConfiguration removePackagesToIgnore(String... packageNames)
- {
- if (packageNames != null && packageNames.length > 0)
- {
- getApplicationParameters().getIgnoredPackages().removeAll(Arrays.asList(packageNames));
- }
- return this;
- }
-
protected ConfigurationParameters getApplicationParameters()
{
ConfigurationParameters params = parameters.get(Application.get().getApplicationKey());
@@ -447,8 +364,6 @@ public class CdiConfiguration
{
parameters.put(appKey, params);
}
- params.getIgnoredPackages().addAll(Arrays.asList(defaultIgnoredPackages));
-
RequestCycleListenerCollection listeners = new RequestCycleListenerCollection();
application.getRequestCycleListeners().add(listeners);
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
index f26789b..647cf1e 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConfigurationParameters.java
@@ -17,8 +17,6 @@
package org.apache.wicket.cdi;
import java.io.Serializable;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.wicket.application.IComponentOnBeforeRenderListener;
import org.apache.wicket.request.cycle.IRequestCycleListener;
@@ -41,7 +39,6 @@ public class ConfigurationParameters implements Serializable
private boolean autoConversationManagement = false;
private boolean configured = false;
- private Set<String> ignoredPackages = new TreeSet<String>();
private IRequestCycleListener activeRequestCycleListener;
private IComponentOnBeforeRenderListener activeComponentOnBeforeRenderListener;
@@ -118,16 +115,6 @@ public class ConfigurationParameters implements Serializable
return this;
}
- public Set<String> getIgnoredPackages()
- {
- return ignoredPackages;
- }
-
- void setIgnoredPackages(Set<String> ignoredPackages)
- {
- this.ignoredPackages = ignoredPackages;
- }
-
IRequestCycleListener getActiveRequestCycleListener()
{
return activeRequestCycleListener;
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
deleted file mode 100644
index 35e577a..0000000
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java
+++ /dev/null
@@ -1,37 +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.wicket.cdi;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Qualifier for injecting the Ignore Package List
- *
- * @author jsarman
- */
-@Qualifier
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreList {
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/AbstractInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/AbstractInjectorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/AbstractInjectorTest.java
deleted file mode 100644
index edff13f..0000000
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/AbstractInjectorTest.java
+++ /dev/null
@@ -1,57 +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.wicket.cdi;
-
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-
-import org.junit.Test;
-
-/**
- * @author jsarman
- */
-public class AbstractInjectorTest extends WicketCdiTestCase
-{
-
- @Inject
- ConversationPropagator conversationPropagator;
- @Inject
- @Any
- AbstractInjector abstractInjector;
-
-
- @Test
- public void testIgnore()
- {
- CdiConfiguration.get().addClassesToIgnore(Object.class);
- assertTrue(abstractInjector.ignore(Object.class));
-
- CdiConfiguration.get().removeClassesToIgnore(Object.class);
- assertFalse(abstractInjector.ignore(Object.class));
-
- CdiConfiguration.get().addPackagesToIgnore("java.lang");
- assertTrue(abstractInjector.ignore(Object.class));
- assertTrue(abstractInjector.ignore(Runtime.class));
-
- CdiConfiguration.get().removePackagesToIgnore("java.lang");
- assertFalse(abstractInjector.ignore(Object.class));
- assertFalse(abstractInjector.ignore(Runtime.class));
-
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/49840c02/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
index 6dd7e8a..7715bb3 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/util/tester/TestCdiConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.wicket.cdi.Auto;
import org.apache.wicket.cdi.CdiConfiguration;
import org.apache.wicket.cdi.ConfigurationParameters;
import org.apache.wicket.cdi.IConversationPropagation;
-import org.apache.wicket.cdi.IgnoreList;
import org.apache.wicket.cdi.Propagation;
/**
@@ -68,14 +67,6 @@ public class TestCdiConfiguration extends CdiConfiguration
return super.isAutoConversationManagement();
}
- public @Produces
- @IgnoreList
- @Override
- String[] getPackagesToIgnore()
- {
- return super.getPackagesToIgnore();
- }
-
public void remapApplicationKey(String key, Application app)
{
ConfigurationParameters cp = parameters.remove(key);