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

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

import org.hisp.dhis.android.core.common.DeletableStore;

public interface ConfigurationStore extends DeletableStore {
    long save(@NonNull String serverUrl);

    @Nullable
    ConfigurationModel query();

    @Override
    int delete();
}

@@ -1545,17 +1545,16 @@
 GE.%0A */%0A
-%0A
 package 
@@ -1600,96 +1600,8 @@
 n;%0A%0A
-import android.support.annotation.NonNull;%0Aimport android.support.annotation.Nullable;%0A%0A
 impo
@@ -1637,25 +1637,22 @@
 .common.
-Deletable
+Object
 Store;%0A%0A
@@ -1699,145 +1699,79 @@
 nds 
-DeletableStore %7B%0A    long save(@NonNull String serverUrl);%0A%0A    @Nullable%0A    ConfigurationModel query();%0A%0A    @Override%0A    int delete(
+ObjectStore%3CConfiguration%3E %7B%0A%0A    void save(Configuration configuration
 );%0A%7D
-%0A

Unify ConfigurationStore