From 72cf5256e89bd10bb256d692af644a926ce1817a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 4 Apr 2016 11:46:51 +0100 Subject: [PATCH] Updates for Spring > 4.0.3 --- pom.xml | 2 +- .../org/springframework/guice/injector/SpringInjector.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 613553e..c1e0264 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.springframework spring-framework-bom - 4.0.3.RELEASE + 4.2.5.RELEASE pom import diff --git a/src/main/java/org/springframework/guice/injector/SpringInjector.java b/src/main/java/org/springframework/guice/injector/SpringInjector.java index ade3cf0..f6362bf 100644 --- a/src/main/java/org/springframework/guice/injector/SpringInjector.java +++ b/src/main/java/org/springframework/guice/injector/SpringInjector.java @@ -39,7 +39,7 @@ public class SpringInjector implements Injector { public SpringInjector(ApplicationContext context) { this.beanFactory = (DefaultListableBeanFactory) context.getAutowireCapableBeanFactory(); - if (context.getBeanNamesForType(Injector.class).length>0) { + if (context.getBeanNamesForType(Injector.class, true, false).length>0) { this.injector = context.getBean(Injector.class); } } @@ -104,7 +104,7 @@ public class SpringInjector implements Injector { @Override public Provider getProvider(Class type) { - if (beanFactory.getBeanNamesForType(type).length==0) { + if (beanFactory.getBeanNamesForType(type, true, false).length==0) { if (injector!=null && injector.getExistingBinding(Key.get(type))!=null) { return injector.getProvider(type); } @@ -130,7 +130,7 @@ public class SpringInjector implements Injector { @Override public T getInstance(Class type) { - if (beanFactory.getBeanNamesForType(type).length==0) { + if (beanFactory.getBeanNamesForType(type, true, false).length==0) { if (injector!=null && injector.getExistingBinding(Key.get(type))!=null) { return injector.getInstance(type); }