Merge branch 'release'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ed5a24a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ed5a24a Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ed5a24a Branch: refs/heads/USERGRID-1047 Commit: 8ed5a24a1e125b3e3c096c41a0e3693630ffdb07 Parents: ceae7db 2e37c21 Author: Michael Russo <michaelaru...@gmail.com> Authored: Fri Jan 22 17:43:08 2016 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Fri Jan 22 17:43:08 2016 -0800 ---------------------------------------------------------------------- .../model/entity/MapToEntityConverter.java | 235 +++++++++++-------- .../persistence/model/field/ArrayField.java | 4 +- .../persistence/model/field/BooleanField.java | 4 +- .../persistence/model/field/ByteArrayField.java | 8 +- .../persistence/model/field/DoubleField.java | 4 +- .../persistence/model/field/FloatField.java | 4 +- .../persistence/model/field/IntegerField.java | 4 +- .../persistence/model/field/ListField.java | 4 +- .../persistence/model/field/LocationField.java | 4 +- .../persistence/model/field/LongField.java | 4 +- .../persistence/model/field/NullField.java | 4 +- .../model/field/SerializedObjectField.java | 8 +- .../persistence/model/field/SetField.java | 6 +- .../persistence/model/field/StringField.java | 6 +- .../persistence/model/field/UUIDField.java | 4 +- .../model/entity/MapToEntityConverterTest.java | 40 +++- 16 files changed, 211 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ed5a24a/stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverterTest.java ----------------------------------------------------------------------
