Merge commit 'refs/pull/586/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8b945c63 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8b945c63 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8b945c63 Branch: refs/heads/master Commit: 8b945c63833c15d6b28cb08e264293d550ab6c53 Parents: 1d7785b 000eaaa Author: Mike Dunker <mdun...@google.com> Authored: Tue Nov 14 08:36:19 2017 -0800 Committer: Mike Dunker <mdun...@google.com> Committed: Tue Nov 14 08:36:19 2017 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 2 +- .../direct/DirectFirstEventServiceImpl.java | 7 +- .../corepersistence/util/CpCollectionUtils.java | 15 +- .../persistence/CollectionDeleteTest.java | 2 +- .../collection/CollectionsResourceIT.java | 151 +++++++++++++++++++ 5 files changed, 170 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b945c63/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpCollectionUtils.java ---------------------------------------------------------------------- diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpCollectionUtils.java index 66a4cfb,010af2b..9180f3f --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpCollectionUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpCollectionUtils.java @@@ -57,7 -57,18 +57,18 @@@ public class CpCollectionUtils return VALID_SETTING_NAMES; } - public static String validateValue(String name, Object value) { - // When running in debug mode we all some normally invalid index settings ++ // When running in debug mode we allow some normally invalid index settings + // like update C* but not ES. + private static boolean debugMode = false; + public static boolean getDebugMode() { + return debugMode; + } + + public static void setDebugMode(boolean set) { + debugMode = set; + } + + public static Object validateValue(String name, Object value) { if (SETTING_QUEUE_INDEX.equals(name)) { return QueueIndexingStrategy.get(value.toString()).getName(); }
