Merge branch 'my/primitive_list_api' into feature/primitive_list

zaki50 · zaki50 · commit 9b957c3d6a89 · 2017-09-05T11:48:26.000+09:00
diff --git a/realm/realm-library/src/main/java/io/realm/DynamicRealmObject.java b/realm/realm-library/src/main/java/io/realm/DynamicRealmObject.java
@@ -337,11 +337,11 @@ public DynamicRealmObject getObject(String fieldName) {
     }
 
     /**
-     * Returns the {@link RealmList} of objects being linked to from this field.
+     * Returns the {@link RealmList} of {@link DynamicRealmObject}s being linked from the given field.
      *
      * @param fieldName the name of the field.
      * @return the {@link RealmList} data for this field.
-     * @throws IllegalArgumentException if field name doesn't exist or it doesn't contain a list of links.
+     * @throws IllegalArgumentException if field name doesn't exist or it doesn't contain a list of objects.
      */
     public RealmList<DynamicRealmObject> getList(String fieldName) {
         proxyState.getRealm$realm().checkIfValid();
@@ -359,6 +359,18 @@ public RealmList<DynamicRealmObject> getList(String fieldName) {
         }
     }
 
+    /**
+     * Returns the {@link RealmList} of values being linked from the given field.
+     *
+     * @param fieldName the name of the field.
+     * @return the {@link RealmList} data for this field.
+     * @throws IllegalArgumentException if field name doesn't exist or it doesn't contain a list of values.
+     */
+    public <T> RealmList<T> getValueList(String fieldName, Class<T> valueClass) {
+        // TODO implement this
+        return null;
+    }
+
     /**
      * Checks if the value of a given field is {@code null}.
      *
@@ -760,6 +772,19 @@ public void setList(String fieldName, RealmList<DynamicRealmObject> list) {
         }
     }
 
+    /**
+     * Sets the reference to a {@link RealmList} on the given field.
+     *
+     * @param fieldName field name.
+     * @param list list of references.
+     * @throws IllegalArgumentException if field name doesn't exist, it is not a list field, the type
+     * of the object represented by the DynamicRealmObject doesn't match or any element in the list belongs to a
+     * different Realm.
+     */
+    public void setValueList(String fieldName, RealmList<?> list) {
+        // TODO implement this
+    }
+
     /**
      * Sets the value to {@code null} for the given field.
      *
diff --git a/realm/realm-library/src/main/java/io/realm/OrderedRealmCollection.java b/realm/realm-library/src/main/java/io/realm/OrderedRealmCollection.java
@@ -100,7 +100,7 @@
  * As you can see, after deletion, the size and elements order of snapshot stay the same as before. But the element at
  * the position becomes invalid.
  */
-public interface OrderedRealmCollection<E extends RealmModel> extends List<E>, RealmCollection<E> {
+public interface OrderedRealmCollection<E> extends List<E>, RealmCollection<E> {
 
     /**
      * Gets the first object from the collection.
diff --git a/realm/realm-library/src/main/java/io/realm/OrderedRealmCollectionImpl.java b/realm/realm-library/src/main/java/io/realm/OrderedRealmCollectionImpl.java
@@ -20,7 +20,7 @@
 /**
  * General implementation for {@link OrderedRealmCollection} which is based on the {@code Collection}.
  */
-abstract class OrderedRealmCollectionImpl<E extends RealmModel>
+abstract class OrderedRealmCollectionImpl<E>
         extends AbstractList<E> implements OrderedRealmCollection<E> {
     private final static String NOT_SUPPORTED_MESSAGE = "This method is not supported by 'RealmResults' or" +
             " 'OrderedRealmCollectionSnapshot'.";
diff --git a/realm/realm-library/src/main/java/io/realm/OrderedRealmCollectionSnapshot.java b/realm/realm-library/src/main/java/io/realm/OrderedRealmCollectionSnapshot.java
@@ -48,7 +48,7 @@
  * }
  * </pre>
  */
-public class OrderedRealmCollectionSnapshot<E extends RealmModel> extends OrderedRealmCollectionImpl<E> {
+public class OrderedRealmCollectionSnapshot<E> extends OrderedRealmCollectionImpl<E> {
 
     private int size = -1;
 
diff --git a/realm/realm-library/src/main/java/io/realm/RealmCollection.java b/realm/realm-library/src/main/java/io/realm/RealmCollection.java
@@ -35,7 +35,7 @@
  *
  * @param <E> type of {@link RealmObject} stored in the collection.
  */
-public interface RealmCollection<E extends RealmModel> extends Collection<E>, ManagableObject {
+public interface RealmCollection<E> extends Collection<E>, ManagableObject {
 
     /**
      * Returns a {@link RealmQuery}, which can be used to query for specific objects from this collection.
diff --git a/realm/realm-library/src/main/java/io/realm/RealmFieldType.java b/realm/realm-library/src/main/java/io/realm/RealmFieldType.java
@@ -18,10 +18,40 @@
 
 import java.nio.ByteBuffer;
 
-import javax.annotation.Nullable;
-
 import io.realm.internal.Keep;
 
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_BINARY;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_BOOLEAN;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_DATE;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_DOUBLE;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_FLOAT;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_INTEGER;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_LINKING_OBJECTS;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_LIST;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_OBJECT;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_STRING;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_UNSUPPORTED_DATE;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_UNSUPPORTED_MIXED;
+import static io.realm.RealmFieldTypeConstants.CORE_TYPE_VALUE_UNSUPPORTED_TABLE;
+import static io.realm.RealmFieldTypeConstants.LIST_OFFSET;
+
+interface RealmFieldTypeConstants {
+    int LIST_OFFSET = 1 << 16;
+
+    int CORE_TYPE_VALUE_INTEGER = 0;
+    int CORE_TYPE_VALUE_BOOLEAN = 1;
+    int CORE_TYPE_VALUE_STRING = 2;
+    int CORE_TYPE_VALUE_BINARY = 4;
+    int CORE_TYPE_VALUE_UNSUPPORTED_TABLE = 5;
+    int CORE_TYPE_VALUE_UNSUPPORTED_MIXED = 6;
+    int CORE_TYPE_VALUE_UNSUPPORTED_DATE = 7;
+    int CORE_TYPE_VALUE_DATE = 8;
+    int CORE_TYPE_VALUE_FLOAT = 9;
+    int CORE_TYPE_VALUE_DOUBLE = 10;
+    int CORE_TYPE_VALUE_OBJECT = 12;
+    int CORE_TYPE_VALUE_LIST = 13;
+    int CORE_TYPE_VALUE_LINKING_OBJECTS = 14;
+}
 
 /**
  * List of the types used by Realm's underlying storage engine.
@@ -33,19 +63,28 @@
 @Keep
 public enum RealmFieldType {
     // Makes sure numbers match with <realm/column_type.hpp>.
-    INTEGER(0),
-    BOOLEAN(1),
-    STRING(2),
-    BINARY(4),
-    UNSUPPORTED_TABLE(5),
-    UNSUPPORTED_MIXED(6),
-    UNSUPPORTED_DATE(7),
-    DATE(8),
-    FLOAT(9),
-    DOUBLE(10),
-    OBJECT(12),
-    LIST(13),
-    LINKING_OBJECTS(14);
+    INTEGER(CORE_TYPE_VALUE_INTEGER),
+    BOOLEAN(CORE_TYPE_VALUE_BOOLEAN),
+    STRING(CORE_TYPE_VALUE_STRING),
+    BINARY(CORE_TYPE_VALUE_BINARY),
+    UNSUPPORTED_TABLE(CORE_TYPE_VALUE_UNSUPPORTED_TABLE),
+    UNSUPPORTED_MIXED(CORE_TYPE_VALUE_UNSUPPORTED_MIXED),
+    UNSUPPORTED_DATE(CORE_TYPE_VALUE_UNSUPPORTED_DATE),
+    DATE(CORE_TYPE_VALUE_DATE),
+    FLOAT(CORE_TYPE_VALUE_FLOAT),
+    DOUBLE(CORE_TYPE_VALUE_DOUBLE),
+    OBJECT(CORE_TYPE_VALUE_OBJECT),
+
+    LIST(CORE_TYPE_VALUE_LIST),
+    LINKING_OBJECTS(CORE_TYPE_VALUE_LINKING_OBJECTS),
+
+    INTEGER_LIST(CORE_TYPE_VALUE_INTEGER + LIST_OFFSET),
+    BOOLEAN_LIST(CORE_TYPE_VALUE_BOOLEAN + LIST_OFFSET),
+    STRING_LIST(CORE_TYPE_VALUE_STRING + LIST_OFFSET),
+    BINARY_LIST(CORE_TYPE_VALUE_BINARY + LIST_OFFSET),
+    DATE_LIST(CORE_TYPE_VALUE_DATE + LIST_OFFSET),
+    FLOAT_LIST(CORE_TYPE_VALUE_FLOAT + LIST_OFFSET),
+    DOUBLE_LIST(CORE_TYPE_VALUE_DOUBLE + LIST_OFFSET);
 
     // Primitive array for fast mapping between between native values and their Realm type.
     private static final RealmFieldType[] typeList = new RealmFieldType[15];
diff --git a/realm/realm-library/src/main/java/io/realm/RealmList.java b/realm/realm-library/src/main/java/io/realm/RealmList.java
@@ -55,7 +55,7 @@
  * @param <E> the class of objects in list.
  */
 
-public class RealmList<E extends RealmModel> extends AbstractList<E> implements OrderedRealmCollection<E> {
+public class RealmList<E> extends AbstractList<E> implements OrderedRealmCollection<E> {
 
     private static final String ONLY_IN_MANAGED_MODE_MESSAGE = "This method is only available in managed mode";
     private static final String NULL_OBJECTS_NOT_ALLOWED_MESSAGE = "RealmList does not accept null values";
@@ -1197,7 +1197,7 @@ public void set(E e) {
          * Adding a new object to the RealmList. If the object is not already manage by Realm it will be transparently
          * copied using {@link Realm#copyToRealmOrUpdate(RealmModel)}
          *
-         * @see #add(RealmModel)
+         * @see #add(Object)
          */
         @Override
         public void add(E e) {
@@ -1214,4 +1214,16 @@ public void add(E e) {
             }
         }
     }
+
+    /*
+     * MEMO: This method supports {@code long}, {@code  int}, {@code short}, {@code byte},
+     * {@code double}, {@code float} and {@code boolean} as {@code T} in addition to classes
+     * mentioned in the class comment of {@link RealmValueList}.
+     */
+    @Nonnull
+    @Override
+    public <T> T[] toArray(@Nonnull T[] a) {
+        // TODO implement this
+        return super.toArray(a);
+    }
 }
diff --git a/realm/realm-library/src/main/java/io/realm/RealmObjectSchema.java b/realm/realm-library/src/main/java/io/realm/RealmObjectSchema.java
@@ -261,6 +261,9 @@ public boolean hasIndex(String fieldName) {
     /**
      * Sets a field to be required i.e., it is not allowed to hold {@code null} values. This is equivalent to switching
      * between boxed types and their primitive variant e.g., {@code Integer} to {@code int}.
+     * <p>
+     * If the type of designated field is a list of values (not {@link RealmObject}s , specified nullability
+     * only affects its elements, not the field itself. Value list itself is always non-nullable.
      *
      * @param fieldName name of field in the class.
      * @param required {@code true} if field should be required, {@code false} otherwise.
@@ -275,6 +278,9 @@ public boolean hasIndex(String fieldName) {
     /**
      * Sets a field to be nullable i.e., it should be able to hold {@code null} values. This is equivalent to switching
      * between primitive types and their boxed variant e.g., {@code int} to {@code Integer}.
+     * <p>
+     * If the type of designated field is a list of values (not {@link RealmObject}s , specified nullability
+     * only affects its elements, not the field itself. Value list itself is always non-nullable.
      *
      * @param fieldName name of field in the class.
      * @param nullable {@code true} if field should be nullable, {@code false} otherwise.
diff --git a/realm/realm-library/src/main/java/io/realm/RealmQuery.java b/realm/realm-library/src/main/java/io/realm/RealmQuery.java
@@ -53,7 +53,7 @@
  * @see Realm#where(Class)
  * @see RealmResults#where()
  */
-public class RealmQuery<E extends RealmModel> {
+public class RealmQuery<E> {
 
     private final Table table;
     private final BaseRealm realm;
@@ -98,7 +98,7 @@ public static <E extends RealmModel> RealmQuery<E> createDynamicQuery(DynamicRea
      * to run it.
      */
     @SuppressWarnings("unchecked")
-    public static <E extends RealmModel> RealmQuery<E> createQueryFromResult(RealmResults<E> queryResults) {
+    public static <E> RealmQuery<E> createQueryFromResult(RealmResults<E> queryResults) {
         //noinspection ConstantConditions
         return (queryResults.classSpec == null)
                 ? new RealmQuery(queryResults, queryResults.className)
diff --git a/realm/realm-library/src/main/java/io/realm/RealmResults.java b/realm/realm-library/src/main/java/io/realm/RealmResults.java
@@ -59,7 +59,7 @@
  * @see RealmQuery#findAll()
  * @see Realm#executeTransaction(Realm.Transaction)
  */
-public class RealmResults<E extends RealmModel> extends OrderedRealmCollectionImpl<E> {
+public class RealmResults<E> extends OrderedRealmCollectionImpl<E> {
 
     // Called from Realm Proxy classes
     @SuppressLint("unused")
diff --git a/realm/realm-library/src/main/java/io/realm/rx/RealmObservableFactory.java b/realm/realm-library/src/main/java/io/realm/rx/RealmObservableFactory.java
@@ -132,7 +132,7 @@ public void call() {
     }
 
     @Override
-    public <E extends RealmModel> Observable<RealmResults<E>> from(final Realm realm, final RealmResults<E> results) {
+    public <E> Observable<RealmResults<E>> from(final Realm realm, final RealmResults<E> results) {
         final RealmConfiguration realmConfig = realm.getConfiguration();
         return Observable.create(new Observable.OnSubscribe<RealmResults<E>>() {
             @Override
@@ -204,7 +204,7 @@ public void call() {
     }
 
     @Override
-    public <E extends RealmModel> Observable<RealmList<E>> from(Realm realm, final RealmList<E> list) {
+    public <E> Observable<RealmList<E>> from(Realm realm, final RealmList<E> list) {
         final RealmConfiguration realmConfig = realm.getConfiguration();
         return Observable.create(new Observable.OnSubscribe<RealmList<E>>() {
             @Override
@@ -348,7 +348,7 @@ public void call() {
     }
 
     @Override
-    public <E extends RealmModel> Observable<RealmQuery<E>> from(Realm realm, RealmQuery<E> query) {
+    public <E> Observable<RealmQuery<E>> from(Realm realm, RealmQuery<E> query) {
         throw new RuntimeException("RealmQuery not supported yet.");
     }
 
diff --git a/realm/realm-library/src/main/java/io/realm/rx/RxObservableFactory.java b/realm/realm-library/src/main/java/io/realm/rx/RxObservableFactory.java
@@ -65,7 +65,7 @@ public interface RxObservableFactory {
      * @param <E> type of RealmObject
      * @return Rx observable that emit all updates to the RealmObject.
      */
-    <E extends RealmModel> Observable<RealmResults<E>> from(Realm realm, RealmResults<E> results);
+    <E> Observable<RealmResults<E>> from(Realm realm, RealmResults<E> results);
 
     /**
      * Creates an Observable for a {@link RealmResults}. It should emit the initial RealmResult when subscribed to and
@@ -89,9 +89,9 @@ public interface RxObservableFactory {
      *
      * @param list RealmObject to listen to changes for.
      * @param realm {@link Realm} instance list is coming from.
-     * @param <E> type of RealmObject
+     * @param <E> type of query target
      */
-    <E extends RealmModel> Observable<RealmList<E>> from(Realm realm, RealmList<E> list);
+    <E> Observable<RealmList<E>> from(Realm realm, RealmList<E> list);
 
     /**
      * Creates an Observable for a {@link RealmList}. It should emit the initial list when subscribed to and on each
@@ -114,7 +114,7 @@ public interface RxObservableFactory {
      *
      * @param object RealmObject to listen to changes for.
      * @param realm {@link Realm} instance object is coming from.
-     * @param <E> type of RealmObject
+     * @param <E> type of query target
      */
     <E extends RealmModel> Observable<E> from(Realm realm, E object);
 
@@ -136,9 +136,9 @@ public interface RxObservableFactory {
      *
      * @param query RealmQuery to emit.
      * @param realm {@link Realm} instance query is coming from.
-     * @param <E> type of RealmObject
+     * @param <E> type of query target
      */
-    <E extends RealmModel> Observable<RealmQuery<E>> from(Realm realm, RealmQuery<E> query);
+    <E> Observable<RealmQuery<E>> from(Realm realm, RealmQuery<E> query);
 
     /**
      * Creates an Observable from a {@link RealmQuery}. It should emit the query and then complete.

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* @param <E> type of {@link RealmObject} stored in the collection.`
`37`	`37`	`*/`
`38`		`-public interface RealmCollection<E extends RealmModel> extends Collection<E>, ManagableObject {`
	`38`	`+public interface RealmCollection<E> extends Collection<E>, ManagableObject {`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Returns a {@link RealmQuery}, which can be used to query for specific objects from this collection.`