From 1b634bbb74c4cfa371726e90e71655f7250e05af Mon Sep 17 00:00:00 2001 From: Eric Cochran Date: Mon, 27 Mar 2017 16:25:31 -0700 Subject: [PATCH] Update adapter methods ISE message. (#273) --- .../main/java/com/squareup/moshi/AdapterMethodsFactory.java | 6 +++++- .../test/java/com/squareup/moshi/AdapterMethodsTest.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java b/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java index a9c8e0f..b61a56b 100644 --- a/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java +++ b/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java @@ -186,6 +186,8 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory { throw new IllegalArgumentException("Unexpected signature for " + method + ".\n" + "@ToJson method signatures may have one of the following structures:\n" + " void toJson(JsonWriter writer, T value) throws ;\n" + + " void toJson(JsonReader jsonReader," + + " JsonAdapter delegate, ) throws ;\n" + " R toJson(T value) throws ;\n"); } } @@ -248,7 +250,9 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory { } else { throw new IllegalArgumentException("Unexpected signature for " + method + ".\n" + "@FromJson method signatures may have one of the following structures:\n" - + " void fromJson(JsonReader jsonReader) throws ;\n" + + " R fromJson(JsonReader jsonReader) throws ;\n" + + " R fromJson(JsonReader jsonReader," + + " JsonAdapter delegate, ) throws ;\n" + " R fromJson(T value) throws ;\n"); } } diff --git a/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java b/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java index 2516852..83fa9fb 100644 --- a/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java +++ b/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java @@ -215,6 +215,8 @@ public final class AdapterMethodsTest { + "(com.squareup.moshi.AdapterMethodsTest$Point).\n" + "@ToJson method signatures may have one of the following structures:\n" + " void toJson(JsonWriter writer, T value) throws ;\n" + + " void toJson(JsonReader jsonReader," + + " JsonAdapter delegate, ) throws ;\n" + " R toJson(T value) throws ;\n"); } } @@ -234,7 +236,9 @@ public final class AdapterMethodsTest { + "com.squareup.moshi.AdapterMethodsTest$UnexpectedSignatureFromJsonAdapter.pointFromJson" + "(java.lang.String).\n" + "@FromJson method signatures may have one of the following structures:\n" - + " void fromJson(JsonReader jsonReader) throws ;\n" + + " R fromJson(JsonReader jsonReader) throws ;\n" + + " R fromJson(JsonReader jsonReader," + + " JsonAdapter delegate, ) throws ;\n" + " R fromJson(T value) throws ;\n"); } }