From e3129927eb9ae4ca7f7fb9d348d133d04d308332 Mon Sep 17 00:00:00 2001 From: Eric Chang Date: Wed, 30 Jun 2021 13:37:40 -0700 Subject: [PATCH] Add the target field to Dagger map key types to support Hilt's @BindValueIntoMap. Fixes #2710 RELNOTES=Add the target field to Dagger map key types to support Hilt's @BindValueIntoMap. #2710 PiperOrigin-RevId: 382375535 --- java/dagger/multibindings/ClassKey.java | 4 ++-- java/dagger/multibindings/IntKey.java | 4 ++-- java/dagger/multibindings/LongKey.java | 4 ++-- java/dagger/multibindings/StringKey.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/dagger/multibindings/ClassKey.java b/java/dagger/multibindings/ClassKey.java index ac255457caa..c759f747238 100644 --- a/java/dagger/multibindings/ClassKey.java +++ b/java/dagger/multibindings/ClassKey.java @@ -16,11 +16,11 @@ package dagger.multibindings; -import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import dagger.MapKey; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -31,7 +31,7 @@ * member whose type is {@code Class}. */ @Documented -@Target(METHOD) +@Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RUNTIME) @MapKey public @interface ClassKey { diff --git a/java/dagger/multibindings/IntKey.java b/java/dagger/multibindings/IntKey.java index 55e79a1bf65..3fcb6b8af5f 100644 --- a/java/dagger/multibindings/IntKey.java +++ b/java/dagger/multibindings/IntKey.java @@ -16,17 +16,17 @@ package dagger.multibindings; -import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import dagger.MapKey; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; /** A {@link MapKey} annotation for maps with {@code int} keys. */ @Documented -@Target(METHOD) +@Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RUNTIME) @MapKey public @interface IntKey { diff --git a/java/dagger/multibindings/LongKey.java b/java/dagger/multibindings/LongKey.java index 71d0fe1167f..27d2ffe1337 100644 --- a/java/dagger/multibindings/LongKey.java +++ b/java/dagger/multibindings/LongKey.java @@ -16,17 +16,17 @@ package dagger.multibindings; -import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import dagger.MapKey; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; /** A {@link MapKey} annotation for maps with {@code long} keys. */ @Documented -@Target(METHOD) +@Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RUNTIME) @MapKey public @interface LongKey { diff --git a/java/dagger/multibindings/StringKey.java b/java/dagger/multibindings/StringKey.java index 5dad8e3e9ac..d3bba9e39e5 100644 --- a/java/dagger/multibindings/StringKey.java +++ b/java/dagger/multibindings/StringKey.java @@ -16,17 +16,17 @@ package dagger.multibindings; -import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import dagger.MapKey; import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; /** A {@link MapKey} annotation for maps with {@link String} keys. */ @Documented -@Target(METHOD) +@Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RUNTIME) @MapKey public @interface StringKey {