wbrawner/moshi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
223 commits 18 branches 12 tags 2.2 MiB
Commit graph

223 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jesse Wilson
f667733ec7 Merge pull request #219 from serj-lotutovici/sl/to_string 
Make ArrayJsonAdapter implement toString().
 2017-01-16 13:26:46 -05:00
jwilson
3fb549e434 Merge branch 'jmfayard-prettyprint' 
* jmfayard-prettyprint:
  Moshi.Builder#setPrettyPrinting + failing test
 2017-01-16 13:26:05 -05:00
jmfayard
176e9d0685 Moshi.Builder#setPrettyPrinting + failing test 2017-01-16 13:25:57 -05:00
Serj Lotutovici
0ccc746db5 Make ArrayJsonAdapter implement toString(). 2016-12-28 20:03:12 +01:00
Jake Wharton
b024b6a1cb Merge pull request #212 from square/jwilson.1023.nulls_in_readers 
Adapter methods get nulls if they accept JsonReader/JsonWriter.
 2016-10-23 11:17:36 -04:00
jwilson
4c973d1aef Adapter methods get nulls if they accept JsonReader/JsonWriter. 
https://gist.github.com/SteinerOk/82f90fb570ef9ad35e2833ee96747939
 2016-10-23 10:57:19 -04:00
jwilson
e1809aa6f9 [maven-release-plugin] prepare for next development iteration 2016-10-21 09:35:13 -04:00
jwilson
6d623663cb [maven-release-plugin] prepare release moshi-parent-1.3.1 2016-10-21 09:35:10 -04:00
jwilson
af3e435927 Update changelog for 1.3.1. 2016-10-21 09:34:32 -04:00
Jake Wharton
5467daeff8 Merge pull request #211 from square/jwilson.1020.escape_slash 
Don't reject escaped forward slashes.
 2016-10-20 22:34:00 -04:00
jwilson
b0e11ebb1c Don't reject escaped forward slashes. 
Closes: https://github.com/square/moshi/issues/209
 2016-10-20 21:34:22 -04:00
Jesse Wilson
22e6991e41 Merge pull request #204 from serj-lotutovici/sl/changelog_nits 
Fix small changelog nit.
 2016-10-17 09:35:32 -04:00
Serj Lotutovici
c35756cfa6 Fix small changelog nit. 2016-10-17 15:26:57 +02:00
jwilson
4ff50c47ac [maven-release-plugin] prepare for next development iteration 2016-10-15 14:18:34 -04:00
jwilson
71ded8d091 [maven-release-plugin] prepare release moshi-parent-1.3.0 2016-10-15 14:18:31 -04:00
jwilson
cc8eab1b18 Update changelog for Moshi 1.3.0. 2016-10-15 14:16:55 -04:00
Jesse Wilson
e54fa3c31a Merge pull request #202 from square/jwilson.1015.deep 
Limit to 31 levels of nested structure.
 2016-10-15 13:57:33 -04:00
jwilson
d8743eeef1 Limit to 31 levels of nested structure. 
With the implicit enclosing document this is 32 levels total. The limit
is arbitrary but sufficient - deeper limits yield code that fails with
StackOverflowExceptions during the depth-first traversal.

We were previously broken in JsonWriter on this - the code we added to
support path building was accessing the top of the stack before the
stack had been resized, causing a crash. Because this crash has existed
forever without much outcry we know the limit is likely sufficient for
our existing users.

Closes: https://github.com/square/moshi/issues/189
 2016-10-15 13:54:48 -04:00
Jake Wharton
e506abbc78 Merge pull request #201 from square/jwilson.1015.fix_enclosed_types 
Fix enclosed types with adapter methods.
 2016-10-15 12:29:41 -04:00
jwilson
2b5301f737 Fix enclosed types with adapter methods. 
This was broken becase reflection was providing owner types but our
API didn't have a way to specify them.

Closes: https://github.com/square/moshi/issues/148
 2016-10-15 10:03:01 -04:00
Jake Wharton
fce8fc6976 Merge pull request #200 from square/jwilson.1014.more_jsonadapter_tests 
Test more cases of injecting JsonAdapters.
 2016-10-14 10:40:00 -04:00
jwilson
d6b982629d Test more cases of injecting JsonAdapters. 2016-10-14 08:30:25 -04:00
Jesse Wilson
c56370257e Merge pull request #197 from square/jwilson.1013.json_adapter_parameters 
Permit JsonAdapters to be injected in toJson(), fromJson() methods.
 2016-10-14 08:11:16 -04:00
jwilson
afbaa6a8ef Permit JsonAdapters to be injected in toJson(), fromJson() methods. 
Closes: https://github.com/square/moshi/issues/142
 2016-10-14 08:05:32 -04:00
Jake Wharton
059e8ef286 Merge pull request #198 from square/jwilson.1013.standard_prefixes 
Omit Kotlin and Scala platform types from the class adapter.
 2016-10-13 22:16:39 -04:00
Jake Wharton
257d2a0862 Merge pull request #199 from square/jwilson.1013.drop_private_url 
Don't link to Google's internal bugtracker.
 2016-10-13 22:15:44 -04:00
jwilson
6df7fa4dd5 Don't link to Google's internal bugtracker. 
Closes: https://github.com/square/moshi/issues/122
 2016-10-13 22:09:19 -04:00
jwilson
10703aae65 Omit Kotlin and Scala platform types from the class adapter. 
It's unlikely that these will be stable, or that they'll do anything reasonable.

Closes: https://github.com/square/moshi/issues/185
 2016-10-13 22:06:45 -04:00
Jesse Wilson
4847160540 Merge pull request #196 from square/jw/okio 
Okio 1.11.0.
 2016-10-12 08:25:07 -04:00
Jake Wharton
e01c89cef6 Okio 1.11.0. 2016-10-12 01:09:54 -04:00
Jesse Wilson
56ae2758bf Merge pull request #178 from square/jw/encoding-exception 
Differentiate encoding problems with a specific exception.
 2016-07-08 22:31:36 -04:00
Jake Wharton
47972ba577 Differentiate encoding problems with a specific exception. 2016-07-08 21:19:55 -04:00
Jesse Wilson
bdacdad6ee Merge pull request #177 from square/jw/latest-okio 
Point at the latest Okio.
 2016-07-08 18:57:15 -04:00
Jake Wharton
42caa166f4 Point at the latest Okio. 2016-07-08 18:01:08 -04:00
Jesse Wilson
6d54252527 Merge pull request #168 from square/jw/cause 
Propagate adapter method exception cause.
 2016-06-06 09:08:47 -07:00
Jake Wharton
d5c646f93e Propagate adapter method exception cause. 2016-06-06 01:48:03 -04:00
Jake Wharton
a9d73f27d8 Merge pull request #166 from square/jwilson.0602.invalid_escapes 
Fail on invalid escapes.
 2016-06-02 10:12:59 -04:00
jwilson
14549725ef Fail on invalid escapes. 
Related to https://github.com/google/gson/issues/824
 2016-06-02 09:31:32 -04:00
Jesse Wilson
b81d202093 Merge pull request #164 from satoshun/master 
Add Override annotation
 2016-05-28 22:56:07 -04:00
SatoShun
067077822d Add Override annotation 2016-05-29 02:16:41 +00:00
jwilson
23e6d36a8b [maven-release-plugin] prepare for next development iteration 2016-05-28 14:27:08 -04:00
jwilson
5f0e509b8d [maven-release-plugin] prepare release moshi-parent-1.2.0 2016-05-28 14:27:04 -04:00
jwilson
1537e03b77 Update changelog for Moshi 1.2.0. 2016-05-28 14:25:36 -04:00
Jake Wharton
c4896fdaed Merge pull request #160 from square/jwilson.0502_okio180 
Upgrade to Okio 1.8.0.
 2016-05-02 01:34:48 -04:00
jwilson
3477c4d743 Upgrade to Okio 1.8.0. 2016-05-02 00:48:36 -04:00
Jake Wharton
c5a8a302dc Merge pull request #158 from square/jw/boxed-boolean 
Add writer value overload for boxed booleans.
 2016-04-29 17:19:58 -04:00
Jake Wharton
360006b7bf Add writer value overload for boxed booleans. 
Autoboxing resolves boxed longs and doubles to value(Number), but a boxed boolean would otherwise resolve to value(boolean) with an implicit call to booleanValue() which has the potential to throw NPEs.
 2016-04-29 17:16:52 -04:00
Jake Wharton
23fb01a685 Merge pull request #157 from square/jwilson_0424_more_aggressive_canonicalize 
Be more aggressive about canonicalizing types.
 2016-04-24 13:15:37 -04:00
jwilson
13ec26a96d Be more aggressive about canonicalizing types. 
Unfortunately we shouldn't be relying on equals() and hashCode() of the
default implementations anywhere.
 2016-04-24 10:05:03 -04:00
jwilson
d203cf741a Merge branch 'kotucz-android_parametrized_type_workaround' 
* kotucz-android_parametrized_type_workaround:
  Workaround for Android ParameterizedType implementation bug
 2016-04-24 09:23:10 -04:00