Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into workingbranch
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0714b110 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0714b110 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0714b110 Branch: refs/heads/two-dot-o-dev Commit: 0714b1100929695dd374bed28633e4e31ea80039 Parents: f4d0d1a 5594d74 Author: Todd Nine <tn...@apigee.com> Authored: Wed Apr 22 14:25:10 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Wed Apr 22 14:25:10 2015 -0600 ---------------------------------------------------------------------- .../results/ElasticSearchQueryExecutor.java | 38 +++-- .../org/apache/usergrid/persistence/Query.java | 78 ++++++---- .../apache/usergrid/persistence/Results.java | 65 +++++--- .../usergrid/persistence/CollectionIT.java | 12 +- .../org/apache/usergrid/persistence/GeoIT.java | 8 +- .../apache/usergrid/persistence/IndexIT.java | 8 +- .../PerformanceEntityRebuildIndexTest.java | 2 +- .../query/IntersectionTransitivePagingIT.java | 2 +- .../query/IntersectionUnionPagingIT.java | 2 +- .../persistence/query/IteratingQueryIT.java | 30 ++-- .../persistence/query/NotSubPropertyIT.java | 2 +- .../persistence/model/entity/SimpleId.java | 4 +- .../index/ApplicationEntityIndex.java | 12 +- .../persistence/index/CandidateResults.java | 39 ++--- .../usergrid/persistence/index/SearchTypes.java | 4 + .../impl/EsApplicationEntityIndexImpl.java | 155 +++---------------- .../impl/SearchRequestBuilderStrategy.java | 9 +- .../persistence/index/impl/EntityIndexTest.java | 32 ++-- .../management/importer/ImportServiceImpl.java | 6 +- 19 files changed, 207 insertions(+), 301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0714b110/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java ---------------------------------------------------------------------- diff --cc stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java index 018e90b,da0380b..6a45558 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/entity/SimpleId.java @@@ -25,7 -25,6 +25,7 @@@ import java.util.UUID import org.apache.usergrid.persistence.model.util.UUIDGenerator; import org.apache.usergrid.persistence.model.util.Verify; - import com.fasterxml.jackson.annotation.JsonTypeInfo; ++ import com.fasterxml.uuid.UUIDComparator; import com.google.common.base.Preconditions; @@@ -66,8 -53,13 +65,7 @@@ public class SimpleId implements Id, Se this(UUIDGenerator.newTimeUUID(), type); } - public SimpleId( ){ - - } - - - - @Override public UUID getUuid() { return uuid;
