/*
 * Copyright (c) 2017, University of Oslo
 *
 * All rights reserved.
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * Neither the name of the HISP project nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.hisp.dhis.android.core.option;

import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
import android.support.annotation.NonNull;

import org.hisp.dhis.android.core.arch.db.binders.IdentifiableStatementBinder;
import org.hisp.dhis.android.core.arch.db.binders.StatementBinder;
import org.hisp.dhis.android.core.common.CursorModelFactory;
import org.hisp.dhis.android.core.common.IdentifiableObjectStore;
import org.hisp.dhis.android.core.common.StoreFactory;
import org.hisp.dhis.android.core.data.database.DatabaseAdapter;

import static org.hisp.dhis.android.core.utils.StoreUtils.sqLiteBind;

public final class OptionStore {

    private OptionStore() {}

    private static StatementBinder<OptionModel> BINDER = new IdentifiableStatementBinder<OptionModel>() {
        @Override
        public void bindToStatement(@NonNull OptionModel o, @NonNull SQLiteStatement sqLiteStatement) {
            super.bindToStatement(o, sqLiteStatement);
            sqLiteBind(sqLiteStatement, 7, o.sortOrder());
            sqLiteBind(sqLiteStatement, 8, o.optionSet());
        }
    };

    private static final CursorModelFactory<OptionModel> FACTORY = new CursorModelFactory<OptionModel>() {
        @Override
        public OptionModel fromCursor(Cursor cursor) {
            return OptionModel.create(cursor);
        }
    };

    public static IdentifiableObjectStore<OptionModel> create(DatabaseAdapter databaseAdapter) {
        return StoreFactory.objectWithUidStore(databaseAdapter, OptionModel.TABLE, new OptionModel.Columns().all(),
                BINDER, FACTORY);
    }
}
@@ -2034,32 +2034,85 @@
 n.StoreFactory;%0A
+import org.hisp.dhis.android.core.common.UidsHelper;%0A
 import org.hisp.
@@ -2337,21 +2337,16 @@
 r%3COption
-Model
 %3E BINDER
@@ -2382,29 +2382,24 @@
 inder%3COption
-Model
 %3E() %7B%0A      
@@ -2461,21 +2461,16 @@
 l Option
-Model
  o, @Non
@@ -2666,16 +2666,40 @@
 ent, 8, 
+UidsHelper.getUidOrNull(
 o.option
@@ -2704,16 +2704,17 @@
 onSet())
+)
 ;%0A      
@@ -2775,21 +2775,16 @@
 y%3COption
-Model
 %3E FACTOR
@@ -2816,21 +2816,16 @@
 y%3COption
-Model
 %3E() %7B%0A  
@@ -2861,21 +2861,16 @@
 c Option
-Model
  fromCur
@@ -2915,21 +2915,16 @@
 n Option
-Model
 .create(
@@ -2998,21 +2998,16 @@
 e%3COption
-Model
 %3E create
@@ -3116,69 +3116,29 @@
 tion
-Model.TABLE, new OptionModel.Columns().all(),%0A               
+TableInfo.TABLE_INFO,
  BIN

adapt store