Merge commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4' into release * commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4': Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed). Initial work to support a typed null field for an entity, including a new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for fields to index instead of a non unique list.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cf3d6a38 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cf3d6a38 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cf3d6a38 Branch: refs/heads/master Commit: cf3d6a388929a154e48fa2d9ab288ee7ea075ea6 Parents: 4e048f3 19de00b Author: George Reyes <[email protected]> Authored: Fri Jan 15 16:42:15 2016 -0800 Committer: George Reyes <[email protected]> Committed: Fri Jan 15 16:42:15 2016 -0800 ---------------------------------------------------------------------- .../model/entity/MapToEntityConverter.java | 18 ++- .../persistence/model/field/FieldTypeName.java | 3 +- .../persistence/model/field/NullField.java | 44 ++++++ .../model/entity/MapToEntityConverterTest.java | 142 ++++++++++++++++++ .../persistence/model/field/EntityTest.java | 9 +- .../persistence/index/impl/EntityField.java | 11 ++ .../index/impl/EntityMappingParser.java | 16 +- .../index/impl/EntityToMapConverter.java | 3 +- .../persistence/index/impl/FieldParser.java | 5 +- .../persistence/index/impl/IndexingUtils.java | 1 + .../persistence/index/impl/EntityIndexTest.java | 79 +++++++++- .../index/impl/EntityToMapConverterTest.java | 149 ++++++++++++++----- .../index/impl/IndexLoadTestsIT.java | 6 +- 13 files changed, 428 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
