Commit graph

159 commits

Author SHA1 Message Date
Jake Wharton
6d5b1e14e2 Merge pull request #138 from johnjohndoe/patch-1
Enable syntax highlighting for code snippets.
2016-03-07 11:58:01 -05:00
Tobias Preuss
c4cc07679c Enable syntax highlighting for code snippets. 2016-03-07 17:57:26 +01:00
Jesse Wilson
33e1fb1bb5 Merge pull request #127 from square/jw/redundant
Remove redundant loop variable.
2016-01-21 16:46:43 -05:00
Jesse Wilson
bafe69bfc4 Merge pull request #126 from square/jw/override
Missing @Override annotations.
2016-01-21 16:46:26 -05:00
Jake Wharton
82e70e9cce Remove redundant loop variable. 2016-01-21 11:16:09 -05:00
Jake Wharton
dc154c733a Missing @Override annotations. 2016-01-21 11:15:34 -05:00
Jesse Wilson
b8e6dc403e Merge pull request #125 from square/jw/iface-and-impl
Break apart Okio-based JSON reader and writer.
2016-01-21 10:17:08 -05:00
Jake Wharton
1071cec7d1 Break apart Okio-based JSON reader and writer. 2016-01-20 23:43:05 -05:00
jwilson
ad3506ffed [maven-release-plugin] prepare for next development iteration 2016-01-18 17:17:10 -05:00
jwilson
30a4c3c92e [maven-release-plugin] prepare release moshi-parent-1.1.0 2016-01-18 17:17:08 -05:00
jwilson
dd505172ca Update changelog for 1.1.0. 2016-01-18 17:16:20 -05:00
Jake Wharton
d29036f3b7 Merge pull request #123 from square/jwilson_0118_strings_table
Use an array indexed by ordinal to go from enum to name.
2016-01-18 17:14:02 -05:00
jwilson
324a59e0c9 Use an array indexed by ordinal to go from enum to name. 2016-01-18 16:57:07 -05:00
Jesse Wilson
8a5c0f387b Merge pull request #119 from serj-lotutovici/sl/json_for_enums
Enable Json annotation for enum values.
2016-01-18 16:52:02 -05:00
Jesse Wilson
9a66b0b7b5 Merge pull request #121 from square/jw/rfc7159
Update reader and writer to RFC 7159.
2016-01-18 10:47:36 -05:00
Jake Wharton
97d2bf5e66 Update reader and writer to RFC 7159. 2016-01-18 00:54:54 -05:00
Jake Wharton
ebe8af75ff Merge pull request #120 from square/jwilson_0111_more_docos
Document @Json and @JsonQualifier in the README.
2016-01-11 00:30:31 -08:00
jwilson
d8820b03f4 Document @Json and @JsonQualifier in the README. 2016-01-11 00:24:00 -08:00
Serj Lotutovici
d1b1def4a1 Enable Json annotation for enum values. 2016-01-08 00:16:59 +01:00
Jesse Wilson
f2e59498b9 Merge pull request #116 from square/jw/nuke-synthetic-methods
Remove creation of synthetic accessor methods.
2015-12-22 08:01:17 -05:00
Jake Wharton
6b945e5df7 Remove creation of synthetic accessor methods. 2015-12-22 02:45:31 -05:00
jwilson
7d0e2f537b Merge branch 'phelipealves-master'
* phelipealves-master:
  Increasing the code coverage of AdapterMethodsFactory
2015-11-04 19:56:13 -05:00
Phelipe Alves de Souza
86c9c6cbfa Increasing the code coverage of AdapterMethodsFactory 2015-11-04 19:55:35 -05:00
Jesse Wilson
84d8402541 Merge pull request #107 from f2prateek/patch-1
Presize Lists
2015-11-01 17:25:47 -05:00
Prateek Srivastava
28d758d62b Presize Lists
Avoids unnecessary work due to growing the list.
2015-11-01 11:10:05 -08:00
Jesse Wilson
8cff5b085e Update README.md 2015-10-26 11:01:29 -04:00
Jesse Wilson
d4e2a86444 Reference the latest Javadoc. 2015-10-25 08:38:26 -04:00
Jesse Wilson
dfda894350 Merge pull request #102 from serj-lotutovici/sl/add_factories_from_moshi
Possibility to create new `Moshi.Builder` from `Moshi` instance.
2015-10-21 09:42:30 -04:00
Serj Lotutovici
ee01275c76 Create new builder from Moshi instance 2015-10-21 12:01:43 +02:00
jwilson
e6a1e59dd4 Merge branch 'readme'
* readme:
  Add example for custom JsonAdapter.
2015-10-08 22:55:31 -04:00
David Mihola
68f2fb1d74 Add example for custom JsonAdapter. 2015-10-08 22:54:47 -04:00
Jake Wharton
6ed45f0bb2 Merge pull request #95 from edwardaa/master
Doc fix for JsonWriter.serializeNulls
2015-10-03 03:29:12 -04:00
edwardaa
04be7b8ec6 Doc fix for JsonWriter.serializeNulls 2015-10-03 15:20:59 +08:00
Jesse Wilson
e8a1eebb20 Merge pull request #92 from DavidMihola/master
Make two methods on Types public.
2015-09-29 17:15:30 -04:00
David Mihola
7970c36893 Make two methods on Types public.
To facilitate custom JsonAdapter.Factory implementations.
2015-09-29 10:44:41 +02:00
jwilson
01954b6fee Bump the version in README. 2015-09-27 17:28:37 -04:00
jwilson
e6a77041a1 [maven-release-plugin] prepare for next development iteration 2015-09-27 13:25:21 -04:00
jwilson
e93e6574ca [maven-release-plugin] prepare release moshi-parent-1.0.0 2015-09-27 13:25:18 -04:00
jwilson
5a4a58a0cc Changelog for Moshi 1.0.0. 2015-09-27 13:23:59 -04:00
Jake Wharton
72eef0e900 Merge pull request #91 from square/jwilson_0927_date_example
Date adapter example.
2015-09-27 12:46:55 -04:00
jwilson
1f0e7f61ad Date adapter example. 2015-09-27 12:40:57 -04:00
Jake Wharton
b6f48a9d94 Merge pull request #90 from square/jwilson_0927_open_the_door
JsonReader.of() and JsonWriter.of() instead of constructors.
2015-09-27 12:20:52 -04:00
jwilson
e181db0015 JsonReader.of() and JsonWriter.of() instead of constructors.
This opens the door to later implementations of these types that write
to something other than a stream. In particular, we could have a
JsonReader that reads from a DOM-like object, or a JsonWriter that
creates such an object.
2015-09-27 12:09:32 -04:00
Jake Wharton
711b96f716 Merge pull request #88 from square/jwilson_0927_linkplain
Audit @link for should-be @linkplain uses.
2015-09-27 11:31:10 -04:00
jwilson
f7b09188a8 Audit @link for should-be @linkplain uses.
Closes https://github.com/square/moshi/issues/37
2015-09-27 11:27:55 -04:00
Jesse Wilson
e431d7e852 Merge pull request #87 from square/jwilson_0926_adapters
RFC3339 adapter.
2015-09-26 18:59:34 -04:00
jwilson
1c6bebac1d RFC3339 adapter.
Much thanks to Jackson for doing all the real work.
2015-09-26 18:51:50 -04:00
Jesse Wilson
44b5d785c9 Merge pull request #86 from square/jwilson_0926_ergonomics
Adapter caching, plus other ergonomic features.
2015-09-26 18:44:32 -04:00
jwilson
9d9f12f808 Adapter caching, plus other ergonomic features.
This adds a toString() to most adapters. The format isn't perfect, but
it should make step-debugging easier.

Define the precedence order of adapter factories.

Forbid registering adapters with annotation literals if those annotations
need values to be provided.
2015-09-26 15:18:48 -04:00
Jesse Wilson
f8d853413f Merge pull request #82 from serj-lotutovici/master
Add read json array recipe
2015-09-22 08:28:50 -04:00