From dc7dc5293130a778c618112f6b145acde6f082f6 Mon Sep 17 00:00:00 2001
From: Stacey Watro <swatro@squarespace.com>
Date: Mon, 16 May 2022 11:49:17 -0400
Subject: [PATCH] Remove use of Optional.

---
 .../module/GuiceAutowireCandidateResolver.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springframework/guice/module/GuiceAutowireCandidateResolver.java b/src/main/java/org/springframework/guice/module/GuiceAutowireCandidateResolver.java
index aa34115..a46325a 100644
--- a/src/main/java/org/springframework/guice/module/GuiceAutowireCandidateResolver.java
+++ b/src/main/java/org/springframework/guice/module/GuiceAutowireCandidateResolver.java
@@ -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