Repository: usergrid Updated Branches: refs/heads/3.0.0_experimental 5465d807e -> dd99e006b
changes due to ES 5 client Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dd99e006 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/dd99e006 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/dd99e006 Branch: refs/heads/3.0.0_experimental Commit: dd99e006b774c6e2b49ad23aaac7bfd69d79fe79 Parents: 5465d80 Author: Mike Dunker <[email protected]> Authored: Tue Nov 21 13:51:54 2017 -0800 Committer: Mike Dunker <[email protected]> Committed: Tue Nov 21 13:51:54 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/usergrid/utils/IndexUtils.java | 5 ++--- .../services/notifications/ApplicationQueueMessage.java | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/dd99e006/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java index a6ad93b..0a9ed12 100644 --- a/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java @@ -30,14 +30,13 @@ import java.util.Map; import java.util.Map.Entry; import java.util.UUID; +import org.apache.lucene.analysis.standard.ClassicAnalyzer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.util.Version; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -53,7 +52,7 @@ public class IndexUtils { private static final Logger logger = LoggerFactory.getLogger( IndexUtils.class ); - static Analyzer analyzer = new StandardAnalyzer( Version.LUCENE_30 ); + static Analyzer analyzer = new ClassicAnalyzer(); private static void buildKeyValueSet( Object node, Map<String, List<Object>> keyValues, String path, http://git-wip-us.apache.org/repos/asf/usergrid/blob/dd99e006/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java index 836bfc7..5fc128b 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java @@ -17,12 +17,10 @@ package org.apache.usergrid.services.notifications; import java.io.Serializable; -import java.nio.ByteBuffer; import java.util.Arrays; -import org.apache.usergrid.mq.Message; import java.util.UUID; -import org.elasticsearch.common.primitives.Longs; +import com.google.common.primitives.Longs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +51,8 @@ public class ApplicationQueueMessage implements Serializable { public static UUID bytesToUuid( byte[] sixteenBytes ) { byte[] msBytes = Arrays.copyOfRange( sixteenBytes, 0, 8 ); byte[] lsBytes = Arrays.copyOfRange( sixteenBytes, 8, 16 ); - long msb = Longs.fromByteArray( msBytes ); - long lsb = Longs.fromByteArray( lsBytes ); + long msb = Longs.fromByteArray( msBytes ); + long lsb = Longs.fromByteArray( lsBytes ); return new UUID( msb, lsb ); }
