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

make GuiceModuleMetadata handle ParameterizedType's correctly #20

Browse Source
This commit is contained in:
Taylor Wicksell
2017-07-26 11:46:18 -07:00
committed by Dave Syer
parent db04553972
commit 5e14e96248
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/guice/module/GuiceModuleMetadata.java
View File

@@ -18,6 +18,7 @@ package org.springframework.guice.module;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
@@ -96,7 +97,8 @@ public class GuiceModuleMetadata implements BindingTypeMatcher {
@Override
public boolean matches(String name, Type type) {
if (!matches(name) || !matches(type)) {
Type rawType = type instanceof ParameterizedType ? ((ParameterizedType)type).getRawType() : type;
if (!matches(name) || !matches(rawType)) {
return false;
}
return true;

8
src/test/java/org/springframework/guice/annotation/GuiceModuleAnnotationTests.java
View File

@@ -16,6 +16,9 @@ package org.springframework.guice.annotation;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.util.HashMap;
import java.util.Map;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -126,5 +129,10 @@ public class GuiceModuleAnnotationTests {
public Service service() {
return new MyService();
}
@Bean
public Map<String,String> someParameterizedType() {
return new HashMap<String,String>();
}
}
}