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

Add equals for provider implementations

Browse Source
This commit is contained in:
Dave Syer
2023-02-07 10:55:17 +00:00
parent 340234ebbf
commit 6d3ed4aab2
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/guice/module/SpringModule.java
View File

@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Queue;
import java.util.Set;
@@ -178,7 +179,8 @@ public class SpringModule extends AbstractModule {
bindConditionally(binder(), name, clazz, typeProvider, namedProvider, bindingAnnotation);
}
for (Type superType : getAllSuperTypes(type, clazz)) {
if (!superType.getTypeName().contains(ClassUtils.CGLIB_CLASS_SEPARATOR)) {
if (!superType.getTypeName().contains(ClassUtils.CGLIB_CLASS_SEPARATOR)
&& !superType.equals(Object.class)) {
bindConditionally(binder(), name, superType, typeProvider, namedProvider, bindingAnnotation);
}
}
@@ -451,6 +453,23 @@ public class SpringModule extends AbstractModule {
return this.resultProvider.get();
}
@Override
public boolean equals(Object obj) {
if (obj instanceof BeanFactoryProvider) {
BeanFactoryProvider o = (BeanFactoryProvider) obj;
return ((this.name == null && o.name == null) || (this.name != null && this.name.equals(o.name)))
&& this.type.equals(o.type);
}
else {
return false;
}
}
@Override
public int hashCode() {
return Objects.hash(this.name, this.type);
}
}
private static class CompositeTypeMatcher implements BindingTypeMatcher {