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

254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jake Wharton
7b39133748 Merge pull request #240 from square/jwilson.0129.promote_value_to_name 
Implement promoteValueToName() for ObjectJsonWriter.
 2017-01-29 23:01:46 -05:00
jwilson
75b549f1ff Implement promoteValueToName() for ObjectJsonWriter. 
This was renamed from promoteNameToValue(). Also run the test on both types of
codecs and fix some implementation issues that uncovered.
 2017-01-29 22:47:59 -05:00
Jake Wharton
b4367899cd Merge pull request #238 from square/jwilson.0129.serializeNulls 
New JsonAdapter.serializeNulls() method.
 2017-01-29 22:25:39 -05:00
jwilson
b338d1e7ed New JsonAdapter.serializeNulls() method. 
This makes it possible to force nulls into the document without
much fuss.
 2017-01-29 22:18:12 -05:00
Jesse Wilson
99479682ba Merge pull request #233 from square/jwilson.0124.promote_stacks 
Promote stack management to the JsonReader/JsonWriter supertypes.
 2017-01-25 22:26:30 -05:00
jwilson
4b7ced70e4 Promote stack management to the JsonReader/JsonWriter supertypes. 
It turns out that we can reuse a lot of code with inheritance. Who knew?
 2017-01-25 22:25:19 -05:00
Jake Wharton
a2908369ac Merge pull request #234 from square/jwilson.0124.toJsonObject 
New APIs: JsonAdapter.toJsonObject, fromJsonObject.
 2017-01-24 22:35:09 -05:00
jwilson
e54b023991 New APIs: JsonAdapter.toJsonObject, fromJsonObject. 
https://github.com/square/moshi/issues/89
 2017-01-24 22:11:31 -05:00
Jake Wharton
a90b6c7740 Merge pull request #232 from square/jwilson.0123.object_json_writer 
Implement ObjectJsonWriter.
 2017-01-24 12:04:41 -05:00
jwilson
5ca491fe50 Implement ObjectJsonWriter. 
https://github.com/square/moshi/issues/89
 2017-01-23 20:46:35 -05:00
Jake Wharton
3f06c0cf55 Merge pull request #228 from square/jwilson.0122.json_writer_tests 
Prepare tests for a 2nd implementation of JsonWriter.
 2017-01-23 17:32:44 -05:00
Jesse Wilson
9cb5cb8699 Merge pull request #231 from serj-lotutovici/sl/small_or_nit 
ObjectJsonReader.typeMismatch should return not throw.
 2017-01-22 18:52:54 -05:00
Serj Lotutovici
ed6c3a66b0 ObjectJsonReader.typeMismatch should return not throw. 2017-01-23 00:12:11 +01:00
Jesse Wilson
050b9affbc Merge pull request #230 from serj-lotutovici/sl/no_loop_if_buf 
Avoid calling source.select() if the value is buffered.
 2017-01-22 18:00:21 -05:00
Jesse Wilson
5a12b31439 Merge pull request #229 from serj-lotutovici/sl/use_select_only 
Class and Enum adapters now rely only on Options.
 2017-01-22 17:58:06 -05:00
Serj Lotutovici
ddf2489910 Avoid calling source.select() if the value is buffered. 2017-01-22 23:35:02 +01:00
Serj Lotutovici
5904b9ce8b Class and Enum adapters now rely only on Options. 2017-01-22 23:08:52 +01:00
Jesse Wilson
db30df146f Merge pull request #217 from serj-lotutovici/sl/make_options_public 
Make JsonReader.selectName and JsonReader.selectString public.
 2017-01-22 16:30:13 -05:00
Serj Lotutovici
89f4527466 Make JsonReader.selectName and JsonReader.selectString public. 
* Make JsonReader.Options public by extent.
* Both select methods now stip out unnecessary escaping.
* Re-order tests for select methods.
 2017-01-22 22:06:45 +01:00
jwilson
94ff4b7cc2 Prepare tests for a 2nd implementation of JsonWriter. 2017-01-22 15:07:45 -05:00
Jesse Wilson
459755b98f Merge pull request #227 from serj-lotutovici/sl/know_your_factory 
Make JsonReaderFactory implement toString().
 2017-01-22 06:26:04 -08:00
Serj Lotutovici
c69049661b Make JsonReaderFactory implement toString(). 2017-01-22 09:36:24 +01:00
Jake Wharton
8d80e1bbae Merge pull request #226 from square/jwilson.0121.more_object_reader 
Fix some bugs and increase tests for ObjectJsonReader.
 2017-01-21 23:50:00 -05:00
jwilson
aa9125bb81 Fix some bugs and increase tests for ObjectJsonReader. 
https://github.com/square/moshi/issues/89
 2017-01-21 23:06:16 -05:00
Jesse Wilson
bc73b075f5 Merge pull request #222 from square/jwilson.0117.object_json_reader 
First step of a JsonReader that reads a DOM.
 2017-01-21 05:12:16 -08:00
jwilson
1be3e84733 First step of a JsonReader that reads a DOM. 
https://github.com/square/moshi/issues/89
 2017-01-21 05:12:03 -08:00
Jesse Wilson
8217219112 Merge pull request #225 from NightlyNexus/eric/add-null 
Disallow Moshi.Builder.add(null)
 2017-01-17 18:23:03 -08:00
Eric Cochran
fb3e9e8b47 Fix null 2017-01-17 18:13:44 -08:00
Eric Cochran
a16323db02 Disallow Moshi.Builder.add(null) 2017-01-17 17:51:04 -08:00
jwilson
c0a05b56bd Merge branch 'serj-lotutovici-sl/fix_long_parsing' 
* serj-lotutovici-sl/fix_long_parsing:
  Fix Long parsing for big values.
 2017-01-16 13:47:40 -05:00
Serj Lotutovici
38a06b080d Fix Long parsing for big values. 2017-01-16 13:47:29 -05:00
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