From d26b2a151f6a5f3d43572a0576a7b55540f0b576 Mon Sep 17 00:00:00 2001 From: Eric Cochran Date: Sat, 3 Feb 2018 20:50:22 -0800 Subject: [PATCH] Fix error message for invalid toJson signature. (#431) void toJson(JsonWriter, JsonAdapter) does not make sense. This looks like my copy-paste error. --- .../main/java/com/squareup/moshi/AdapterMethodsFactory.java | 4 +--- .../src/test/java/com/squareup/moshi/AdapterMethodsTest.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java b/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java index 1c90f6c..5bfc3bc 100644 --- a/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java +++ b/moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java @@ -191,9 +191,7 @@ 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(JsonWriter writer," - + " JsonAdapter delegate, ) throws ;\n" - + " void toJson(JsonWriter writer, T value" + + " void toJson(JsonWriter writer, T value," + " JsonAdapter delegate, ) throws ;\n" + " R toJson(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 c0d9906..0d63929 100644 --- a/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java +++ b/moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java @@ -304,9 +304,7 @@ 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(JsonWriter writer," - + " JsonAdapter delegate, ) throws ;\n" - + " void toJson(JsonWriter writer, T value" + + " void toJson(JsonWriter writer, T value," + " JsonAdapter delegate, ) throws ;\n" + " R toJson(T value) throws ;\n"); }