diff --git a/gson/src/main/java/com/google/gson/annotations/JsonAdapter.java b/gson/src/main/java/com/google/gson/annotations/JsonAdapter.java
index 093af47c..97adb828 100644
--- a/gson/src/main/java/com/google/gson/annotations/JsonAdapter.java
+++ b/gson/src/main/java/com/google/gson/annotations/JsonAdapter.java
@@ -22,6 +22,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.google.gson.TypeAdapter;
+import com.google.gson.functional.JsonAdapterAnnotationOnFieldsTest.Part;
+import com.google.gson.functional.JsonAdapterAnnotationOnFieldsTest.PartJsonAdapter;
/**
* An annotation that indicates the Gson {@link TypeAdapter} to use with a class or a field.
@@ -59,11 +61,24 @@ import com.google.gson.TypeAdapter;
*
*
* Since User class specified UserJsonAdapter.class in @JsonAdapter annotation, it
- * will automatically be invoked to serialize/deserialize User instances.
+ * will automatically be invoked to serialize/deserialize User instances.
*
* If the UserJsonAdapter needs a constructor other than a no-args constructor, you must register
* an {@link com.google.gson.InstanceCreator} for it.
- *
+ *
+ *
Here is an example of how to apply this annotation to a field. + *
+ * private static final class Gadget { + * @JsonAdapter(UserJsonAdapter2.class) + * final User user; + * Gadget(User user) { + * this.user = user; + * } + * } + *+ * The above annotation will ensure UserJsonAdapter2 supersedes UserJsonAdapter for the user + * field of the Gadget class. + * * @since 2.3 * * @author Inderjeet Singh diff --git a/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java b/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java index d459ab30..ae2057ff 100644 --- a/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java +++ b/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java @@ -43,7 +43,7 @@ public final class JsonAdapterAnnotationOnFieldsTest extends TestCase { public void testRegisteredTypeAdapterOverridesFieldAnnotation() { Gson gson = new GsonBuilder() .registerTypeAdapter(Part.class, new TypeAdapter