Merge branch 'USERGRID-1246' of https://github.com/GERey/usergrid into USERGRID-1246-MASTER
# By George Reyes (13) and others # Via Dave Johnson (3) and others * 'USERGRID-1246' of https://github.com/GERey/usergrid: (29 commits) bumped the tomcat version for compatibility with tomcat 8. Removed power mock as we only use mockito now Removed the AppleJavaExtensions since we removed the launcher as well. Added some comments on why some dependencies were left in. Removed the Cglib since we use other java byte code plugins Removed nexflix curator since we don't use zookeeper in the code base anymore. Also fixed a small call in the ToolBase for the tools since the call it used to make no longer exists. Removing Jclouds from the code base along with the aopalliance dependency since it isn't used. Fixed some of other collection errors in the rest/service/core layer that weren't addressed before. Removed export and import methods that were leftover as well. Removed the export and import endpoints from the codebase. Removing export and import files along with the other export that uses Jclouds Turns out we didn't need any of the apache commons collection stuff. We only use whats in our utils so the dependency could be trimmed. Also removed erroneous mention of hazel cast in a logger. Removed hazel cast from the pom and the files that use hazel cast for testing. Removing and replacing instances of commons.collection with commons.collection4 removed an older jersey-apache-client Removal of mongo-emulator along with associated dependencies Removal of launcher, and web sockets modules. They aren't supposed at this point in time. Also removed netty and hazelcast dependencies Ensure the hector cluster is created with credentials from the properties file. Added fixes around caching and changed the endpoint to selective indexing to be /_index instead of /_indexes Tweak heap status to return used heap, and changed endpoint to status/heap. Add status/memory endpoint to get heap usage, max heap, and free heap. Increase limit of device fetching per user to 50. Increase AWS client timeouts. Back to Schedulers.io() Update distinct to properly use device ID. Update distinct code. Fix scheduler. ... Conflicts: stack/core/pom.xml stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e6594663 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e6594663 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e6594663 Branch: refs/heads/USERGRID-1246-MASTER Commit: e65946639f2df076782b1c4987f62509c95b128b Parents: c97ffa7 325242e Author: George Reyes <[email protected]> Authored: Mon May 2 10:54:20 2016 -0700 Committer: George Reyes <[email protected]> Committed: Mon May 2 10:54:20 2016 -0700 ---------------------------------------------------------------------- stack/core/pom.xml | 8 -------- .../usergrid/corepersistence/index/IndexServiceImpl.java | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e6594663/stack/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e6594663/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java ---------------------------------------------------------------------- diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java index 0111b31,9509626..6a458eb --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java @@@ -225,10 -225,8 +225,9 @@@ public class IndexServiceImpl implement if(fieldsToKeep.contains( "*" )){ return Optional.absent(); } - -- ++ // never add "none" because it has special meaning, "none" disables indexing for a type + //Do not add "none" to list of required fields! fieldsToKeep.remove("none"); defaultProperties.addAll( fieldsToKeep );
