Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #71 and #78: Use injection context already on inital presenter initialization #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for #71 and #78: Use injection context already on inital presenter initialization #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 34 additions & 36 deletions src/main/java/com/airhacks/afterburner/injection/Injector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
* 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.
* #L%
*/
import com.airhacks.afterburner.configuration.Configurator;

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
Expand All @@ -33,12 +33,15 @@
import java.util.WeakHashMap;
import java.util.function.Consumer;
import java.util.function.Function;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;

import com.airhacks.afterburner.configuration.Configurator;

/**
*
*
* @author adam-bien.com
*/
public class Injector {
Expand All @@ -54,18 +57,7 @@ public class Injector {

public static <T> T instantiatePresenter(Class<T> clazz, Function<String, Object> injectionContext) {
@SuppressWarnings("unchecked")
T presenter = registerExistingAndInject((T) instanceSupplier.apply(clazz));
//after the regular, conventional initialization and injection, perform postinjection
Field[] fields = clazz.getDeclaredFields();
for (final Field field : fields) {
if (field.isAnnotationPresent(Inject.class)) {
final String fieldName = field.getName();
final Object value = injectionContext.apply(fieldName);
if (value != null) {
injectIntoField(field, presenter, value);
}
}
}
T presenter = registerExistingAndInject((T) instanceSupplier.apply(clazz), injectionContext);
return presenter;
}

Expand Down Expand Up @@ -99,19 +91,20 @@ public static void resetConfigurationSource() {
* @param <T> the class to initialize
* @param instance An already existing (legacy) presenter interesting in
* injection
* @param injectionContext
* @return presenter with injected fields
*/
public static <T> T registerExistingAndInject(T instance) {
T product = injectAndInitialize(instance);
public static <T> T registerExistingAndInject(T instance, Function<String, Object> injectionContext) {
T product = injectAndInitialize(instance, injectionContext);
presenters.add(product);
return product;
}

@SuppressWarnings("unchecked")
public static <T> T instantiateModelOrService(Class<T> clazz) {
public static <T> T instantiateModelOrService(Class<T> clazz, Function<String, Object> injectionContext) {
T product = (T) modelsAndServices.get(clazz);
if (product == null) {
product = injectAndInitialize((T) instanceSupplier.apply(clazz));
product = injectAndInitialize((T) instanceSupplier.apply(clazz), injectionContext);
modelsAndServices.putIfAbsent(clazz, product);
}
return clazz.cast(product);
Expand All @@ -121,31 +114,40 @@ public static <T> void setModelOrService(Class<T> clazz, T instance) {
modelsAndServices.put(clazz, instance);
}

static <T> T injectAndInitialize(T product) {
injectMembers(product);
static <T> T injectAndInitialize(T product, Function<String, Object> injectionContext) {
injectMembers(product, injectionContext);
initialize(product);
return product;
}

static void injectMembers(final Object instance) {
static void injectMembers(final Object instance, Function<String, Object> injectionContext) {
Class<? extends Object> clazz = instance.getClass();
injectMembers(clazz, instance);
injectMembers(clazz, instance, injectionContext);
}

public static void injectMembers(Class<? extends Object> clazz, final Object instance) throws SecurityException {
public static void injectMembers(Class<? extends Object> clazz, final Object instance, Function<String, Object> injectionContext) throws SecurityException {
LOG.accept("Injecting members for class " + clazz + " and instance " + instance);
Field[] fields = clazz.getDeclaredFields();
for (final Field field : fields) {
if (field.isAnnotationPresent(Inject.class)) {
LOG.accept("Field annotated with @Inject found: " + field);
Class<?> type = field.getType();
String key = field.getName();
Object value = configurator.getProperty(clazz, key);
String fieldName = field.getName();

// First try the configurator
Object value = configurator.getProperty(clazz, fieldName);
LOG.accept("Value returned by configurator is: " + value);

// Next try injection context
if (value == null) {
value = injectionContext.apply(fieldName);
}

if (value == null && isNotPrimitiveOrString(type)) {
LOG.accept("Field is not a JDK class");
value = instantiateModelOrService(type);
value = instantiateModelOrService(type, injectionContext);
}

if (value != null) {
LOG.accept("Value is a primitive, injecting...");
injectIntoField(field, instance, value);
Expand All @@ -155,7 +157,7 @@ public static void injectMembers(Class<? extends Object> clazz, final Object ins
Class<? extends Object> superclass = clazz.getSuperclass();
if (superclass != null) {
LOG.accept("Injecting members of: " + superclass);
injectMembers(superclass, instance);
injectMembers(superclass, instance, injectionContext);
}
}

Expand Down Expand Up @@ -194,7 +196,7 @@ static void invokeMethodWithAnnotation(Class<?> clazz, final Object instance, fi
boolean wasAccessible = method.isAccessible();
try {
method.setAccessible(true);
return method.invoke(instance, new Object[]{});
return method.invoke(instance);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
throw new IllegalStateException("Problem invoking " + annotationClass + " : " + method, ex);
} finally {
Expand All @@ -211,12 +213,8 @@ static void invokeMethodWithAnnotation(Class<?> clazz, final Object instance, fi

public static void forgetAll() {
Collection<Object> values = modelsAndServices.values();
values.stream().forEach((object) -> {
destroy(object);
});
presenters.stream().forEach((object) -> {
destroy(object);
});
values.forEach(Injector::destroy);
presenters.forEach(Injector::destroy);
presenters.clear();
modelsAndServices.clear();
resetInstanceSupplier();
Expand Down