Commit graph

176 commits

Author SHA1 Message Date
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
Tomas Kotula
739efea61d Workaround for Android ParameterizedType implementation bug 2016-04-24 09:22:50 -04:00
Jake Wharton
c5d406592d Merge pull request #156 from square/jwilson_0423_track_options_api
Track Okio snapshot API change to Options.
2016-04-23 23:34:41 -04:00
Jesse Wilson
d7bd016614 Merge pull request #149 from xizzhu/support-gingerbread
Added support for pre-Gingerbread.
2016-04-23 23:24:00 -04:00
jwilson
20a64dff7e Track Okio snapshot API change to Options.
Also rename our own Selection class to Options since it's semantically
the same thing.

https://github.com/square/okio/pull/215
2016-04-23 23:20:39 -04:00
Jesse Wilson
53ff73fe6a Merge pull request #153 from square/jwilson_0417_reader_selection
Optimize reading one of several expected values with Selection
2016-04-23 23:16:00 -04:00
jwilson
4925755ffa Optimize reading one of several expected values with Selection
This isn't yet public API.

This relies on an unreleased Okio API.

This has a significant impact on performance. I measured parsing performance
improve from 89k ops/sec to 140k ops/sec on one benchmark.
2016-04-17 20:15:07 -10:00
Xizhi Zhu
5ec289ff9d Added support for pre-Gingerbread. 2016-04-08 14:29:13 +03:00
Jake Wharton
40e323c805 Merge pull request #147 from square/jwilson_0406_small_optimizations
Small optimizations to JSON parsing.
2016-04-06 00:54:57 -04:00
jwilson
69f4a96d5e Small optimizations to JSON parsing.
Prefer LinkedHashMap for maps that will be queried heavily.

Inline a single-line method to refill the buffer.
2016-04-06 00:39:04 -04:00
Jake Wharton
8943bc57cf Merge pull request #144 from ersin-ertan/master
Add java to java-less '''
2016-03-24 18:56:25 -04:00
Ersin Ertan
0c14ad0117 Add java to java-less ''' 2016-03-24 18:51:01 -04:00
jwilson
633a95be62 Notes on transient and no-arguments constructors. 2016-03-22 21:52:02 -04:00
Jake Wharton
827f89adc8 Merge pull request #139 from square/jwilson_0313_promote_unquoted_keys
Confirm Moshi can handle unquoted numeric keys.
2016-03-13 16:01:38 -04:00
jwilson
41730edd4d Confirm Moshi can handle unquoted numeric keys.
See also https://github.com/google/gson/pull/809/files
2016-03-13 15:53:23 -04:00
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