From 752091fcf73f41b609a945a1975629d5d0a96ceb Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 17 Apr 2018 13:41:33 -0700 Subject: [PATCH] Extract name from javax.inject.Named if found --- .../guice/annotation/ModuleRegistryConfiguration.java | 8 ++++++-- .../springframework/guice/injector/SpringInjector.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/guice/annotation/ModuleRegistryConfiguration.java b/src/main/java/org/springframework/guice/annotation/ModuleRegistryConfiguration.java index 4537704..57a02ed 100644 --- a/src/main/java/org/springframework/guice/annotation/ModuleRegistryConfiguration.java +++ b/src/main/java/org/springframework/guice/annotation/ModuleRegistryConfiguration.java @@ -13,6 +13,7 @@ package org.springframework.guice.annotation; +import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -127,8 +128,11 @@ class ModuleRegistryConfiguration implements BeanDefinitionRegistryPostProcessor } private String extractName(Key key) { - if (key.getAnnotation() instanceof Named) { - return ((Named) key.getAnnotation()).value(); + final Annotation annotation = key.getAnnotation(); + if (annotation instanceof Named) { + return ((Named) annotation).value(); + } else if (annotation instanceof javax.inject.Named) { + return ((javax.inject.Named) annotation).value(); } return key.getTypeLiteral().getRawType().getSimpleName(); } diff --git a/src/main/java/org/springframework/guice/injector/SpringInjector.java b/src/main/java/org/springframework/guice/injector/SpringInjector.java index b79ba30..8be196b 100644 --- a/src/main/java/org/springframework/guice/injector/SpringInjector.java +++ b/src/main/java/org/springframework/guice/injector/SpringInjector.java @@ -136,8 +136,11 @@ public class SpringInjector implements Injector { } private String extractName(Key key) { - if (key.getAnnotation() instanceof Named) { - return ((Named) key.getAnnotation()).value(); + final Annotation annotation = key.getAnnotation(); + if (annotation instanceof Named) { + return ((Named) annotation).value(); + } else if (annotation instanceof javax.inject.Named) { + return ((javax.inject.Named) annotation).value(); } return key.getTypeLiteral().getRawType().getSimpleName(); }