Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
# By Dave Johnson # Via Dave Johnson * 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: Add new ignore_error argument to /status end-point, which defaults to true and, also added Index health check to the /org/app/status end-point. There is now a new option on the /status end-point. If you specify "ignore_errors=false" the the /status end-point will return an HTTP 500 error if there is a problem connecting to Cassandra or of the query index is status RED for the management app. Oops Set shard and replica size at Index creation time and not client creation time. Conflicts: stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e759a798 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e759a798 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e759a798 Branch: refs/heads/UG-rest-test-framework-overhaul Commit: e759a7980c0b75cca2b4bcc31fa6d920da97db81 Parents: a49b444 5285f3d Author: grey <[email protected]> Authored: Tue Nov 4 15:33:38 2014 -0800 Committer: grey <[email protected]> Committed: Tue Nov 4 15:33:38 2014 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 12 +- .../corepersistence/CpEntityManagerFactory.java | 30 ++-- .../HybridEntityManagerFactory.java | 10 +- .../usergrid/persistence/EntityManager.java | 6 + .../persistence/EntityManagerFactory.java | 25 ++-- .../cassandra/EntityManagerFactoryImpl.java | 10 +- .../cassandra/EntityManagerImpl.java | 6 + .../collection/EntityCollectionManager.java | 6 +- .../impl/EntityCollectionManagerImpl.java | 7 +- .../collection/EntityCollectionManagerIT.java | 3 +- .../usergrid/persistence/core/util/Health.java | 23 ++++ .../usergrid/persistence/index/EntityIndex.java | 13 +- .../index/impl/EsEntityIndexImpl.java | 55 ++++++-- .../persistence/index/impl/EsProvider.java | 14 +- .../impl/EntityConnectionIndexImplTest.java | 14 -- .../persistence/index/impl/EntityIndexTest.java | 36 +++-- .../rest/JacksonCustomMapperProvider.java | 7 +- .../org/apache/usergrid/rest/RootResource.java | 42 +++++- .../rest/filters/HealthCheckFilter.java | 68 ---------- .../applications/ApplicationResource.java | 136 +++++++++++++------ stack/rest/src/main/webapp/WEB-INF/web.xml | 10 -- 21 files changed, 309 insertions(+), 224 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e759a798/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e759a798/stack/core/src/main/java/org/apache/usergrid/corepersistence/HybridEntityManagerFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e759a798/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityCollectionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e759a798/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java ---------------------------------------------------------------------- diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java index 16046b3,bb75cc9..437c0d3 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java @@@ -60,9 -62,8 +60,10 @@@ import com.netflix.astyanax.connectionp import com.netflix.astyanax.model.ColumnFamily; import com.netflix.astyanax.model.CqlResult; import com.netflix.astyanax.serializers.StringSerializer; +import org.apache.usergrid.persistence.collection.guice.CollectionTaskExecutor; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; +import org.apache.usergrid.persistence.core.task.TaskExecutor; + import org.apache.usergrid.persistence.core.util.Health; import rx.Observable; import rx.Subscriber;
