You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/16 20:06:39 UTC
[48/50] incubator-usergrid git commit: Fixes UUID parsing issue. Now
uses regex instead of checking length.
Fixes UUID parsing issue. Now uses regex instead of checking length.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c46d0d1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c46d0d1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c46d0d1f
Branch: refs/heads/USERGRID-273
Commit: c46d0d1f3ab226f3aba52530950bfb38b2ec3ddb
Parents: b9aae3c
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Feb 16 10:28:38 2015 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Feb 16 10:28:38 2015 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/usergrid/utils/JsonUtils.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c46d0d1f/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 4db2ce2..08b0a1e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -25,6 +25,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +33,7 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.exception.JsonReadException;
import org.apache.usergrid.exception.JsonWriteException;
import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.persistence.index.query.Identifier;
import com.fasterxml.jackson.core.io.JsonStringEncoder;
import com.fasterxml.jackson.databind.JsonNode;
@@ -55,6 +57,8 @@ public class JsonUtils {
private static ObjectMapper indentObjectMapper = new ObjectMapper();
+ private static final Pattern UUID_PATTERN = Pattern.compile( Identifier.UUID_REX );
+
static {
//indentObjectMapper.getSerializationConfig().set( Feature.INDENT_OUTPUT, true );
@@ -169,7 +173,7 @@ public class JsonUtils {
private static UUID tryConvertToUUID( Object o ) {
if ( o instanceof String ) {
String s = ( String ) o;
- if ( s.length() == 36 ) {
+ if ( UUID_PATTERN.matcher( s ).matches() ) {
try {
return UUID.fromString( s );
}