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

120 commits

This branch
This branch
All branches
Author SHA1 Message Date
jwilson
d6d9f9ead3 New @JsonQualifier annotation. 
Works like JSR-330's @Qualifier annotation. You may have
multiple qualifiers, or none.
 2015-05-31 13:07:21 -04:00
Jesse Wilson
629181ff8c Merge pull request #42 from square/jwilson_0525_adaptermethods 
Adapter methods.
 2015-05-25 14:46:50 -07:00
jwilson
71f0889842 Adapter methods. 
This is a fun new API that could make writing JSON adapters
much easier.
 2015-05-25 14:40:40 -07:00
Jake Wharton
171e3841bc Merge pull request #46 from square/jwilson_0525_enum_ii 
Reject unrecognized enum constants with an exception.
 2015-05-25 08:09:24 -07:00
jwilson
c8fd0e4bc2 Reject unrecognized enum constants with an exception. 
Also promote enum adapter to StandardJsonAdapters.java.
 2015-05-25 07:35:08 -07:00
Jesse Wilson
8003b6668b Merge pull request #32 from dandc87/ak_enum_support 
EnumJsonAdapter
 2015-05-25 07:25:09 -07:00
Jake Wharton
d14791d025 Merge pull request #43 from square/jwilson_0525_okio_substring 
Save an allocation by using Okio instead of substring.
 2015-05-25 07:02:20 -07:00
jwilson
912c07dafa Save an allocation by using Okio instead of substring. 2015-05-25 06:45:00 -07:00
Jesse Wilson
455fa47f9b Update README.md 2015-04-17 09:50:14 -04:00
Adam Koski
a0b177136d Squashed commit of the following: 
commit f4e6b9aab54b270ca703794fde9370d00821dfca
Author: Adam Koski <dandc87@gmail.com>
Date:   Sun Apr 12 19:25:49 2015 -0700

    Add copyright headers and remove redundant test

commit 064dfbb5ec7c6ed8e60c91776ce0a4e90a29ff9e
Author: Adam Koski <dandc87@gmail.com>
Date:   Sun Apr 12 13:10:17 2015 -0700

    Fix error preventing merging

commit d80c00ef2b7220397dd074dd6ceb03b9be9ec416
Author: Adam Koski <dandc87@gmail.com>
Date:   Sun Apr 12 12:59:46 2015 -0700

    Switch to using name()

commit 7e68f21537a58843c0426c5e73028e12b0522b96
Author: Adam Koski <dandc87@gmail.com>
Date:   Sat Apr 11 22:37:25 2015 -0700

    Optimize enum value retrieval

commit 1422abd632ca147252f5b0698c8b19dc77ca3fac
Author: Adam Koski <dandc87@gmail.com>
Date:   Sat Apr 11 22:35:06 2015 -0700

    Add enum test for custom names

commit 8a7fefe28a98576f8db849fe83fb7973fefd1f12
Author: Adam Koski <dandc87@gmail.com>
Date:   Fri Apr 10 19:32:46 2015 -0700

    Add javadoc

commit 920b7c6883664df39d99eb206b933c4929157d84
Author: Adam Koski <dandc87@gmail.com>
Date:   Fri Apr 10 19:21:18 2015 -0700

    Rename class to match convention

commit 461e87aa02552e09d0c4a0feaf2971e6050aa994
Author: Adam Koski <dandc87@gmail.com>
Date:   Thu Apr 9 23:20:05 2015 -0700

    Add initial support for enums
 2015-04-12 19:27:38 -07:00
Jesse Wilson
eece10d46e Merge pull request #35 from square/jw/expose-sink 
Expose Sink as constructor type.
 2015-04-12 15:36:32 -04:00
Marcelo Cortes
20ad5a5a4b Merge pull request #39 from square/jw/final 
Switch types to be final.
 2015-04-12 14:48:51 -04:00
Jake Wharton
a085548014 Use BufferedSink for reading. Sink writing convenience method. 2015-04-12 14:41:04 -04:00
Jake Wharton
9fedfc8066 Switch types to be final. 2015-04-12 14:29:18 -04:00
Jesse Wilson
41b3b0acde Merge pull request #36 from square/jw/token 
Make token a nested type of the reader.
 2015-04-12 06:07:07 -04:00
Jesse Wilson
9963e3bf09 Merge pull request #34 from square/jw/javadoc 
Correct Javadoc code usage.
 2015-04-12 06:02:16 -04:00
Jake Wharton
47cd73df89 Make token a nested type of the reader. 
This is the only class which uses these tokens and it does not deserve a top-level type.
 2015-04-12 00:57:14 -04:00
Jake Wharton
5e757e6f39 Correct Javadoc code usage. 2015-04-12 00:25:07 -04:00
Jesse Wilson
74871abd7f Merge pull request #25 from square/jw/omg-secrets 
Add credentials for CI snapshot deployments.
 2015-03-30 17:35:20 -04:00
Jake Wharton
573f2218d4 Add credentials for CI snapshot deployments. 2015-03-30 17:23:28 -04:00
Jesse Wilson
9d76bfc5ea Merge pull request #24 from square/jw/missing-link 
Add missing README link to Sonatype snapshot repo.
 2015-03-29 07:45:26 -04:00
Jake Wharton
6606cd6ec8 Add missing README link to Sonatype snapshot repo. 2015-03-29 02:40:42 -04:00
Jesse Wilson
b79b976b2b Merge pull request #23 from square/jw/se7en-isms 
Clean up warnings for Java 7 language level.
 2015-03-27 01:30:19 -04:00
Jesse Wilson
68169036e7 Merge pull request #22 from square/jw/things 
Things to allow opening.
 2015-03-27 01:29:30 -04:00
Jake Wharton
8af08de19e Clean up warnings for Java 7 language level. 2015-03-27 00:37:01 -04:00
Jake Wharton
1ba702fc42 Things to allow opening. 2015-03-27 00:29:22 -04:00
Jake Wharton
1e741c0f71 Merge pull request #21 from square/jwilson_0324_circles 
JsonAdapterFactories can lookup types they create.
 2015-03-25 09:21:00 -04:00
jwilson
144f57ad4c JsonAdapterFactories can lookup types they create. 
Without this, things fail with stack overflow exceptions.
 2015-03-24 23:54:31 -04:00
Jesse Wilson
50598dd2cb Merge pull request #20 from square/jwilson_0323_map_adapter 
Map adapter.
 2015-03-24 03:05:55 -04:00
jwilson
795f262106 Map adapter. 
Limited to string keys for now.
 2015-03-23 23:15:03 -04:00
Jesse Wilson
af10c97e42 Merge pull request #19 from square/jwilson_0322_classadapter 
Big start into ClassAdapter.
 2015-03-23 14:45:04 -04:00
jwilson
08becc119a Big start into ClassAdapter. 
This borrows from Gson's UnsafeAllocator. I didn't actually
borrow much from Gson's reflective type adapter, but I'll need
to review that in follow up to see if I forgot anything that
Gson covers.

Most interesting design decision here is that fields are
serialized in alphabetical order. Also we're pretty nice
around detecting field collisiosn and failing early.
 2015-03-23 00:13:04 -04:00
Jesse Wilson
1b9658dca3 Merge pull request #18 from square/jwilson_0103_linkedhashtreemap 
Import Gson's LinkedHashTreeMap.
 2015-01-04 11:07:08 -05:00
Jesse Wilson
5ff6b3dde9 Import Gson's LinkedHashTreeMap. 2015-01-04 11:01:39 -05:00
Jesse Wilson
b106c8610d Merge pull request #17 from square/jw/path-bugs 
Fix bugs in getPath() with arrays of objects and arrays of arrays.
 2014-12-22 16:10:02 -05:00
Jesse Wilson
67b3160d27 Merge pull request #16 from square/jw/source 
Enable JsonReader with Source.
 2014-12-22 16:09:38 -05:00
Jake Wharton
963e5939e9 Fix bugs in getPath() with arrays of objects and arrays of arrays. 
Original commit: Gson r1303 by Jesse Wilson.
 2014-12-22 12:34:27 -08:00
Jake Wharton
26f76806bc Enable JsonReader with Source. 2014-12-22 12:29:56 -08:00
Jesse Wilson
4bc6d43d74 Merge pull request #15 from square/jw/dep-updates 
Update Okio, JUnit, and AssertJ to latest.
 2014-12-22 13:54:14 -05:00
Jake Wharton
f6cee31e78 Update Okio, JUnit, and AssertJ to latest. 2014-12-22 10:22:01 -08:00
Jesse Wilson
5ec3d5e9e1 Merge pull request #14 from square/jw/new-redirect-link 
Use new central artifact redirect link.
 2014-11-19 17:43:09 -05:00
Jake Wharton
baa3a8046a Use new central artifact redirect link. 2014-11-19 14:24:33 -08:00
Scott Blum
8fe0b22fba Merge pull request #13 from square/scottb/types 
Remove TypeLiteral, test fixes.
 2014-08-19 17:04:22 -04:00
Scott Blum
467e7cced8 Remove TypeLiteral, test fixes. 2014-08-19 17:03:44 -04:00
Scott Blum
b072894ebf Merge pull request #12 from square/scottb/primitive 
Add the missing primitive converters.
 2014-08-15 16:09:52 -04:00
Scott Blum
9a713f80ed Add comments, fix nits 2014-08-14 01:38:44 -04:00
Scott Blum
1e4f375e75 Finish primitive adapters, add tests. 2014-08-13 19:40:09 -04:00
Scott Blum
806767169b Add the missing primitive converters. 2014-08-12 19:14:06 -04:00
Jake Wharton
c11ad0c2e6 Merge pull request #11 from square/scottb/fail 
Fix a few missing 'fail()' on expected exceptions
 2014-08-12 13:40:26 -07:00
Scott Blum
59af0357bb Fix a few missing 'fail()' on expected exceptions 2014-08-12 15:31:12 -04:00