Some field types are never allowed to be unique.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b4a70689 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b4a70689 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b4a70689 Branch: refs/heads/release-2.1.1 Commit: b4a706893a40f9d8cdd232518d588b77b408a712 Parents: de24373 Author: Dave Johnson <[email protected]> Authored: Thu Jun 16 11:07:30 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Jun 16 11:07:30 2016 -0400 ---------------------------------------------------------------------- .../apache/usergrid/persistence/model/field/ArrayField.java | 7 +++++++ .../usergrid/persistence/model/field/ByteArrayField.java | 9 +++++++++ .../usergrid/persistence/model/field/DistanceField.java | 9 +++++++++ .../usergrid/persistence/model/field/EntityObjectField.java | 9 +++++++++ .../usergrid/persistence/model/field/FieldTypeName.java | 3 --- .../apache/usergrid/persistence/model/field/ListField.java | 7 +++++++ .../usergrid/persistence/model/field/LocationField.java | 7 +++++++ .../apache/usergrid/persistence/model/field/NullField.java | 7 +++++++ .../apache/usergrid/persistence/model/field/SetField.java | 7 +++++++ .../persistence/model/field/value/EntityObject.java | 2 +- 10 files changed, 63 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java index be1d923..424f259 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ArrayField.java @@ -47,6 +47,13 @@ public final class ArrayField<T> extends ListField<T> { value.add( listItem ); } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteArrayField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteArrayField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteArrayField.java index 58defed..812e066 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteArrayField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ByteArrayField.java @@ -49,4 +49,13 @@ public final class ByteArrayField extends AbstractField<byte[]> { public final FieldTypeName getTypeName() { return FieldTypeName.BYTE_ARRAY; } + + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } + } http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DistanceField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DistanceField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DistanceField.java index dd99792..cefef95 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DistanceField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/DistanceField.java @@ -32,6 +32,15 @@ public class DistanceField extends DoubleField { super(NAME, value, unique); } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } + + public DistanceField() { super(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java index ace9841..14aee74 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/EntityObjectField.java @@ -38,4 +38,13 @@ public class EntityObjectField extends AbstractField<EntityObject> { public FieldTypeName getTypeName() { return FieldTypeName.OBJECT; } + + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } + } http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java index 73f872d..428417c 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java @@ -18,9 +18,6 @@ package org.apache.usergrid.persistence.model.field;/* */ -import com.fasterxml.jackson.annotation.JsonFormat; - - /** * Enum of all field types. DO NOT change these names, they're used in persistence, and will result in * unique checks failing http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java index d063b02..a48112e 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/ListField.java @@ -60,5 +60,12 @@ public class ListField<T> extends AbstractField<List<T>> { return this.value.size(); } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java index 244110a..989dc14 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java @@ -41,6 +41,13 @@ public final class LocationField extends AbstractField<Location> { super(); } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } @Override public final FieldTypeName getTypeName() { http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/NullField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/NullField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/NullField.java index 94fca87..d8710f4 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/NullField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/NullField.java @@ -35,6 +35,13 @@ public final class NullField extends AbstractField<Object>{ public NullField() { } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } @Override public final FieldTypeName getTypeName() { http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java index 8662c8d..3fbc13d 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/SetField.java @@ -48,6 +48,13 @@ public final class SetField<T> extends AbstractField<Set<T>> { value.add( setItem ); } + /** + * This type of field is never unique + */ + @Override + public boolean isUnique() { + return false; + } @Override public final FieldTypeName getTypeName() { http://git-wip-us.apache.org/repos/asf/usergrid/blob/b4a70689/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java index a157029..c19cc9f 100644 --- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java +++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/value/EntityObject.java @@ -39,7 +39,7 @@ public class EntityObject implements Serializable { private long size; // field names are treated in case-insensitive way by design - static class CaseInsensitiveComparator implements Comparator<String> { + static class CaseInsensitiveComparator implements Comparator<String>, Serializable { public int compare(String o1, String o2) { return o1.compareToIgnoreCase(o2); }
