Spring/spring-guice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guarding against NPE on element filtering

Browse Source 
We are still observing some NPE in ModuleRegistryConfiguration.postProcessBeanDefinitionRegistry
The purpose of this commit is to guard against them and provide
additional context on the reason.
This commit is contained in:
Bernardo Gomez Palacio
2019-12-05 16:53:08 -08:00
committed by Taylor Wicksell
parent c562a37dd3
commit 3939f48dfb
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/springframework/guice/annotation/ModuleRegistryConfiguration.java
View File

@@ -25,6 +25,8 @@ import com.google.inject.spi.Element;
import com.google.inject.spi.ElementSource;
import com.google.inject.spi.Elements;
import com.google.inject.spi.PrivateElements;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -60,7 +62,7 @@ import java.util.stream.Collectors;
/**
* Configuration postprocessor that registers all the bindings in Guice modules as Spring
* beans.
*
*
* @author Dave Syer
* @author Talylor Wicksell
* @author Howard Yuan
@@ -74,6 +76,8 @@ class ModuleRegistryConfiguration
private static final String SPRING_GUICE_DEDUPE_BINDINGS_PROPERTY_NAME = "spring.guice.dedup";
private static final String SPRING_GUICE_AUTOWIRE_JIT_PROPERTY_NAME = "spring.guice.autowireJIT";
private final Log logger = LogFactory.getLog(getClass());
private ApplicationContext applicationContext;
private List<Module> modules;
private AtomicBoolean injectorCreated = new AtomicBoolean(false);
@@ -193,11 +197,8 @@ class ModuleRegistryConfiguration
}
if (applicationContext.getEnvironment().containsProperty("spring.guice.modules.exclude")) {
String[] modulesToFilter = applicationContext.getEnvironment()
.getProperty("spring.guice.modules.exclude").split(",");
elements = elements.stream()
.filter(e -> Arrays.stream(modulesToFilter)
.noneMatch(ex -> (Optional.ofNullable(e.getSource()).map(Object::toString).orElse("").contains(ex))))
.collect(Collectors.toList());
.getProperty("spring.guice.modules.exclude", "").split(",");
elements = elements.stream().filter(e -> elementFilter(modulesToFilter, e)).collect(Collectors.toList());
modules = Collections.singletonList(Elements.getModule(elements));
}
for (Element e : elements) {
@@ -212,6 +213,16 @@ class ModuleRegistryConfiguration
mapBindings(bindings, registry);
}
private boolean elementFilter(String[] modulesToFilter, Element element){
try {
return Arrays.stream(modulesToFilter)
.noneMatch(ex -> Optional.of(element).map(Element::getSource).map(Object::toString).orElse("").contains(ex));
} catch (Exception e){
logger.error(String.format("Unable fo filter element[%s] with filter [%s]", element, Arrays.toString(modulesToFilter)), e);
return false;
}
}
private void extractPrivateElements(Map<Key<?>, Binding<?>> bindings,
PrivateElements privateElements) {
List<Element> elements = privateElements.getElements();