/*
 * 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.trackedentity;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import org.hisp.dhis.android.core.common.DeletableStore;
import org.hisp.dhis.android.core.common.State;
import org.hisp.dhis.android.core.common.StoreWithState;
import org.hisp.dhis.android.core.period.FeatureType;

import java.util.Date;
import java.util.Map;

public interface TrackedEntityInstanceStore extends DeletableStore, StoreWithState {

    long insert(
            @NonNull String uid, @NonNull Date created, @NonNull Date lastUpdated, @Nullable String createdAtClient,
            @Nullable String lastUpdatedAtClient, @NonNull String organisationUnit, @NonNull String trackedEntityType,
            @Nullable String coordinates, @Nullable FeatureType featureType, @Nullable State state);

    int delete();

    int update(@NonNull String uid, @NonNull Date created, @NonNull Date lastUpdated, @Nullable String createdAtClient,
               @Nullable String lastUpdatedAtClient, @NonNull String organisationUnit,
               @NonNull String trackedEntityType, @Nullable String coordinates, @Nullable FeatureType featureType,
               @Nullable State state, @NonNull String whereTrackedEntityInstanceUid);

    int delete(@NonNull String uid);

    Map<String, TrackedEntityInstance> queryToPost();

    Map<String, TrackedEntityInstance> querySynced();

    Map<String, TrackedEntityInstance> queryRelationships();

    Map<String, TrackedEntityInstance> queryAll();
}

@@ -1608,1275 +1608,249 @@
 ort 
-android.support.annotation.NonNull;%0Aimport android.support.annotation.Nullable;%0A%0Aimport org.hisp.dhis.android.core.common.DeletableStore;%0Aimport org.hisp.dhis.android.core.common.State;%0Aimport org.hisp.dhis.android.core.common.StoreWithState;%0Aimport org.hisp.dhis.android.core.period.FeatureType;%0A%0Aimport java.util.Date;%0Aimport java.util.Map;%0A%0Apublic interface TrackedEntityInstanceStore extends DeletableStore, StoreWithState %7B%0A%0A    long insert(%0A            @NonNull String uid, @NonNull Date created, @NonNull Date lastUpdated, @Nullable String createdAtClient,%0A            @Nullable String lastUpdatedAtClient, @NonNull String organisationUnit, @NonNull String trackedEntityType,%0A            @Nullable String coordinates, @Nullable FeatureType featureType, @Nullable State state);%0A%0A    int delete();%0A%0A    int update(@NonNull String uid, @NonNull Date created, @NonNull Date lastUpdated, @Nullable String createdAtClient,%0A               @Nullable String lastUpdatedAtClient, @NonNull String organisationUnit,%0A               @NonNull String trackedEntityType, @Nullable String coordinates, @Nullable FeatureType featureType,%0A               @Nullable State state, @NonNull String whereTrackedEntityInstanceUid);%0A%0A    int delete(@NonNull String uid);%0A%0A    Map%3CString, 
+org.hisp.dhis.android.core.common.IdentifiableObjectWithStateStore;%0A%0Aimport java.util.List;%0A%0Apublic interface TrackedEntityInstanceStore extends IdentifiableObjectWithStateStore%3CTrackedEntityInstance%3E %7B%0A%0A    List%3CTrackedEntityInstance%3E query
 Trac
@@ -1866,23 +1866,17 @@
 Instance
-%3E query
+s
 ToPost()
@@ -1878,36 +1878,48 @@
 ost();%0A%0A    
-Map
+List
 %3CString
-, 
+%3E querySynced
 TrackedEntit
@@ -1927,29 +1927,20 @@
 Instance
-%3E querySynced
+Uids
 ();%0A%0A   
@@ -1944,115 +1944,44 @@
     
-Map
+List
 %3CString
-, TrackedEntityInstance%3E queryRelationships();%0A%0A    Map%3CString, TrackedEntityInstance%3E queryAll
+%3E queryRelationshipsUids
 ();%0A%7D
-%0A

Unify TrackedEntityInstanceStore