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

Remove use of Optional.

Browse Source
This commit is contained in:
Stacey Watro
2022-05-16 11:49:17 -04:00
committed by Dave Syer
parent 9d163233f7
commit dc7dc52931
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/guice/module/GuiceAutowireCandidateResolver.java
View File

@@ -135,21 +135,21 @@ class GuiceAutowireCandidateResolver extends ContextAnnotationAutowireCandidateR
private Key<?> guiceInstanceResolverKey() {
Type type = descriptor.getResolvableType().getType();
Optional<String> qualifierValue = qualifierBean(descriptor).map(Qualifier::value);
if (qualifierValue.isPresent()) {
return Key.get(type, Names.named(qualifierValue.get()));
Qualifier qualifierValue = qualifierBean(descriptor);
if (qualifierValue != null) {
return Key.get(type, Names.named(qualifierValue.value()));
}
return Key.get(type);
}
private Optional<Qualifier> qualifierBean(DependencyDescriptor descriptor) {
private Qualifier qualifierBean(DependencyDescriptor descriptor) {
if (descriptor.getField() != null) {
return Optional.ofNullable(descriptor.getField().getAnnotation(Qualifier.class));
return descriptor.getField().getAnnotation(Qualifier.class);
}
if (descriptor.getMethodParameter() != null) {
return Optional.ofNullable(descriptor.getMethodParameter().getParameterAnnotation(Qualifier.class));
return descriptor.getMethodParameter().getParameterAnnotation(Qualifier.class);
}
return Optional.empty();
return null;
}
@Override