Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WELD-1345 Isolate InjectionTarget.inject() logic into Injectors
- Loading branch information
Showing
10 changed files
with
290 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
impl/src/main/java/org/jboss/weld/injection/producer/DefaultInjector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2013, Red Hat, Inc., and individual contributors | ||
| * by the @authors tag. See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * Licensed 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.jboss.weld.injection.producer; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import javax.enterprise.context.spi.CreationalContext; | ||
| import javax.enterprise.inject.spi.Bean; | ||
| import javax.enterprise.inject.spi.InjectionPoint; | ||
| import javax.enterprise.inject.spi.InjectionTarget; | ||
| import javax.inject.Inject; | ||
|
|
||
| import org.jboss.weld.annotated.enhanced.EnhancedAnnotatedType; | ||
| import org.jboss.weld.annotated.slim.SlimAnnotatedType; | ||
| import org.jboss.weld.injection.FieldInjectionPoint; | ||
| import org.jboss.weld.injection.InjectionContextImpl; | ||
| import org.jboss.weld.injection.InjectionPointFactory; | ||
| import org.jboss.weld.injection.MethodInjectionPoint; | ||
| import org.jboss.weld.manager.BeanManagerImpl; | ||
| import org.jboss.weld.util.BeanMethods; | ||
| import org.jboss.weld.util.Beans; | ||
| import org.jboss.weld.util.InjectionPoints; | ||
|
|
||
| /** | ||
| * Injector implementation that injects {@link Inject}-annotated fields and calls CDI initializer methods. | ||
| * | ||
| * @author Jozef Hartinger | ||
| * | ||
| * @param <T> | ||
| */ | ||
| public class DefaultInjector<T> implements Injector<T> { | ||
|
|
||
| private final List<Set<FieldInjectionPoint<?, ?>>> injectableFields; | ||
| private final List<Set<MethodInjectionPoint<?, ?>>> initializerMethods; | ||
|
|
||
| protected DefaultInjector(EnhancedAnnotatedType<T> type, Bean<T> bean, BeanManagerImpl beanManager) { | ||
| this.injectableFields = InjectionPointFactory.instance().getFieldInjectionPoints(bean, type, beanManager); | ||
| this.initializerMethods = BeanMethods.getInitializerMethods(bean, type, beanManager); | ||
| } | ||
|
|
||
| @Override | ||
| public void registerInjectionPoints(Set<InjectionPoint> injectionPoints) { | ||
| injectionPoints.addAll(InjectionPoints.flattenInjectionPoints(this.injectableFields)); | ||
| injectionPoints.addAll(InjectionPoints.flattenParameterInjectionPoints(this.initializerMethods)); | ||
| } | ||
|
|
||
| @Override | ||
| public void inject(final T instance, final CreationalContext<T> ctx, final BeanManagerImpl manager, SlimAnnotatedType<T> type, InjectionTarget<T> injectionTarget) { | ||
| new InjectionContextImpl<T>(manager, injectionTarget, type, instance) { | ||
| public void proceed() { | ||
| inject(instance, ctx, manager); | ||
| } | ||
| }.run(); | ||
| } | ||
|
|
||
| public void inject(final T instance, final CreationalContext<T> ctx, BeanManagerImpl manager) { | ||
| Beans.injectFieldsAndInitializers(instance, ctx, manager, injectableFields, initializerMethods); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Set<FieldInjectionPoint<?, ?>>> getInjectableFields() { | ||
| return injectableFields; | ||
| } | ||
|
|
||
| @Override | ||
| public List<Set<MethodInjectionPoint<?, ?>>> getInitializerMethods() { | ||
| return initializerMethods; | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
impl/src/main/java/org/jboss/weld/injection/producer/Injector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2013, Red Hat, Inc., and individual contributors | ||
| * by the @authors tag. See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * Licensed 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.jboss.weld.injection.producer; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import javax.enterprise.context.spi.CreationalContext; | ||
| import javax.enterprise.inject.spi.InjectionPoint; | ||
| import javax.enterprise.inject.spi.InjectionTarget; | ||
|
|
||
| import org.jboss.weld.annotated.slim.SlimAnnotatedType; | ||
| import org.jboss.weld.injection.FieldInjectionPoint; | ||
| import org.jboss.weld.injection.MethodInjectionPoint; | ||
| import org.jboss.weld.manager.BeanManagerImpl; | ||
|
|
||
| /** | ||
| * Implementations of this interface are capable of performing field/method injection as defined in | ||
| * {@link InjectionTarget#inject(Object, CreationalContext)}. | ||
| * | ||
| * @author Jozef Hartinger | ||
| * | ||
| * @param <T> | ||
| */ | ||
| public interface Injector<T> { | ||
|
|
||
| void inject(T instance, CreationalContext<T> ctx, BeanManagerImpl manager, SlimAnnotatedType<T> type, InjectionTarget<T> injectionTarget); | ||
|
|
||
| /** | ||
| * Add field/parameter injection points to the set of injection points of an InjectionTarget. The resulting set is returned | ||
| * from {@link InjectionTarget#getInjectionPoints()}. | ||
| * | ||
| * @param injectionPoints | ||
| */ | ||
| void registerInjectionPoints(Set<InjectionPoint> injectionPoints); | ||
|
|
||
| List<Set<MethodInjectionPoint<?, ?>>> getInitializerMethods(); | ||
|
|
||
| List<Set<FieldInjectionPoint<?, ?>>> getInjectableFields(); | ||
| } |
62 changes: 62 additions & 0 deletions
62
impl/src/main/java/org/jboss/weld/injection/producer/ResourceInjector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2013, Red Hat, Inc., and individual contributors | ||
| * by the @authors tag. See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * Licensed 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.jboss.weld.injection.producer; | ||
|
|
||
| import static org.jboss.weld.util.collections.WeldCollections.immutableSet; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import javax.enterprise.context.spi.CreationalContext; | ||
| import javax.enterprise.inject.spi.Bean; | ||
|
|
||
| import org.jboss.weld.annotated.enhanced.EnhancedAnnotatedType; | ||
| import org.jboss.weld.injection.InjectionPointFactory; | ||
| import org.jboss.weld.injection.ResourceInjectionPoint; | ||
| import org.jboss.weld.manager.BeanManagerImpl; | ||
| import org.jboss.weld.util.Beans; | ||
| import org.jboss.weld.util.collections.ArraySet; | ||
|
|
||
| /** | ||
| * {@link Injector} that adds support for resource field injection. | ||
| * | ||
| * @see DefaultInjector | ||
| * | ||
| * @author Jozef Hartinger | ||
| * | ||
| * @param <T> | ||
| */ | ||
| public class ResourceInjector<T> extends DefaultInjector<T> { | ||
|
|
||
| private final Set<ResourceInjectionPoint<?, ?>> resourceInjectionPoints; | ||
|
|
||
| protected ResourceInjector(EnhancedAnnotatedType<T> type, Bean<T> bean, BeanManagerImpl beanManager) { | ||
| super(type, bean, beanManager); | ||
| Set<ResourceInjectionPoint<?, ?>> resourceInjectionPoints = new ArraySet<ResourceInjectionPoint<?, ?>>(); | ||
| resourceInjectionPoints.addAll(InjectionPointFactory.silentInstance().getEjbInjectionPoints(bean, type, beanManager)); | ||
| resourceInjectionPoints.addAll(InjectionPointFactory.silentInstance().getPersistenceContextInjectionPoints(bean, type, beanManager)); | ||
| resourceInjectionPoints.addAll(InjectionPointFactory.silentInstance().getPersistenceUnitInjectionPoints(bean, type, beanManager)); | ||
| resourceInjectionPoints.addAll(InjectionPointFactory.silentInstance().getResourceInjectionPoints(bean, type, beanManager)); | ||
| resourceInjectionPoints.addAll(InjectionPointFactory.silentInstance().getWebServiceRefInjectionPoints(bean, type, beanManager)); | ||
| this.resourceInjectionPoints = immutableSet(resourceInjectionPoints); | ||
| } | ||
|
|
||
| @Override | ||
| public void inject(T instance, CreationalContext<T> ctx, BeanManagerImpl manager) { | ||
| Beans.injectEEFields(resourceInjectionPoints, instance, ctx); | ||
| super.inject(instance, ctx, manager); | ||
| } | ||
| } |
Oops, something went wrong.